commit 09b55e1df3b0bcecee25882e45e882887cc8654f
author Jeff Hao <jeffhao@google.com> Wed Apr 24 14:28:19 2013 -0700
committer Jeff Hao <jeffhao@google.com> Wed Apr 24 15:01:43 2013 -0700
tree 829302cd8b0144880cde695d3f8651a133e977e9
parent ba1814eeac6adb44f2f78317556b3484b19e02fc

Fix PortableResolutionTrampoline to handle <clinit> methods.

This was caused by the move from compiled resolution trampolines.

Bug: 8702837

Change-Id: I20fb89583c9774913c545620ac8909bba1b6fb46

src/oat/runtime/support_stubs.cc

diff --git a/src/oat/runtime/support_stubs.cc b/src/oat/runtime/support_stubs.cc
index ef2a563..f78cc79 100644
--- a/src/oat/runtime/support_stubs.cc
+++ b/src/oat/runtime/support_stubs.cc
@@ -41,35 +41,39 @@
   ClassLinker* linker = Runtime::Current()->GetClassLinker();
   InvokeType invoke_type;
   uint32_t dex_method_idx;
-  DCHECK(called->IsRuntimeMethod());
-  const DexFile::CodeItem* code_item = MethodHelper(caller).GetCodeItem();
-  CHECK_LT(dex_pc, code_item->insns_size_in_code_units_);
-  const Instruction* instr = Instruction::At(&code_item->insns_[dex_pc]);
-  Instruction::Code instr_code = instr->Opcode();
-  switch (instr_code) {
-    case Instruction::INVOKE_DIRECT:  // Fall-through.
-    case Instruction::INVOKE_DIRECT_RANGE:
-      invoke_type = kDirect;
-      break;
-    case Instruction::INVOKE_STATIC:  // Fall-through.
-    case Instruction::INVOKE_STATIC_RANGE:
-      invoke_type = kStatic;
-      break;
-    case Instruction::INVOKE_SUPER:  // Fall-through.
-    case Instruction::INVOKE_SUPER_RANGE:
-      invoke_type = kSuper;
-      break;
-    case Instruction::INVOKE_VIRTUAL:  // Fall-through.
-    case Instruction::INVOKE_VIRTUAL_RANGE:
-      invoke_type = kVirtual;
-      break;
-    default:
-      LOG(FATAL) << "Unexpected call into trampoline: " << instr->DumpString(NULL);
-      invoke_type = kDirect;  // Avoid used uninitialized warnings.
+  if (called->IsRuntimeMethod()) {
+    const DexFile::CodeItem* code = MethodHelper(caller).GetCodeItem();
+    CHECK_LT(dex_pc, code->insns_size_in_code_units_);
+    const Instruction* instr = Instruction::At(&code->insns_[dex_pc]);
+    Instruction::Code instr_code = instr->Opcode();
+    switch (instr_code) {
+      case Instruction::INVOKE_DIRECT:  // Fall-through.
+      case Instruction::INVOKE_DIRECT_RANGE:
+        invoke_type = kDirect;
+        break;
+      case Instruction::INVOKE_STATIC:  // Fall-through.
+      case Instruction::INVOKE_STATIC_RANGE:
+        invoke_type = kStatic;
+        break;
+      case Instruction::INVOKE_SUPER:  // Fall-through.
+      case Instruction::INVOKE_SUPER_RANGE:
+        invoke_type = kSuper;
+        break;
+      case Instruction::INVOKE_VIRTUAL:  // Fall-through.
+      case Instruction::INVOKE_VIRTUAL_RANGE:
+        invoke_type = kVirtual;
+        break;
+      default:
+        LOG(FATAL) << "Unexpected call into trampoline: " << instr->DumpString(NULL);
+        invoke_type = kDirect;  // Avoid used uninitialized warnings.
+    }
+    DecodedInstruction dec_insn(instr);
+    dex_method_idx = dec_insn.vB;
+    called = linker->ResolveMethod(dex_method_idx, caller, invoke_type);
+  } else {
+    CHECK(called->IsStatic()) << PrettyMethod(called);
+    invoke_type = kStatic;
   }
-  DecodedInstruction dec_insn(instr);
-  dex_method_idx = dec_insn.vB;
-  called = linker->ResolveMethod(dex_method_idx, caller, invoke_type);
   const void* code = NULL;
   if (LIKELY(!thread->IsExceptionPending())) {
     // Incompatible class change should have been handled in resolve method.