Reland "Run default value analysis when abstract value is not unknown"
This reverts commit 990d878fda435433880d62ccadc2880ba7222e83.
Bug: b/358629308
Change-Id: If21fb2bc5a42335b4e3305be515fa27d4513bbd3
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 45848ad..79703e4 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
@@ -25,6 +25,7 @@
import com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeValueState;
import com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeValueState;
import com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeValueState;
+import com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeValueState;
import com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteValueState;
import com.android.tools.r8.optimize.argumentpropagation.codescanner.FieldStateCollection;
import com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyValueState;
@@ -120,9 +121,12 @@
if (state.isUnknown()) {
return;
}
- if (state.isReferenceState()
- && state.asReferenceState().getNullability().isNullable()) {
- return;
+ if (state.isReferenceState()) {
+ ConcreteReferenceTypeValueState referenceState = state.asReferenceState();
+ if (referenceState.getDynamicType().getNullability().isNullable()
+ && referenceState.getAbstractValue(appView).isUnknown()) {
+ return;
+ }
}
fieldsOfInterest
.computeIfAbsent(field.getHolder(), ignoreKey(ArrayList::new))
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/DefaultFieldValueJoinerWithUnknownDynamicTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/DefaultFieldValueJoinerWithUnknownDynamicTypeTest.java
index 8d654f1..0a5e1ab 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/DefaultFieldValueJoinerWithUnknownDynamicTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/DefaultFieldValueJoinerWithUnknownDynamicTypeTest.java
@@ -43,8 +43,7 @@
.setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
- // TODO(b/358629308): Should succeed.
- .assertFailureWithErrorThatThrows(RuntimeException.class);
+ .assertSuccessWithEmptyOutput();
}
@NeverClassInline
