commit 82368e164f0ec65f2bfad05bf6ebd0a6c915fb22
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 21 08:51:04 2023 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 21 08:51:04 2023 +0200
tree a68b64f986fdc2a45880a9ed2e5cb896aa410fed
parent 1ff9bbe2e1c61518b797bcc16173bbb64921b543

Temporarily ignore -checkdiscard error in Chrome test after enabling LIR

Bug: b/288184354
Change-Id: Ifb5e679ef3d0619239f58ee8363c51171a90056d

src/main/java/com/android/tools/r8/R8.java

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 78cd2c8..82bd51b 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -1063,12 +1063,13 @@
             enqueuer.getGraphReporter().getGraphNode(reference), System.out);
       }
     }
-    if (appView.options().testing.dontReportFailingCheckDiscarded) {
-      return;
-    }
     DiscardedChecker discardedChecker =
         forMainDex ? DiscardedChecker.createForMainDex(appView) : DiscardedChecker.create(appView);
     List<ProgramDefinition> failed = discardedChecker.run(classes.get(), executorService);
+    if (appView.options().testing.dontReportFailingCheckDiscarded) {
+      assert !failed.isEmpty();
+      return;
+    }
     if (failed.isEmpty()) {
       return;
     }

src/test/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index 48689c3..36008e8 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -175,12 +175,9 @@
     return self();
   }
 
-  public T allowCheckDiscardedErrors(boolean skipReporting) {
+  public T allowCheckDiscardedErrors() {
     return addOptionsModification(
-        options -> {
-          options.testing.allowCheckDiscardedErrors = true;
-          options.testing.dontReportFailingCheckDiscarded = skipReporting;
-        });
+        options -> options.testing.dontReportFailingCheckDiscarded = true);
   }
 
   public T addEnumUnboxingInspector(Consumer<EnumUnboxingInspector> inspector) {

src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java

diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
index 37e3e39..cd06774 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
@@ -205,7 +205,7 @@
                         keepAllProtosRule(),
                         keepDynamicMethodSignatureRule(),
                         keepNewMessageInfoSignatureRule())
-                    .allowCheckDiscardedErrors(true));
+                    .allowCheckDiscardedErrors());
     assertRewrittenProtoSchemasMatch(
         new CodeInspector(getProgramFiles()), r8CompileResult.inspector());
   }

src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java b/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
index f9822e9..a2adf72 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
@@ -51,6 +51,7 @@
         .addDontWarn("android.content.pm.IPackageManager")
         .addOptionsModification(
             options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces())
+        .allowCheckDiscardedErrors()
         .allowUnusedDontWarnPatterns()
         .allowUnusedProguardConfigurationRules()
         .enableProtoShrinking(false)

src/test/java/com/android/tools/r8/neverreturnsnormally/NeverReturnsNormallyTest.java

diff --git a/src/test/java/com/android/tools/r8/neverreturnsnormally/NeverReturnsNormallyTest.java b/src/test/java/com/android/tools/r8/neverreturnsnormally/NeverReturnsNormallyTest.java
index bf116df..923778e 100644
--- a/src/test/java/com/android/tools/r8/neverreturnsnormally/NeverReturnsNormallyTest.java
+++ b/src/test/java/com/android/tools/r8/neverreturnsnormally/NeverReturnsNormallyTest.java
@@ -86,12 +86,7 @@
     }
     ToolHelper.allowTestProguardOptions(builder);
     AndroidApp app =
-        ToolHelper.runR8(
-            builder.build(),
-            opts -> {
-              opts.enableClassInlining = enableClassInliner;
-              opts.testing.dontReportFailingCheckDiscarded = true;
-            });
+        ToolHelper.runR8(builder.build(), opts -> opts.enableClassInlining = enableClassInliner);
     inspection.accept(new CodeInspector(app));
 
     if (parameters.isDexRuntime()) {