1 IR builder. Kill greenland. Remove JTypeSpace.
Change-Id: I7d08cfd8c1fec46df4ce5f51706dff2e246695b5
diff --git a/src/compiler/dex/compiler_ir.h b/src/compiler/dex/compiler_ir.h
index 246d200..c961d0b 100644
--- a/src/compiler/dex/compiler_ir.h
+++ b/src/compiler/dex/compiler_ir.h
@@ -23,7 +23,8 @@
#include "compiler_utility.h"
#include "oat_compilation_unit.h"
#include "safe_map.h"
-#include "greenland/ir_builder.h"
+#include "compiler_llvm/ir_builder.h"
+#include "compiler_llvm/intrinsic_helper.h"
#include "llvm/Module.h"
#include "compiler_enums.h"
@@ -510,8 +511,8 @@
llvm::LLVMContext* context;
llvm::Module* module;
llvm::Function* func;
- greenland::IntrinsicHelper* intrinsic_helper;
- greenland::IRBuilder* irb;
+ compiler_llvm::IntrinsicHelper* intrinsic_helper;
+ compiler_llvm::IRBuilder* irb;
llvm::BasicBlock* placeholder_bb;
llvm::BasicBlock* entry_bb;
llvm::BasicBlock* entryTarget_bb;