commit c053477c27fe26ecc43de0f5f085c228529de988
author Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 14:03:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 29 14:03:21 2016 +0000
tree 2628e2e96509f1aefde56ff566e91cd2939eb4b1
parent 1d7726a0e61a63b0720f655b9b0f55c8951bb514
parent 3e6bc4c76acb7be02165553314150b4728135f0e

Merge \"Fix interpreter tests.\"
am: 3e6bc4c76a

Change-Id: I639ae01f1f1c64ac5dba4e9d5fd141ff573ff592

runtime/common_throws.cc

diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc
index 19387fb..60f45cd 100644
--- a/runtime/common_throws.cc
+++ b/runtime/common_throws.cc
@@ -655,6 +655,12 @@
                      "Using a null lambda");
       break;
     }
+    case Instruction::MONITOR_ENTER:
+    case Instruction::MONITOR_EXIT: {
+      ThrowException("Ljava/lang/NullPointerException;", nullptr,
+                     "Attempt to do a synchronize operation on a null object");
+      break;
+    }
     default: {
       const DexFile* dex_file =
           method->GetDeclaringClass()->GetDexCache()->GetDexFile();