diff options
| author | 2013-07-12 08:50:57 -0700 | |
|---|---|---|
| committer | 2013-07-12 08:50:57 -0700 | |
| commit | 1581766afea0b31de0ed0f9f677fc3b92a29daae (patch) | |
| tree | 78793c270596134e5848dda3af66e674a7160017 /src/compiler/llvm/compiler_llvm.cc | |
| parent | 3d76933675895667f212500a65c9c7ea2b6209fc (diff) | |
| parent | 51c2467e8771b56e25ae4f17f66522f979f57a7e (diff) | |
resolved conflicts for merge of 51c2467e to dalvik-dev
Change-Id: Ia7a8785d3220df6feeb999bc70f6d1917cad8d75
Diffstat (limited to 'src/compiler/llvm/compiler_llvm.cc')
| -rw-r--r-- | src/compiler/llvm/compiler_llvm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/llvm/compiler_llvm.cc b/src/compiler/llvm/compiler_llvm.cc index dfd0e326d2..3af6687f65 100644 --- a/src/compiler/llvm/compiler_llvm.cc +++ b/src/compiler/llvm/compiler_llvm.cc @@ -152,8 +152,8 @@ CompileDexMethod(DexCompilationUnit* dex_compilation_unit, InvokeType invoke_typ cunit->Materialize(); - CompilerDriver::MethodReference mref(dex_compilation_unit->GetDexFile(), - dex_compilation_unit->GetDexMethodIndex()); + MethodReference mref(dex_compilation_unit->GetDexFile(), + dex_compilation_unit->GetDexMethodIndex()); return new CompiledMethod(compiler_driver_->GetInstructionSet(), cunit->GetElfObject(), *verifier::MethodVerifier::GetDexGcMap(mref), |