commit 853cd09d6ffc87a270d0d531f84f246d534b8c82
author TDYa127 <tdy@google.com> Sat Apr 21 22:15:31 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun Apr 22 01:34:46 2012 -0700
tree f66b7329f1c6c0d370cd9eeb78ff6a0e86751653
parent ce154726f34ebfbdce905da008b6359bea9ae50a

Fix llvm runtime support bug.

Change-Id: I7c023e861cb8738ade67ef66155a318c8bd5735a

src/compiler_llvm/runtime_support_builder.cc

diff --git a/src/compiler_llvm/runtime_support_builder.cc b/src/compiler_llvm/runtime_support_builder.cc
index a13867c..c5ff6d7 100644
--- a/src/compiler_llvm/runtime_support_builder.cc
+++ b/src/compiler_llvm/runtime_support_builder.cc
@@ -20,6 +20,7 @@
 #include "ir_builder.h"
 #include "shadow_frame.h"
 #include "thread.h"
+#include "utils_llvm.h"
 
 #include <llvm/DerivedTypes.h>
 #include <llvm/Function.h>
@@ -98,6 +99,8 @@
                              Thread::TopShadowFrameOffset().Int32Value(),
                              new_shadow_frame);
     irb_.CreateRetVoid();
+
+    VERIFY_LLVM_FUNCTION(*func);
   }
 
   if (!target_runtime_support_func_[PopShadowFrame]) {
@@ -118,6 +121,8 @@
                              Thread::TopShadowFrameOffset().Int32Value(),
                              old_shadow_frame);
     irb_.CreateRetVoid();
+
+    VERIFY_LLVM_FUNCTION(*func);
   }
 
   if (!target_runtime_support_func_[IsExceptionPending]) {
@@ -133,6 +138,8 @@
                                                  irb_.getJObjectTy());
     Value* is_exception_not_null = irb_.CreateICmpNE(exception, irb_.getJNull());
     irb_.CreateRet(is_exception_not_null);
+
+    VERIFY_LLVM_FUNCTION(*func);
   }
 
   if (!target_runtime_support_func_[TestSuspend]) {
@@ -146,8 +153,7 @@
     BasicBlock* basic_block = BasicBlock::Create(context_, "entry", func);
     irb_.SetInsertPoint(basic_block);
 
-    Function* get_thread = GetRuntimeSupportFunction(GetCurrentThread);
-    Value* thread = irb_.CreateCall(get_thread);
+    Value* thread = func->arg_begin();
     Value* suspend_count = irb_.LoadFromObjectOffset(thread,
                                                      Thread::SuspendCountOffset().Int32Value(),
                                                      irb_.getJIntTy());
@@ -165,6 +171,8 @@
     irb_.CreateRetVoid();
 
     OverrideRuntimeSupportFunction(TestSuspend, func);
+
+    VERIFY_LLVM_FUNCTION(*func);
   }
 
   if (!target_runtime_support_func_[MarkGCCard]) {
@@ -197,6 +205,8 @@
     Value* card_table_entry = irb_.CreateGEP(card_table, card_no);
     irb_.CreateStore(irb_.getInt8(GC_CARD_DIRTY), card_table_entry);
     irb_.CreateRetVoid();
+
+    VERIFY_LLVM_FUNCTION(*func);
   }
 }