commit | d7686696f0656e07428ac7bb560eb0e1b8210e43 | [log] [tgz] |
---|---|---|
author | Christoffer Adamsen <christofferqa@google.com> | Mon Aug 12 15:18:02 2024 +0200 |
committer | Christoffer Adamsen <christofferqa@google.com> | Mon Aug 12 15:18:02 2024 +0200 |
tree | 2d7f5c9e156d3b933573b3f4dcd93cbc5d981fb1 | |
parent | c50c964b466139b7e95230658af071f9efdd399b [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 5502be2..93026c3 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
@@ -98,7 +98,7 @@ } if (state.isReferenceState()) { ConcreteReferenceTypeValueState referenceState = state.asReferenceState(); - if (referenceState.getDynamicType().getNullability().isNullable() + if (referenceState.getNullability().isNullable() && referenceState.getAbstractValue(appView).isUnknown()) { return; }