Fix llvm runtime support bug.

Change-Id: I7c023e861cb8738ade67ef66155a318c8bd5735a

1 files changed, 2 insertions, 3 deletions

diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc
index c1152ab96e..02985f79b4 100644
--- a/src/compiler_llvm/jni_compiler.cc
+++ b/src/compiler_llvm/jni_compiler.cc
@@ -30,7 +30,6 @@
 #include "shadow_frame.h"
 #include "utils_llvm.h"
 
-#include <llvm/Analysis/Verifier.h>
 #include <llvm/BasicBlock.h>
 #include <llvm/DerivedTypes.h>
 #include <llvm/Function.h>
@@ -264,7 +263,7 @@ CompiledMethod* JniCompiler::Compile() {
                            irb_.getInt32(kRunnable));
 
   // Do a suspend check
-  irb_.CreateCall(irb_.GetRuntime(TestSuspend));
+  irb_.CreateCall(irb_.GetRuntime(TestSuspend), thread_object_addr);
 
   if (return_shorty == 'L') {
     // If the return value is reference, it may point to SIRT, we should decode it.
@@ -298,7 +297,7 @@ CompiledMethod* JniCompiler::Compile() {
   }
 
   // Verify the generated bitcode
-  llvm::verifyFunction(*func_, llvm::PrintMessageAction);
+  VERIFY_LLVM_FUNCTION(*func_);
 
   // Add the memory usage approximation of the compilation unit
   cunit_->AddMemUsageApproximation((sirt_size * 4 + 50) * 50);