commit 7f0ae73573a1cae6b102ca5b40a4d2dd6c60f2db
author Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 14:54:35 2016 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 14:54:35 2016 +0100
tree 257f6f8e005296dcf3930e40ed703ead15995370
parent c23d6450c92775adf951ee135a5c9515d0f20e30

Fix interpreter tests.

Monitor operations can throw NPEs.

bug:29321958
Change-Id: If7a2e35a2073a7984a5126a826e722c918ba8d3a

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();