commit 516dc0ebd89f9faf371a3a08bf65c5845c970484
author Christoffer Adamsen <christofferqa@google.com> Wed Mar 06 13:52:43 2024 +0000
committer Christoffer Adamsen <christofferqa@google.com> Wed Mar 06 13:53:16 2024 +0000
tree bbdba70722feeb0c73eb36349db2a0985c0f0170
parent f2513c5fc6f960e3f8335b0d3253481a3a0abe2d

Remove assume instructions after trivial phi removal in inliner

Fixes: b/328403695
Change-Id: I54a72c8b6ee9d2e1793e20483386a60a9118d35d

src/main/java/com/android/tools/r8/ir/optimize/AffectedValues.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/AffectedValues.java b/src/main/java/com/android/tools/r8/ir/optimize/AffectedValues.java
index 8ee6379..681eb9e 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/AffectedValues.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/AffectedValues.java
@@ -47,6 +47,7 @@
       TypeAnalysis typeAnalysis = new TypeAnalysis(appView, code);
       typeAnalysisConsumer.accept(typeAnalysis);
       typeAnalysis.narrowingWithAssumeRemoval(this);
+      clear();
     }
   }
 

src/main/java/com/android/tools/r8/ir/optimize/Inliner.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
index 5a16e64..8068a8a 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
@@ -1169,9 +1169,9 @@
     }
     assert inlineeStack.isEmpty();
     code.removeBlocks(blocksToRemove);
-    affectedValues.narrowingWithAssumeRemoval(appView, code);
     classInitializationAnalysis.finish();
-    code.removeAllDeadAndTrivialPhis();
+    code.removeAllDeadAndTrivialPhis(affectedValues);
+    affectedValues.narrowingWithAssumeRemoval(appView, code);
     code.removeRedundantBlocks();
     assert code.isConsistentSSA(appView);
   }