From ce4cc0d1818e872c1c7f3c3519a82259afd5c288 Mon Sep 17 00:00:00 2001 From: TDYa127 Date: Sun, 18 Nov 2012 16:59:53 -0800 Subject: Using gcmap instead of shadow frame. Fix misuse of TBAAJRuntime & TBAARuntimeInfo. Now, the TBAAJRuntime is only for runtime support function. Update DexPC before lock object and suspend. Change-Id: I40fa37f4863fe6e127328a8413285ee3c62e8505 --- src/compiler_llvm/compiler_llvm.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 3ec5e68061..78434072ee 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -31,6 +31,7 @@ #include "stl_util.h" #include "stub_compiler.h" #include "utils_llvm.h" +#include "verifier/method_verifier.h" #include #include @@ -180,8 +181,10 @@ CompileDexMethod(OatCompilationUnit* oat_compilation_unit, InvokeType invoke_typ cunit->Materialize(); - return new CompiledMethod(cunit->GetInstructionSet(), - cunit->GetCompiledCode()); + Compiler::MethodReference mref(dex_file_, method_idx_); + return new CompiledMethod(cunit_->GetInstructionSet(), + cunit_->GetCompiledCode(), + *verifier::MethodVerifier::GetDexGcMap(mref)); } #else UniquePtr method_compiler( -- cgit v1.2.3-59-g8ed1b