commit f1deddf6d2ab6af9d9b1f5094ba9cc40896831d4
author Christoffer Adamsen <christofferqa@google.com> Thu Apr 10 07:47:28 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Thu Apr 10 07:47:28 2025 +0000
tree 1a497ffdfb7c1d50b6514cfd177c291e940f76fe
parent 24b538849cfc52227a59453c5d61f7803306a917

Update IfSimplificationTest

Change-Id: I16abb53611cce645a3dad17d6dba17b377ae59f6

src/test/java/com/android/tools/r8/smali/IfSimplificationTest.java

diff --git a/src/test/java/com/android/tools/r8/smali/IfSimplificationTest.java b/src/test/java/com/android/tools/r8/smali/IfSimplificationTest.java
index f9023fa..b1735d4 100644
--- a/src/test/java/com/android/tools/r8/smali/IfSimplificationTest.java
+++ b/src/test/java/com/android/tools/r8/smali/IfSimplificationTest.java
@@ -7,6 +7,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.dex.code.DexConst4;
 import com.android.tools.r8.dex.code.DexIfEqz;
 import com.android.tools.r8.dex.code.DexIfGez;
@@ -26,7 +28,12 @@
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class IfSimplificationTest extends SmaliTestBase {
 
   static String[] ifOpcode;
@@ -40,6 +47,14 @@
     ifOpcode[IfType.GT.ordinal()] = "if-gt";
   }
 
+  @Parameter(0)
+  public TestParameters parameters;
+
+  @Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withNoneRuntime().build();
+  }
+
   @Test
   public void ifZeroNeqZero() {
     DexEncodedMethod method = oneMethodApplication(
@@ -448,10 +463,6 @@
         "      move                v0, v1",
         "      goto                :label_7"
     );
-    DexCode code = method.getCode().asDexCode();
-    // TODO(sgjesse): Maybe this test is too fragile, as it leaves quite a lot of code, so the
-    //  expectation might need changing with other optimizations.
-    // TODO(zerny): Consider optimizing the fallthrough branch of conditionals to not be return.
-    assertEquals(26, code.instructions.length);
+    assertEquals(25, method.getCode().asDexCode().getInstructions().length);
   }
 }