Change containsBaseInFlow to verifyContainsBaseInFlow
Change-Id: I208fd1201107416af9a71fc54357766a5c3c7810
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/AbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/AbstractFunction.java
index 852bd2b..ec8d43e 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/AbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/AbstractFunction.java
@@ -34,7 +34,7 @@
ConcreteValueState inState);
/** Returns true if the given {@param inFlow} is a declared input of this abstract function. */
- boolean containsBaseInFlow(BaseInFlow inFlow);
+ boolean verifyContainsBaseInFlow(BaseInFlow inFlow);
/**
* Returns the program field or parameter graph nodes that this function depends on. Upon any
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/CastAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/CastAbstractFunction.java
index 660c42a..a4eb77e 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/CastAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/CastAbstractFunction.java
@@ -28,8 +28,9 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow inFlow) {
- return inFlow.equals(this.inFlow);
+ public boolean verifyContainsBaseInFlow(BaseInFlow inFlow) {
+ assert inFlow.equals(this.inFlow);
+ return true;
}
@Override
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/FlowGraphStateProvider.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/FlowGraphStateProvider.java
index fce1a27..4b19a1d 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/FlowGraphStateProvider.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/FlowGraphStateProvider.java
@@ -42,13 +42,13 @@
@Override
public ValueState getState(DexField field) {
- assert abstractFunction.containsBaseInFlow(new FieldValue(field));
+ assert abstractFunction.verifyContainsBaseInFlow(new FieldValue(field));
return flowGraph.getState(field);
}
@Override
public ValueState getState(BaseInFlow inFlow, Supplier<ValueState> defaultStateProvider) {
- assert abstractFunction.containsBaseInFlow(inFlow);
+ assert abstractFunction.verifyContainsBaseInFlow(inFlow);
return flowGraph.getState(inFlow, defaultStateProvider);
}
};
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/IdentityAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/IdentityAbstractFunction.java
index 7b20e77..1b33495b 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/IdentityAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/IdentityAbstractFunction.java
@@ -26,7 +26,7 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow inFlow) {
+ public boolean verifyContainsBaseInFlow(BaseInFlow inFlow) {
throw new Unreachable();
}
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/InstanceFieldReadAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/InstanceFieldReadAbstractFunction.java
index 560f00d..893a043 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/InstanceFieldReadAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/InstanceFieldReadAbstractFunction.java
@@ -47,8 +47,9 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow inFlow) {
- return inFlow.equals(receiver) || inFlow.isFieldValue(field);
+ public boolean verifyContainsBaseInFlow(BaseInFlow inFlow) {
+ assert inFlow.equals(receiver) || inFlow.isFieldValue(field);
+ return true;
}
@Override
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/OrAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/OrAbstractFunction.java
index c5f9cc5..8e84a76 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/OrAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/OrAbstractFunction.java
@@ -43,12 +43,14 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow otherInFlow) {
+ public boolean verifyContainsBaseInFlow(BaseInFlow otherInFlow) {
if (inFlow.isAbstractFunction()) {
- return inFlow.asAbstractFunction().containsBaseInFlow(otherInFlow);
+ assert inFlow.asAbstractFunction().verifyContainsBaseInFlow(otherInFlow);
+ } else {
+ assert inFlow.isBaseInFlow();
+ assert inFlow.equals(otherInFlow);
}
- assert inFlow.isBaseInFlow();
- return inFlow.equals(otherInFlow);
+ return true;
}
@Override
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/UnknownAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/UnknownAbstractFunction.java
index 4a4a665..dd06a31 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/UnknownAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/UnknownAbstractFunction.java
@@ -26,7 +26,7 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow inFlow) {
+ public boolean verifyContainsBaseInFlow(BaseInFlow inFlow) {
throw new Unreachable();
}
diff --git a/src/main/java/com/android/tools/r8/optimize/compose/UpdateChangedFlagsAbstractFunction.java b/src/main/java/com/android/tools/r8/optimize/compose/UpdateChangedFlagsAbstractFunction.java
index 46c4d58..e57b4fb 100644
--- a/src/main/java/com/android/tools/r8/optimize/compose/UpdateChangedFlagsAbstractFunction.java
+++ b/src/main/java/com/android/tools/r8/optimize/compose/UpdateChangedFlagsAbstractFunction.java
@@ -106,12 +106,14 @@
}
@Override
- public boolean containsBaseInFlow(BaseInFlow otherInFlow) {
+ public boolean verifyContainsBaseInFlow(BaseInFlow otherInFlow) {
if (inFlow.isAbstractFunction()) {
- return inFlow.asAbstractFunction().containsBaseInFlow(otherInFlow);
+ assert inFlow.asAbstractFunction().verifyContainsBaseInFlow(otherInFlow);
+ } else {
+ assert inFlow.isBaseInFlow();
+ assert inFlow.equals(otherInFlow);
}
- assert inFlow.isBaseInFlow();
- return inFlow.equals(otherInFlow);
+ return true;
}
@Override
