commit c934aab85b43a2338cf26d7af01d40fb06f59bec
author Rico Wind <ricow@google.com> Fri Dec 06 14:11:30 2024 +0100
committer Rico Wind <ricow@google.com> Fri Dec 06 14:43:46 2024 +0000
tree 1b7296c7ae7b63f26bc48bd866095bbd73939e4a
parent b74c404673dd18104acdfb6f4cd3a296e33e93e7

Fix NPE from running chrome with optimized resource shrinking

We would generally treat any constant as a const number below (and ResourceConstNumber is not!)

Bug: 382118722
Change-Id: Ic5e1f3ec2710620ff26d64af3c7b15d7a78164bc

src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
index c73dd4e..48bf2c0 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
@@ -141,7 +141,7 @@
         BasicBlock phiBlock = phi.getBlock();
         for (int i = 0; i < phi.getOperands().size(); i++) {
           Value value = phi.getOperand(i);
-          if (value.isConstant()) {
+          if (value.isConstNumber()) {
             recordNewTargetForGoto(value, phiBlock.getPredecessors().get(i), theIf, newTargets);
           }
         }