commit 145d491d1a30b291eb3ea608507a04451237f327
author TDYa127 <tdy@google.com> Sun May 06 21:44:45 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun May 06 23:04:49 2012 -0700
tree d8b8871d91a1b6e367eeaa753944adc0f855d5bc
parent 8fe384d8fe6c501527489a1217e5edb904754dc7

Mark suspend as RuntimeInfo.

Change-Id: Ib474032c0d7817cd5aff2e84b00ef2f82573cbac

src/compiler_llvm/ir_builder.h

diff --git a/src/compiler_llvm/ir_builder.h b/src/compiler_llvm/ir_builder.h
index 93a7f19..a700c69 100644
--- a/src/compiler_llvm/ir_builder.h
+++ b/src/compiler_llvm/ir_builder.h
@@ -105,6 +105,10 @@
     StoreToObjectOffset(object_addr, offset, new_value, tbaa_.GetSpecialType(special_ty));
   }
 
+  void SetTBAACall(llvm::CallInst* call_inst, TBAASpecialType special_ty) {
+    call_inst->setMetadata(llvm::LLVMContext::MD_tbaa, tbaa_.GetSpecialType(special_ty));
+  }
+
 
   //--------------------------------------------------------------------------
   // Pointer Arithmetic Helper Function

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 f4343fc..f7b9f07 100644
--- a/src/compiler_llvm/runtime_support_builder.cc
+++ b/src/compiler_llvm/runtime_support_builder.cc
@@ -156,7 +156,7 @@
     Value* suspend_count = irb_.LoadFromObjectOffset(thread,
                                                      Thread::SuspendCountOffset().Int32Value(),
                                                      irb_.getJIntTy(),
-                                                     kTBAAJRuntime);
+                                                     kTBAARuntimeInfo);
     Value* is_suspend = irb_.CreateICmpNE(suspend_count, irb_.getJInt(0));
 
     BasicBlock* basic_block_suspend = BasicBlock::Create(context_, "suspend", func);
@@ -164,7 +164,8 @@
     irb_.CreateCondBr(is_suspend, basic_block_suspend, basic_block_else);
 
     irb_.SetInsertPoint(basic_block_suspend);
-    irb_.CreateCall(slow_func, thread);
+    CallInst* call_inst = irb_.CreateCall(slow_func, thread);
+    irb_.SetTBAACall(call_inst, kTBAARuntimeInfo);
     irb_.CreateBr(basic_block_else);
 
     irb_.SetInsertPoint(basic_block_else);