commit b2c431e80e92eb6437788cc544cee6c88c3156df
author Vladimir Marko <vmarko@google.com> Wed Aug 19 12:45:42 2015 +0000
committer Vladimir Marko <vmarko@google.com> Wed Aug 19 12:45:42 2015 +0000
tree 6c0ac5f843845e4b09829eb0fd9f1b3013cf4494
parent 9b688a095afbae21112df5d495487ac5231b12d0

Revert "Optimizing: Better invoke-static/-direct dispatch."

Reverting due to failing ndebug tests.

This reverts commit 9b688a095afbae21112df5d495487ac5231b12d0.

Change-Id: Ie4f69da6609df3b7c8443412b6cf7f5c43c2c5d9

compiler/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 202f3f0..4c74679 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -63,7 +63,7 @@
       if (call != nullptr && call->GetIntrinsic() == Intrinsics::kNone) {
         // We use the original invoke type to ensure the resolution of the called method
         // works properly.
-        if (!TryInline(call)) {
+        if (!TryInline(call, call->GetDexMethodIndex())) {
           if (kIsDebugBuild && IsCompilingWithCoreImage()) {
             std::string callee_name =
                 PrettyMethod(call->GetDexMethodIndex(), *outer_compilation_unit_.GetDexFile());
@@ -169,23 +169,15 @@
   }
 }
 
-bool HInliner::TryInline(HInvoke* invoke_instruction) const {
-  uint32_t method_index = invoke_instruction->GetDexMethodIndex();
+bool HInliner::TryInline(HInvoke* invoke_instruction, uint32_t method_index) const {
   ScopedObjectAccess soa(Thread::Current());
   const DexFile& caller_dex_file = *caller_compilation_unit_.GetDexFile();
   VLOG(compiler) << "Try inlining " << PrettyMethod(method_index, caller_dex_file);
 
   ClassLinker* class_linker = caller_compilation_unit_.GetClassLinker();
   // We can query the dex cache directly. The verifier has populated it already.
-  ArtMethod* resolved_method;
-  if (invoke_instruction->IsInvokeStaticOrDirect()) {
-    MethodReference ref = invoke_instruction->AsInvokeStaticOrDirect()->GetTargetMethod();
-    resolved_method = class_linker->FindDexCache(*ref.dex_file)->GetResolvedMethod(
-        ref.dex_method_index, class_linker->GetImagePointerSize());
-  } else {
-    resolved_method = class_linker->FindDexCache(caller_dex_file)->GetResolvedMethod(
-        method_index, class_linker->GetImagePointerSize());
-  }
+  ArtMethod* resolved_method = class_linker->FindDexCache(caller_dex_file)->GetResolvedMethod(
+      method_index, class_linker->GetImagePointerSize());
 
   if (resolved_method == nullptr) {
     // Method cannot be resolved if it is in another dex file we do not have access to.
@@ -212,8 +204,11 @@
     }
   }
 
-  bool same_dex_file =
-      IsSameDexFile(*outer_compilation_unit_.GetDexFile(), *resolved_method->GetDexFile());
+  bool same_dex_file = true;
+  const DexFile& outer_dex_file = *outer_compilation_unit_.GetDexFile();
+  if (resolved_method->GetDexFile()->GetLocation().compare(outer_dex_file.GetLocation()) != 0) {
+    same_dex_file = false;
+  }
 
   const DexFile::CodeItem* code_item = resolved_method->GetCodeItem();