From 1212a022fa5f8ef9585d765b1809521812af882c Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Mon, 4 Mar 2013 10:48:41 -0800 Subject: Move the Compiler to CompilerDriver. Change-Id: I0bb4d3c2b79b45fd8ef180688c767712b0c55978 --- src/compiler_llvm/jni_compiler.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/compiler_llvm/jni_compiler.cc') diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc index c23c5e20da..8b5f1be8c3 100644 --- a/src/compiler_llvm/jni_compiler.cc +++ b/src/compiler_llvm/jni_compiler.cc @@ -19,7 +19,7 @@ #include "base/logging.h" #include "class_linker.h" #include "compiled_method.h" -#include "compiler.h" +#include "compiler/driver/compiler_driver.h" #include "compiler_llvm.h" #include "ir_builder.h" #include "llvm_compilation_unit.h" @@ -43,14 +43,15 @@ namespace compiler_llvm { using namespace runtime_support; JniCompiler::JniCompiler(LlvmCompilationUnit* cunit, - Compiler const& compiler, + const CompilerDriver& driver, OatCompilationUnit* oat_compilation_unit) -: cunit_(cunit), compiler_(&compiler), module_(cunit_->GetModule()), +: cunit_(cunit), driver_(&driver), module_(cunit_->GetModule()), context_(cunit_->GetLLVMContext()), irb_(*cunit_->GetIRBuilder()), oat_compilation_unit_(oat_compilation_unit), access_flags_(oat_compilation_unit->access_flags_), method_idx_(oat_compilation_unit->method_idx_), - dex_file_(oat_compilation_unit->dex_file_) { + dex_file_(oat_compilation_unit->dex_file_), + func_(NULL), elf_func_idx_(0) { // Check: Ensure that JNI compiler will only get "native" method CHECK((access_flags_ & kAccNative) != 0); -- cgit v1.2.3-59-g8ed1b