From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 7 Aug 2015 15:31:10 +0000 (+0000)
Subject: Revert "Pass the verified method to the inlinee DexCompilationUnit."
X-Git-Tag: android-x86-7.1-r1~889^2~590^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f25b661b3708c865cdaa0a018372a42881353bea;p=android-x86%2Fart.git

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

Crashes testing libcore on host/x86.

Bug:22866717

This reverts commit 08624c50f488ecd845e48683e84726ff8c53e6a7.

Change-Id: Ia8f130d9ea32e171e554bd3e10c44f8453111b52
---

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