commit b672d1e48b6e02bb69c7cd9bcfa7509c81514c07
author TDYa127 <tdy@google.com> Thu Jun 28 21:21:45 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Sep 15 04:15:17 2012 -0700
tree 1731b6e1818a90136a985fa0957bf5ebc96eaf7d
parent 21d28f510eb590f52810c83f1f3f37fe5f4adf46

Merge iceland to greenland.

Change-Id: Ic4440a658bb2fccb558024a736d896baaf172f3c

src/compiler_llvm/gbc_expander.cc

diff --git a/src/compiler_llvm/gbc_expander.cc b/src/compiler_llvm/gbc_expander.cc
index e2b9834..77c1bf5 100644
--- a/src/compiler_llvm/gbc_expander.cc
+++ b/src/compiler_llvm/gbc_expander.cc
@@ -194,8 +194,13 @@
 char GBCExpanderPass::ID = 0;
 
 bool GBCExpanderPass::runOnFunction(llvm::Function& func) {
+  // Runtime support or stub
+  if (func.getName().startswith("art_") || func.getName().startswith("Art")) {
+    return false;
+  }
   bool changed;
 
+  // TODO: Use intrinsic.
   changed = InsertStackOverflowCheck(func);
 
   std::list<std::pair<llvm::CallInst*,
@@ -962,7 +967,7 @@
   switch (intr_id) {
     //==- Thread -----------------------------------------------------------==//
     case IntrinsicHelper::GetCurrentThread: {
-      return ExpandToRuntime(runtime_support::GetCurrentThread, call_inst);
+      return irb_.Runtime().EmitGetCurrentThread();
     }
     case IntrinsicHelper::TestSuspend: {
       Expand_TestSuspend(call_inst);