commit 3c7b6516575c3eb979ff640abcc60ea70f1fa8e2
author Søren Gjesse <sgjesse@google.com> Fri May 06 11:03:26 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Fri May 06 11:03:26 2022 +0200
tree d228b4dba9aa31482798cf1226f3028d8528a5ff
parent 645aafb7d8e823b97a9b1deb5e9760c4081dc211

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 1e73aab..3d77615 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
@@ -1162,7 +1162,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 64dc5d3..ade884b 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2235,6 +2235,6 @@
   //
   // See b/218298666.
   public boolean canHaveInvokeInterfaceToObjectMethodBug() {
-    return isGeneratingClassFiles() || getMinApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.O);
+    return isGeneratingDex() && getMinApiLevel().isLessThan(AndroidApiLevel.O);
   }
 }