commit 8532191c4fc8e005f7d432fec40fd9f2936275c6
author TDYa127 <tdy@google.com> Sun Apr 01 15:24:56 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Apr 07 10:33:12 2012 -0700
tree 2173082a31163332c22b262331fe98470583cd12
parent b12c3017e619747ab26ba56d935401a7e45b59cd

Late method resolution.

Change-Id: Ic35348022391c3c11a1d4984b9add7b6ef53aa4c

src/compiler_llvm/upcall_compiler.cc

diff --git a/src/compiler_llvm/upcall_compiler.cc b/src/compiler_llvm/upcall_compiler.cc
index 85bfe24..6d14a19 100644
--- a/src/compiler_llvm/upcall_compiler.cc
+++ b/src/compiler_llvm/upcall_compiler.cc
@@ -151,7 +151,15 @@
     irb_.CreatePtrDisp(method_object_addr, code_field_offset_value,
                        accurate_func_type->getPointerTo()->getPointerTo());
 
-  llvm::Value* code_addr = irb_.CreateLoad(code_field_addr);
+  llvm::Value* code_addr_ = irb_.CreateLoad(code_field_addr);
+  llvm::Value* code_addr;
+  // TODO: Inline check
+  llvm::Value* runtime_func = irb_.GetRuntime(runtime_support::EnsureInitialized);
+  llvm::Value* result = irb_.CreateCall2(runtime_func,
+                                         method_object_addr,
+                                         irb_.CreatePointerCast(code_addr_,
+                                                                irb_.getJObjectTy()));
+  code_addr = irb_.CreatePointerCast(result, accurate_func_type->getPointerTo());
 
   llvm::Value* retval = irb_.CreateCall(code_addr, args);