summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hao <jeffhao@google.com> 2013-06-07 16:43:14 -0700
committer Jeff Hao <jeffhao@google.com> 2013-06-07 16:44:20 -0700
commitdd75d5dec19f6a7c7f530a1a7932c8e5faa3129e (patch)
tree746ab445d90223ec4de6bf70b60e8fbd4c12aa85
parent6cda291b40cd02a079ec2c4e42da555f28c9246a (diff)
Don't set resolution method's compiled code entry to the interpreter.
Change-Id: I7c25dad3176f67f7bd4c423676acca9fdd92dd41
-rw-r--r--src/class_linker.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/class_linker.cc b/src/class_linker.cc
index 0fae4248e9..0c5c9dad5e 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1048,7 +1048,9 @@ void ClassLinker::InitFromImageCallback(mirror::Object* obj, void* arg) {
mirror::AbstractMethod* method = obj->AsMethod();
if (Runtime::Current()->GetInstrumentation()->InterpretOnly() && !method->IsNative()) {
method->SetEntryPointFromInterpreter(interpreter::artInterpreterToInterpreterEntry);
- method->SetEntryPointFromCompiledCode(GetInterpreterEntryPoint());
+ if (method != Runtime::Current()->GetResolutionMethod()) {
+ method->SetEntryPointFromCompiledCode(GetInterpreterEntryPoint());
+ }
}
}
}