Rename OatCompilationUnit to Dex.. move to compiler.
Some other clean-up to make fields const and private.
Change-Id: Icad66e2969385ab1f4125162bcbf8d5fa92d3ed5
diff --git a/src/compiler_llvm/llvm_compilation_unit.cc b/src/compiler_llvm/llvm_compilation_unit.cc
index 3f13c18..d240bac 100644
--- a/src/compiler_llvm/llvm_compilation_unit.cc
+++ b/src/compiler_llvm/llvm_compilation_unit.cc
@@ -82,16 +82,15 @@
llvm::FunctionPass*
CreateGBCExpanderPass(const IntrinsicHelper& intrinsic_helper, IRBuilder& irb,
- CompilerDriver* compiler, OatCompilationUnit* oat_compilation_unit);
+ CompilerDriver* compiler, DexCompilationUnit* dex_compilation_unit);
llvm::Module* makeLLVMModuleContents(llvm::Module* module);
-LlvmCompilationUnit::LlvmCompilationUnit(const CompilerLLVM* compiler_llvm,
- size_t cunit_idx)
-: compiler_llvm_(compiler_llvm), cunit_idx_(cunit_idx) {
+LlvmCompilationUnit::LlvmCompilationUnit(const CompilerLLVM* compiler_llvm, size_t cunit_idx)
+ : compiler_llvm_(compiler_llvm), cunit_idx_(cunit_idx) {
driver_ = NULL;
- oat_compilation_unit_ = NULL;
+ dex_compilation_unit_ = NULL;
llvm_info_.reset(new LLVMInfo());
context_.reset(llvm_info_->GetLLVMContext());
module_ = llvm_info_->GetLLVMModule();
@@ -214,11 +213,11 @@
// If we don't need write the bitcode to file, add the AddSuspendCheckToLoopLatchPass to the
// regular FunctionPass.
fpm.add(CreateGBCExpanderPass(*llvm_info_->GetIntrinsicHelper(), *irb_.get(),
- driver_, oat_compilation_unit_));
+ driver_, dex_compilation_unit_));
} else {
llvm::FunctionPassManager fpm2(module_);
fpm2.add(CreateGBCExpanderPass(*llvm_info_->GetIntrinsicHelper(), *irb_.get(),
- driver_, oat_compilation_unit_));
+ driver_, dex_compilation_unit_));
fpm2.doInitialization();
for (llvm::Module::iterator F = module_->begin(), E = module_->end();
F != E; ++F) {