Point fixes after OSR change.
- ldr -> ldrb in osr stub for arm32
- disable 570-checker-osr for tracing
- don't osr proxy methods.
Change-Id: I9c713c9b7eab86ca9beb75f228fb3b76185621ef
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 3e152e1..54b65e6 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -284,6 +284,10 @@
return false;
}
+ // Get the actual Java method if this method is from a proxy class. The compiler
+ // and the JIT code cache do not expect methods from proxy classes.
+ method = method->GetInterfaceMethodIfProxy(sizeof(void*));
+
// Cheap check if the method has been compiled already. That's an indicator that we should
// osr into it.
if (!jit->GetCodeCache()->ContainsPc(method->GetEntryPointFromQuickCompiledCode())) {