diff options
| author | Jeff Hao <jeffhao@google.com> | 2013-07-08 20:20:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-08 20:20:36 +0000 |
| commit | 9dacec7d3ec1f9b6efdb61fd494f0192c85183bf (patch) | |
| tree | a93312a5b164c160a09f31f0c0a4734b2a688621 | |
| parent | bdd0fb9bf5e3af9d2f0366652979ac04b05d3d1e (diff) | |
| parent | f3e861db83eec398c49e003fc323b7964fca6e50 (diff) | |
| download | art-9dacec7d3ec1f9b6efdb61fd494f0192c85183bf.zip art-9dacec7d3ec1f9b6efdb61fd494f0192c85183bf.tar.gz art-9dacec7d3ec1f9b6efdb61fd494f0192c85183bf.tar.bz2 | |
Merge "Fix GetQuickCodeFor to return actual code pointer if it exists." into dalvik-dev
| -rw-r--r-- | src/instrumentation.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/instrumentation.cc b/src/instrumentation.cc index f36cb8c..8598d6d 100644 --- a/src/instrumentation.cc +++ b/src/instrumentation.cc @@ -384,7 +384,8 @@ const void* Instrumentation::GetQuickCodeFor(const mirror::AbstractMethod* metho if (LIKELY(!instrumentation_stubs_installed_)) { const void* code = method->GetEntryPointFromCompiledCode(); DCHECK(code != NULL); - if (LIKELY(code != GetResolutionTrampoline(runtime->GetClassLinker()))) { + if (LIKELY(code != GetResolutionTrampoline(runtime->GetClassLinker()) && + code != GetInterpreterEntryPoint())) { return code; } } |