commit | e26d683e5f1fffefd617bf5f94a899c206c40f2a | [log] [tgz] |
---|---|---|
author | Christoffer Adamsen <christofferqa@google.com> | Mon Aug 12 14:31:35 2024 +0200 |
committer | Christoffer Adamsen <christofferqa@google.com> | Mon Aug 12 13:16:12 2024 +0000 |
tree | e3b2f25294a3769283703db79fb610e1dc71bbb0 | |
parent | 5bbb1756c07e9d99e9b3ae34d448f73b0619a98f [diff] |
Account for array type states with explicit nullability tracking Bug: b/358629308 Change-Id: I525c449062e5dcd716f8a84615fb8585885376e2
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java index 79703e4..28d0ead 100644 --- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java +++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java
@@ -123,7 +123,7 @@ } if (state.isReferenceState()) { ConcreteReferenceTypeValueState referenceState = state.asReferenceState(); - if (referenceState.getDynamicType().getNullability().isNullable() + if (referenceState.getNullability().isNullable() && referenceState.getAbstractValue(appView).isUnknown()) { return; }