diff options
| author | 2012-11-18 16:59:53 -0800 | |
|---|---|---|
| committer | 2012-12-04 11:07:34 -0800 | |
| commit | ce4cc0d1818e872c1c7f3c3519a82259afd5c288 (patch) | |
| tree | 308f2c30e5a842a5e459d96e730ca4432a020f4f /src/compiler_llvm/compiler_llvm.cc | |
| parent | 823b8acdf2c8274ff93b685e50a93ab9afc6af8b (diff) | |
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
Diffstat (limited to 'src/compiler_llvm/compiler_llvm.cc')
| -rw-r--r-- | src/compiler_llvm/compiler_llvm.cc | 7 |
1 files changed, 5 insertions, 2 deletions
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 <llvm/LinkAllPasses.h> #include <llvm/LinkAllVMCore.h> @@ -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<MethodCompiler> method_compiler( |