From 2b5eaa2b49f7489bafdadc4b4463ae27e4261817 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 13 Dec 2013 13:59:30 +0000 Subject: Move compiler code out of method verifier. We want to detect small methods for inlining at the end of the method verification. Instead of adding more compiler code to the runtime, we create a callback from the runtime into the compiler, so that we can keep the code there. Additionally, we move the compiler-related code that was already in the method verifier to the compiler since it doesn't really belong to the runtime in the first place. Change-Id: I708ca13227c809e07917ff3879a89722017e83a9 --- compiler/llvm/compiler_llvm.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'compiler/llvm/compiler_llvm.cc') diff --git a/compiler/llvm/compiler_llvm.cc b/compiler/llvm/compiler_llvm.cc index d59afd48b7..35d1ecd783 100644 --- a/compiler/llvm/compiler_llvm.cc +++ b/compiler/llvm/compiler_llvm.cc @@ -20,6 +20,7 @@ #include "base/stl_util.h" #include "class_linker.h" #include "compiled_method.h" +#include "dex/verified_methods_data.h" #include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "globals.h" @@ -155,7 +156,8 @@ CompileDexMethod(DexCompilationUnit* dex_compilation_unit, InvokeType invoke_typ MethodReference mref(dex_compilation_unit->GetDexFile(), dex_compilation_unit->GetDexMethodIndex()); return new CompiledMethod(*compiler_driver_, compiler_driver_->GetInstructionSet(), - cunit->GetElfObject(), *verifier::MethodVerifier::GetDexGcMap(mref), + cunit->GetElfObject(), + *compiler_driver_->GetVerifiedMethodsData()->GetDexGcMap(mref), cunit->GetDexCompilationUnit()->GetSymbol()); } -- cgit v1.2.3-59-g8ed1b