commit 83d97e19c1aa00af7e02d234223b1de35be8cede
author Ian Rogers <irogers@google.com> Fri May 17 15:20:02 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 15:20:03 2013 +0000
tree 7291b355521683100f2e7366291a55ca9e754bb7
parent e15e7faff3deb937c8617428e70ffb6b79ad77e0
parent 74c070440e9c3f362cd0e9e13754bc8693ed9073

Merge "Help inline LogMessage::stream method." into dalvik-dev

src/interpreter/interpreter.cc

diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
index 5992c67..e1773f0 100644
--- a/src/interpreter/interpreter.cc
+++ b/src/interpreter/interpreter.cc
@@ -970,10 +970,11 @@
         Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x());
         if (UNLIKELY(obj == NULL)) {
           ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow());
+          HANDLE_PENDING_EXCEPTION();
         } else {
           DoMonitorEnter(self, obj);
+          POSSIBLY_HANDLE_PENDING_EXCEPTION(Next_1xx);
         }
-        POSSIBLY_HANDLE_PENDING_EXCEPTION(Next_1xx);
         break;
       }
       case Instruction::MONITOR_EXIT: {
@@ -981,10 +982,11 @@
         Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x());
         if (UNLIKELY(obj == NULL)) {
           ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow());
+          HANDLE_PENDING_EXCEPTION();
         } else {
           DoMonitorExit(self, obj);
+          POSSIBLY_HANDLE_PENDING_EXCEPTION(Next_1xx);
         }
-        POSSIBLY_HANDLE_PENDING_EXCEPTION(Next_1xx);
         break;
       }
       case Instruction::CHECK_CAST: {