commit 76f552307ee980221626d1dff0ada56c989d24ca
author Mathieu Chartier <mathieuc@google.com> Tue Dec 10 23:19:30 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 10 23:19:30 2013 +0000
tree b420fbe97cdf75e52944004d49b161caace4f109
parent 3d0ecf950d67bd272a979adb5988b9a977b44fac
parent f043de4fbcf8eaa72b55597ccc6b2ea5b26a24d2

Merge "Add missing push/pop shadow frame to artInterpreterToCompiledCodeBridge."

runtime/entrypoints/interpreter/interpreter_entrypoints.cc

diff --git a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc
index 05c02f2..df4ec3a 100644
--- a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc
+++ b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc
@@ -33,11 +33,14 @@
   if (method->IsStatic()) {
     mirror::Class* declaringClass = method->GetDeclaringClass();
     if (UNLIKELY(!declaringClass->IsInitializing())) {
+      self->PushShadowFrame(shadow_frame);
       if (UNLIKELY(!Runtime::Current()->GetClassLinker()->EnsureInitialized(declaringClass,
                                                                             true, true))) {
-        DCHECK(Thread::Current()->IsExceptionPending());
+        self->PopShadowFrame();
+        DCHECK(self->IsExceptionPending());
         return;
       }
+      self->PopShadowFrame();
       CHECK(declaringClass->IsInitializing());
     }
   }