commit 76ae4fe651c77619aeeb4dd395c7ec8fc29685fc
author Ian Rogers <irogers@google.com> Wed Feb 27 16:03:41 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Feb 27 22:20:36 2013 -0800
tree c9160ac0bfafe49d5b4a0c303e4767ee52b7abd3
parent 395116cae130c983498c0a2f42b89e42f75bb9d0

1 IR builder. Kill greenland. Remove JTypeSpace.

Change-Id: I7d08cfd8c1fec46df4ce5f51706dff2e246695b5

src/compiler/dex/frontend.cc

diff --git a/src/compiler/dex/frontend.cc b/src/compiler/dex/frontend.cc
index 498600f..4619052 100644
--- a/src/compiler/dex/frontend.cc
+++ b/src/compiler/dex/frontend.cc
@@ -37,6 +37,9 @@
 }
 
 namespace art {
+namespace compiler_llvm {
+llvm::Module* makeLLVMModuleContents(llvm::Module* module);
+}
 
 LLVMInfo::LLVMInfo() {
 #if !defined(ART_USE_PORTABLE_COMPILER)
@@ -46,8 +49,9 @@
   llvm_context_.reset(new llvm::LLVMContext());
   llvm_module_ = new llvm::Module("art", *llvm_context_);
   llvm::StructType::create(*llvm_context_, "JavaObject");
-  intrinsic_helper_.reset( new greenland::IntrinsicHelper(*llvm_context_, *llvm_module_));
-  ir_builder_.reset(new greenland::IRBuilder(*llvm_context_, *llvm_module_, *intrinsic_helper_));
+  compiler_llvm::makeLLVMModuleContents(llvm_module_);
+  intrinsic_helper_.reset( new compiler_llvm::IntrinsicHelper(*llvm_context_, *llvm_module_));
+  ir_builder_.reset(new compiler_llvm::IRBuilder(*llvm_context_, *llvm_module_, *intrinsic_helper_));
 }
 
 LLVMInfo::~LLVMInfo() {