commit 1cb0a1dfc32531c79a968aeac26ccb5525862497
author Ian Rogers <irogers@google.com> Thu Oct 06 15:24:35 2011 -0700
committer Ian Rogers <irogers@google.com> Thu Oct 06 17:27:15 2011 -0700
tree 61d0345bd2b9b951026c9ce18d51c2b2d6963255
parent 40c47b50f6c37ff2af919a0d51f12d3e7cc794a3

Support for resolving unknown direct/static methods.

If we can't resolve a method we don't know whether it is direct or
static from the dex information (other than the invocation instruction).
Add support for a third type of resolution stub that can discover the
type of the method based on the calling method and PC of the invocation
instruction. Its still unimplemented to look up the instruction and
figure out if the type is static or not.

Change-Id: I8b76e6ba2c946376e7fe287dbcca17bcaab0e133

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index f4e8874..3b92267 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -19,12 +19,12 @@
 namespace arm {
   ByteArray* CreateAbstractMethodErrorStub();
   void ArmCreateInvokeStub(Method* method);
-  ByteArray* ArmCreateResolutionTrampoline(bool is_static);
+  ByteArray* ArmCreateResolutionTrampoline(Runtime::TrampolineType type);
 }
 namespace x86 {
   ByteArray* CreateAbstractMethodErrorStub();
   void X86CreateInvokeStub(Method* method);
-  ByteArray* X86CreateResolutionTrampoline(bool is_static);
+  ByteArray* X86CreateResolutionTrampoline(Runtime::TrampolineType type);
 }
 
 Compiler::Compiler(InstructionSet insns) : instruction_set_(insns), jni_compiler_(insns),
@@ -32,13 +32,14 @@
   CHECK(!Runtime::Current()->IsStarted());
 }
 
-ByteArray* Compiler::CreateResolutionStub(InstructionSet instruction_set, bool is_static) {
+ByteArray* Compiler::CreateResolutionStub(InstructionSet instruction_set,
+                                          Runtime::TrampolineType type) {
   if (instruction_set == kX86) {
-    return x86::X86CreateResolutionTrampoline(is_static);
+    return x86::X86CreateResolutionTrampoline(type);
   } else {
     CHECK(instruction_set == kArm || instruction_set == kThumb2);
     // Generates resolution stub using ARM instruction set
-    return arm::ArmCreateResolutionTrampoline(is_static);
+    return arm::ArmCreateResolutionTrampoline(type);
   }
 }
 
@@ -332,7 +333,8 @@
   for (size_t i = 0; i < dex_cache->NumResolvedMethods(); i++) {
     Method* method = dex_cache->GetResolvedMethod(i);
     if ((method == NULL) || (method->IsStatic() && !method->GetDeclaringClass()->IsInitialized())) {
-      ByteArray* res_trampoline = runtime->GetResolutionStubArray(method->IsStatic());
+      Runtime::TrampolineType type = Runtime::GetTrampolineType(method);
+      ByteArray* res_trampoline = runtime->GetResolutionStubArray(type);
       if (instruction_set_ == kX86) {
         code_and_direct_methods->SetResolvedDirectMethodTrampoline(i, res_trampoline, kX86);
       } else {