commit 0b130de5e6d8fda5f621f87223fa8d0117e6e5a2
author TDYa127 <tdy@google.com> Tue Jun 19 17:29:57 2012 -0700
committer Shih-wei Liao <sliao@google.com> Wed Jun 27 04:03:23 2012 -0700
tree d393c32aad0b59e366c1e3a471a703fdbf3f19b3
parent 7c9c184b22707c9f3ed7f7ace94fe9f072129e94

Code cleanup. Full sharpening.

Change-Id: I6e8238f64a6a8fe15f9ff018ab88a9a615282cbf

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 6c3bdb0..13f2327 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -2738,7 +2738,7 @@
 
   // Compute invoke related information for compiler decision
   int vtable_idx = -1;
-  uintptr_t direct_code = 0; // Currently unused
+  uintptr_t direct_code = 0;
   uintptr_t direct_method = 0;
   bool is_fast_path = compiler_->
     ComputeInvokeInfo(callee_method_idx, oat_compilation_unit_,
@@ -2834,11 +2834,19 @@
     }
   }
 
-  llvm::Value* code_addr =
-    irb_.LoadFromObjectOffset(callee_method_object_addr,
-                              Method::GetCodeOffset().Int32Value(),
-                              GetFunctionType(callee_method_idx, is_static)->getPointerTo(),
-                              kTBAAJRuntime);
+  llvm::Value* code_addr;
+  if (direct_code != 0u &&
+      direct_code != static_cast<uintptr_t>(-1)) {
+    code_addr =
+      irb_.CreateIntToPtr(irb_.getPtrEquivInt(direct_code),
+                          GetFunctionType(callee_method_idx, is_static)->getPointerTo());
+  } else {
+    code_addr =
+      irb_.LoadFromObjectOffset(callee_method_object_addr,
+                                Method::GetCodeOffset().Int32Value(),
+                                GetFunctionType(callee_method_idx, is_static)->getPointerTo(),
+                                kTBAAJRuntime);
+  }
 
   // Invoke callee
   EmitUpdateDexPC(dex_pc);