From f3e861db83eec398c49e003fc323b7964fca6e50 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Wed, 3 Jul 2013 15:42:17 -0700 Subject: Fix GetQuickCodeFor to return actual code pointer if it exists. If the compiled entry point is the interpreter entry point, the code now tries to get oat code for it before returning. Change-Id: Iea1cec1ed003aadd71b432cc405fc81509bc644a --- src/instrumentation.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/instrumentation.cc b/src/instrumentation.cc index f36cb8cd7c..8598d6d4f8 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; } } -- cgit v1.2.3-59-g8ed1b