commit 6990bdab0322da35bb6f38c79b21c241a4347f89
author Sebastien Hertz <shertz@google.com> Mon Nov 17 16:08:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 17 16:08:02 2014 +0000
tree dc5886085d369f19464f129dc60a256dfdb96a69
parent 7bfb3f8b1748b5bf7e217a1337176ad488dca66a
parent 8315ee03dbee3c48881191b3aedb108d1b626c0b

Merge "Fix DCHECK in artInstrumentationMethodEntryFromCode"

runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc b/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc
index 00f5cd5..d5493bd 100644
--- a/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc
@@ -36,8 +36,8 @@
     result = GetQuickToInterpreterBridge();
   } else {
     result = instrumentation->GetQuickCodeFor(method);
+    DCHECK(!Runtime::Current()->GetClassLinker()->IsQuickToInterpreterBridge(result));
   }
-  DCHECK(!Runtime::Current()->GetClassLinker()->IsQuickToInterpreterBridge(result));
   bool interpreter_entry = (result == GetQuickToInterpreterBridge());
   instrumentation->PushInstrumentationStackFrame(self, method->IsStatic() ? nullptr : this_object,
                                                  method, lr, interpreter_entry);