commit ec06809b9fb7d4a0d2c3e46066bd37034130e53b
author Nicolas Geoffray <ngeoffray@google.com> Mon May 10 17:28:32 2021 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri May 14 07:38:39 2021 +0000
tree c3a69b142e38d249a01ed425cde23caa78c1d36c
parent 1651c6050d913fb38ebd293df9da6d189eb3851d

Reland "Devirtualize to HInvokeStaticOrDirect."

This reverts commit 39d4df62d4e2606073d05cc363370db825ad7b9f.

Reason for revert: fix JIT-zygote issue.

Test: JIT zygote boots.

Change-Id: I895ad8e59e472fb662ca9bc5394c2fd9c6babc74

runtime/entrypoints/quick/quick_trampoline_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index bc5a10d..eaa9f4e 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -1357,7 +1357,7 @@
       // odd situation where the ArtMethod being executed is unrelated to the
       // receiver of the method.
       called = called->GetCanonicalMethod();
-      if (invoke_type == kSuper) {
+      if (invoke_type == kSuper || invoke_type == kInterface || invoke_type == kVirtual) {
         if (called->GetDexFile() == called_method.dex_file) {
           called_method.index = called->GetDexMethodIndex();
         } else {