diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-04-09 18:45:35 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-04-25 12:24:46 +0100 |
| commit | 8a630577ed2d9e9571c3434c505e5de223b23c07 (patch) | |
| tree | 106367100c639011f0abb72b3b0e227c0764e8e0 /runtime/entrypoints/quick | |
| parent | 96c6ab93336b972a38bd2448bcccf19188b8389b (diff) | |
| download | art-8a630577ed2d9e9571c3434c505e5de223b23c07.zip art-8a630577ed2d9e9571c3434c505e5de223b23c07.tar.gz art-8a630577ed2d9e9571c3434c505e5de223b23c07.tar.bz2 | |
Move mapping table and vmap table offsets to OatMethodHeader.
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields mapping table and vmap table."
https://android-review.googlesource.com/91254
Bug: 11767815
Change-Id: I46ce2067e1ecd915da3890606498e31ffc332813
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); |