commit 667e1cb5fb8211b535b9f6815c1db42850f3ef46
author Søren Gjesse <sgjesse@google.com> Mon Jan 18 13:23:24 2021 +0100
committer Søren Gjesse <sgjesse@google.com> Mon Jan 18 12:40:00 2021 +0000
tree bdea1a717ff0e87adfe8a653769d4d24855fa04f
parent 3be4ffbd2741b7a779aae5c03cdc6028a3c7bdab

Update reproduction of b/177790310

Extend the switch for the test to fail even with switch rewriting.

Bug: 177790310
Change-Id: Ic235530752f1e88b42c615d116a903b2ceb11831

src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java

diff --git a/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java b/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
index 552211f..0f3f2cc 100644
--- a/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
@@ -4,6 +4,8 @@
 package com.android.tools.r8.rewrite.switches;
 
 import com.android.tools.r8.CompilationMode;
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.NeverPropagateValue;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestRunResult;
@@ -32,8 +34,7 @@
   }
 
   private void checkResult(TestRunResult<?> result) {
-    if (mode == CompilationMode.DEBUG
-        && parameters.getDexRuntimeVersion().isOlderThanOrEqual(Version.V4_0_4)) {
+    if (parameters.getDexRuntimeVersion().isOlderThanOrEqual(Version.V4_0_4)) {
       result.assertFailureWithErrorThatThrows(AssertionError.class);
     } else {
       result.assertSuccessWithOutputLines("good");
@@ -55,6 +56,8 @@
     testForR8(parameters.getBackend())
         .addInnerClasses(this.getClass())
         .addKeepMainRule(TestClass.class)
+        .enableInliningAnnotations()
+        .enableMemberValuePropagationAnnotations()
         .setMinApi(parameters.getApiLevel())
         .setMode(mode)
         .run(parameters.getRuntime(), TestClass.class)
@@ -62,8 +65,16 @@
   }
 
   static class TestClass {
-    public static void main(String[] args) {
-      switch (0x7fffffff) {
+    @NeverInline
+    @NeverPropagateValue
+    public static void f(int i) {
+      switch (i) {
+        case 0x7ffffffd:
+          System.out.println("a");
+          break;
+        case 0x7ffffffe:
+          System.out.println("b");
+          break;
         case 0x7fffffff:
           System.out.println("good");
           break;
@@ -71,5 +82,9 @@
           throw new AssertionError();
       }
     }
+
+    public static void main(String[] args) {
+      f(0x7fffffff);
+    }
   }
 }