commit 666fcef6b74bc1e527fa06a6c6903feff9eadc36
author Søren Gjesse <sgjesse@google.com> Fri May 06 10:58:50 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Fri May 06 10:58:50 2022 +0200
tree 077d5bd27989239dd59d20f6d05e06d2fcff30cd
parent c66b1b12912ee22028bcd7f34f23bc1bac3423aa

Negate condition to correctly match name

Bug: 218298666
Change-Id: Id8bf2048af36c8c07ce07b5bfd35ed766f555a52

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index de14e5d..4215029 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -1115,7 +1115,7 @@
       timing.end();
     }
 
-    if (!options.canHaveInvokeInterfaceToObjectMethodBug()) {
+    if (options.canHaveInvokeInterfaceToObjectMethodBug()) {
       timing.begin("JDK-8272564 fix rewrite");
       CodeRewriter.rewriteJdk8272564Fix(code, context, appView);
       timing.end();

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 66e9de8..005e185 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2313,6 +2313,6 @@
   //
   // See b/218298666.
   public boolean canHaveInvokeInterfaceToObjectMethodBug() {
-    return isGeneratingClassFiles() || getMinApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.O);
+    return isGeneratingDex() && getMinApiLevel().isLessThan(AndroidApiLevel.O);
   }
 }