1 IR builder. Kill greenland. Remove JTypeSpace.
Change-Id: I7d08cfd8c1fec46df4ce5f51706dff2e246695b5
diff --git a/src/compiler_llvm/llvm_compilation_unit.cc b/src/compiler_llvm/llvm_compilation_unit.cc
index 5f653c6..1c0218f 100644
--- a/src/compiler_llvm/llvm_compilation_unit.cc
+++ b/src/compiler_llvm/llvm_compilation_unit.cc
@@ -81,7 +81,7 @@
namespace compiler_llvm {
llvm::FunctionPass*
-CreateGBCExpanderPass(const greenland::IntrinsicHelper& intrinsic_helper, IRBuilder& irb,
+CreateGBCExpanderPass(const IntrinsicHelper& intrinsic_helper, IRBuilder& irb,
Compiler* compiler, OatCompilationUnit* oat_compilation_unit);
llvm::Module* makeLLVMModuleContents(llvm::Module* module);
@@ -99,8 +99,11 @@
// Include the runtime function declaration
makeLLVMModuleContents(module_);
+
+ intrinsic_helper_.reset(new IntrinsicHelper(*context_, *module_));
+
// Create IRBuilder
- irb_.reset(new IRBuilder(*context_, *module_));
+ irb_.reset(new IRBuilder(*context_, *module_, *intrinsic_helper_));
// We always need a switch case, so just use a normal function.
switch(GetInstructionSet()) {