diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-04-28 09:09:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-28 09:09:07 +0000 |
| commit | 990d46f3333dce06a640ced697ee069330a73d7c (patch) | |
| tree | 7caf896723665029823c73e2bec87e6db97ec428 /runtime/entrypoints/quick | |
| parent | bf25f7e3a007ecfe4b2bcfa0a9abcb784ff54e26 (diff) | |
| parent | 8a630577ed2d9e9571c3434c505e5de223b23c07 (diff) | |
| download | art-990d46f3333dce06a640ced697ee069330a73d7c.zip art-990d46f3333dce06a640ced697ee069330a73d7c.tar.gz art-990d46f3333dce06a640ced697ee069330a73d7c.tar.bz2 | |
Merge "Move mapping table and vmap table offsets to OatMethodHeader."
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc b/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc index 633f580..60c5377 100644 --- a/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc @@ -32,6 +32,7 @@ extern "C" const void* artInstrumentationMethodEntryFromCode(mirror::ArtMethod* FinishCalleeSaveFrameSetup(self, sp, Runtime::kRefsAndArgs); instrumentation::Instrumentation* instrumentation = Runtime::Current()->GetInstrumentation(); const void* result = instrumentation->GetQuickCodeFor(method); + DCHECK(result != GetQuickToInterpreterBridgeTrampoline(Runtime::Current()->GetClassLinker())); bool interpreter_entry = (result == GetQuickToInterpreterBridge()); instrumentation->PushInstrumentationStackFrame(self, method->IsStatic() ? NULL : this_object, method, lr, interpreter_entry); |