commit 4ccea217c88473a265ec776b3f0d5fcf92803948
author Rico Wind <ricow@google.com> Thu Sep 12 09:55:02 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Sep 13 13:49:26 2024 +0000
tree b6ed3d8f4be8552f37d36cf8f1c6ba54bf52ebaf
parent fc151291969224a34e5a27442fad4ad0ce8401d4

Fix assume inserter

If we update the dynamic type based on both null and non null we hit assertions later on

Change-Id: If03a63aa0f0aef20fa0129bccaa051d5780a782c

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/AssumeInserter.java b/src/main/java/com/android/tools/r8/ir/optimize/AssumeInserter.java
index fc63ec3..8d6c10c 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/AssumeInserter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/AssumeInserter.java
@@ -424,7 +424,7 @@
             return false;
           }
 
-          if (!otherAssumedValueInfo.isNonNull()) {
+          if (!otherAssumedValueInfo.isNonNull() && !otherAssumedValueInfo.isNull()) {
             // This is not redundant, but we can strengthen it with the dynamic type information
             // from the other assume instruction.
             assumedValueInfo.setDynamicType(