Fix dead code remover
Change-Id: Ie0a50998577819fae14167708923b835d74232c8
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java b/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
index e9b180c..0528fd7 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DeadCodeRemover.java
@@ -65,6 +65,7 @@
code.removeRedundantBlocks();
assert code.isConsistentSSA(appView);
+ assert verifyNoDeadCode(code);
timing.end();
}
@@ -140,6 +141,7 @@
CheckCast checkCast = current.asCheckCast();
if (!checkCast.isRefiningStaticType(appView.options())
&& checkCast.outValue().getLocalInfo() == checkCast.object().getLocalInfo()) {
+ updateWorklistWithNonDebugUses(worklist, checkCast);
checkCast.outValue().replaceUsers(checkCast.object());
checkCast.object().uniquePhiUsers().forEach(Phi::removeTrivialPhi);
}
@@ -196,6 +198,16 @@
}
}
+ private static void updateWorklistWithNonDebugUses(
+ Queue<BasicBlock> worklist, CheckCast checkCast) {
+ for (Instruction user : checkCast.outValue().uniqueUsers()) {
+ worklist.add(user.getBlock());
+ }
+ for (Phi user : checkCast.outValue().uniquePhiUsers()) {
+ worklist.add(user.getBlock());
+ }
+ }
+
private boolean removeUnneededCatchHandlers(IRCode code) {
boolean mayHaveIntroducedUnreachableBlocks = false;
for (BasicBlock block : code.blocks) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastChainRemoval2Test.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastChainRemoval2Test.java
new file mode 100644
index 0000000..b1f7de9
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastChainRemoval2Test.java
@@ -0,0 +1,65 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.ir.optimize.checkcast;
+
+import com.android.tools.r8.NeverInline;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+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 CheckCastChainRemoval2Test extends TestBase {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ public CheckCastChainRemoval2Test() {}
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void testCheckCast() throws Exception {
+ testForR8(parameters.getBackend())
+ .addProgramClasses(A.class, B.class, Main.class)
+ .addKeepAllClassesRule()
+ .addKeepMainRule(Main.class)
+ .addOptionsModification((opt) -> opt.testing.enableCheckCastAndInstanceOfRemoval = false)
+ .enableInliningAnnotations()
+ .setMinApi(this.parameters)
+ .run(this.parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("false");
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) {
+ System.out.println(check());
+ }
+
+ @NeverInline
+ private static boolean check() {
+ Object o = null;
+ A a = (A) o;
+ if (a instanceof B) {
+ B b = (B) a;
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+
+ static class B extends A {}
+
+ static class A {}
+}
