From 55e5e6c5702e3f1f68bd83ae741af769740d9a74 Mon Sep 17 00:00:00 2001 From: TDYa127 Date: Tue, 11 Sep 2012 15:14:42 -0700 Subject: Fix quick fly2iceland after rebase. Change-Id: I844f005782b3ecdcb52dc2484d44f4ae34e1c670 --- src/compiler_llvm/compiler_llvm.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/compiler_llvm/compiler_llvm.cc') diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index b81bfdd722..f65f684697 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -45,10 +45,7 @@ void oatCompileMethodToGBC(Compiler& compiler, uint32_t access_flags, InvokeType invoke_type, uint32_t method_idx, jobject class_loader, const DexFile& dex_file, - llvm::Module* module, - llvm::LLVMContext* context, - greenland::IntrinsicHelper* intrinsic_helper, - greenland::IRBuilder* irb); + QuickCompiler* quick_compiler); } #endif @@ -166,11 +163,6 @@ CompileDexMethod(OatCompilationUnit* oat_compilation_unit, InvokeType invoke_typ return method_compiler->Compile(); } else { // Use quick - llvm::LLVMContext* context = cunit->GetLLVMContext(); - llvm::Module* module = cunit->GetModule(); - greenland::IntrinsicHelper* intrinsic_helper = &cunit->GetDexLangContext()->GetIntrinsicHelper(); - UniquePtr greenland_irbuilder( - new greenland::IRBuilder(*context, *module, *intrinsic_helper)); oatCompileMethodToGBC(*compiler_, oat_compilation_unit->GetCodeItem(), oat_compilation_unit->access_flags_, @@ -178,10 +170,7 @@ CompileDexMethod(OatCompilationUnit* oat_compilation_unit, InvokeType invoke_typ oat_compilation_unit->GetDexMethodIndex(), oat_compilation_unit->GetClassLoader(), *oat_compilation_unit->GetDexFile(), - module, - context, - intrinsic_helper, - greenland_irbuilder.get() + cunit->GetQuickContext() ); cunit->SetCompiler(compiler_); -- cgit v1.2.3-59-g8ed1b