commit e13717e796d338b08ea66f6a7e3470ca44de707f
author Vladimir Marko <vmarko@google.com> Wed Nov 20 12:44:55 2013 +0000
committer Vladimir Marko <vmarko@google.com> Fri Dec 13 14:27:05 2013 +0000
tree eaa49dccd39c9c3c73b6d1831c930def0c0b14a2
parent cf28cbff9f0557dea9ed60358a956859ba1b56aa

Per-DexFile locking for inliner initialization.

And clean up lock and compiler driver naming.

Change-Id: I1562c7f55c4b0174a36007ba6199360da06169ff

compiler/dex/quick/gen_invoke.cc

diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index e66d4ea..ee6f9c8 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1242,7 +1242,7 @@
     if (inliner_ == nullptr) {
       QuickCompilerContext* context = reinterpret_cast<QuickCompilerContext*>(
           cu_->compiler_driver->GetCompilerContext());
-      inliner_ = &context->GetInlinerMap()->GetMethodInliner(cu_->dex_file);
+      inliner_ = context->GetInlinerMap()->GetMethodInliner(cu_->dex_file);
     }
     if (inliner_->GenIntrinsic(this, info)) {
       return;