commit 8dbf0cf3714d9748e6acef7a5f070fc517bda681
author Nicolas Geoffray <ngeoffray@google.com> Tue Aug 11 02:14:38 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Aug 11 02:14:38 2015 +0000
tree 8302f7b01f06916a5f94e76f16ea71f16f323c3c
parent f25b661b3708c865cdaa0a018372a42881353bea

Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit.""

bug:22866717

This reverts commit f25b661b3708c865cdaa0a018372a42881353bea.

Change-Id: I95e8310e6c3d8e6edb736fdefcabf602cce3a4e0

compiler/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 0106595..4c74679 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -276,12 +276,12 @@
     nullptr,
     caller_compilation_unit_.GetClassLoader(),
     class_linker,
-    *resolved_method->GetDexFile(),
+    callee_dex_file,
     code_item,
     resolved_method->GetDeclaringClass()->GetDexClassDefIndex(),
-    resolved_method->GetDexMethodIndex(),
+    method_index,
     resolved_method->GetAccessFlags(),
-    nullptr);
+    compiler_driver_->GetVerifiedMethod(&callee_dex_file, method_index));
 
   bool requires_ctor_barrier = false;