diff options
| author | 2014-01-27 11:15:17 +0000 | |
|---|---|---|
| committer | 2014-01-28 11:22:42 +0000 | |
| commit | 2730db03beee4d6687ddfb5000c33c0370fbc6eb (patch) | |
| tree | a85706c800c67deda5c7b612c8010059aa7b365c /compiler/llvm | |
| parent | c7f832061fea59fd6abd125f26c8ca1faec695a5 (diff) | |
Add VerfiedMethod to DexCompilationUnit.
Avoid some mutex locking and map lookups.
Change-Id: I8e0486af77e38dcd065569572a6b985eb57f4f63
Diffstat (limited to 'compiler/llvm')
| -rw-r--r-- | compiler/llvm/compiler_llvm.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/llvm/compiler_llvm.cc b/compiler/llvm/compiler_llvm.cc index 8f996fa75a..94408bb39c 100644 --- a/compiler/llvm/compiler_llvm.cc +++ b/compiler/llvm/compiler_llvm.cc @@ -21,6 +21,7 @@ #include "class_linker.h" #include "compiled_method.h" #include "dex/verification_results.h" +#include "dex/verified_method.h" #include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "globals.h" @@ -153,11 +154,9 @@ CompileDexMethod(DexCompilationUnit* dex_compilation_unit, InvokeType invoke_typ cunit->Materialize(); - MethodReference mref(dex_compilation_unit->GetDexFile(), - dex_compilation_unit->GetDexMethodIndex()); return new CompiledMethod(*compiler_driver_, compiler_driver_->GetInstructionSet(), cunit->GetElfObject(), - *compiler_driver_->GetVerificationResults()->GetDexGcMap(mref), + dex_compilation_unit->GetVerifiedMethod()->GetDexGcMap(), cunit->GetDexCompilationUnit()->GetSymbol()); } @@ -214,7 +213,7 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::CompilerDriver& driver, art::DexCompilationUnit dex_compilation_unit( NULL, class_loader, class_linker, dex_file, code_item, - class_def_idx, method_idx, access_flags); + class_def_idx, method_idx, access_flags, driver.GetVerifiedMethod(&dex_file, method_idx)); art::llvm::CompilerLLVM* compiler_llvm = ContextOf(driver); art::CompiledMethod* result = compiler_llvm->CompileDexMethod(&dex_compilation_unit, invoke_type); return result; @@ -226,8 +225,8 @@ extern "C" art::CompiledMethod* ArtLLVMJniCompileMethod(art::CompilerDriver& dri art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker(); art::DexCompilationUnit dex_compilation_unit( - NULL, NULL, class_linker, dex_file, NULL, - 0, method_idx, access_flags); + nullptr, nullptr, class_linker, dex_file, nullptr, + 0, method_idx, access_flags, nullptr); art::llvm::CompilerLLVM* compiler_llvm = ContextOf(driver); art::CompiledMethod* result = compiler_llvm->CompileNativeMethod(&dex_compilation_unit); |