Revert "Use isShrinkingAllowed in GenericSignatureCorrectnessHelper"
This reverts commit 25c1e5056a933d9d0f5db5668e2d0dfce37f0642.
Reason for revert: Bots are failing
Change-Id: I5b30b62c2769508a35c216093f1a19f1a950257b
diff --git a/src/main/java/com/android/tools/r8/graph/GenericSignatureCorrectnessHelper.java b/src/main/java/com/android/tools/r8/graph/GenericSignatureCorrectnessHelper.java
index 25c71b7..1946512 100644
--- a/src/main/java/com/android/tools/r8/graph/GenericSignatureCorrectnessHelper.java
+++ b/src/main/java/com/android/tools/r8/graph/GenericSignatureCorrectnessHelper.java
@@ -21,9 +21,6 @@
import com.android.tools.r8.graph.GenericSignature.ReturnType;
import com.android.tools.r8.graph.GenericSignature.TypeSignature;
import com.android.tools.r8.graph.GenericSignatureContextBuilder.TypeParameterContext;
-import com.android.tools.r8.shaking.KeepClassInfo;
-import com.android.tools.r8.shaking.KeepFieldInfo;
-import com.android.tools.r8.shaking.KeepMethodInfo;
import com.android.tools.r8.utils.ListUtils;
import java.util.List;
import java.util.function.Consumer;
@@ -128,12 +125,7 @@
SignatureEvaluationResult result =
genericSignatureContextEvaluator.evaluateClassSignatureForContext(typeParameterContext);
if (result.isInvalid() && mode.clearIfInvalid()) {
- // Only report info messages for classes that are kept explicitly. This is to ensure we do not
- // spam the developer with messages they can do nothing about.
- KeepClassInfo classInfo = appView.getKeepInfo().getClassInfo(clazz);
- if (appView.hasLiveness() && !classInfo.isShrinkingAllowed(appView.options())) {
- // If/when this no longer holds it should be moved into the condition.
- assert !classInfo.isSignatureAttributeRemovalAllowed(appView.options());
+ if (appView.hasLiveness() && appView.getKeepInfo().getClassInfo(clazz).isPinned()) {
appView
.options()
.reporter
@@ -155,13 +147,8 @@
genericSignatureContextEvaluator.visitMethodSignature(
methodSignature, typeParameterContext),
invalidResult -> {
- // Only report info messages for methods that are kept explicitly. This is to
- // ensure we do not spam the developer with messages they can do nothing about.
- KeepMethodInfo methodInfo = appView.getKeepInfo().getMethodInfo(method, clazz);
if (appView.hasLiveness()
- && !methodInfo.isShrinkingAllowed(appView.options())) {
- // If/when this no longer holds it should be moved into the condition.
- assert !methodInfo.isSignatureAttributeRemovalAllowed(appView.options());
+ && appView.getKeepInfo().getMethodInfo(method, clazz).isPinned()) {
appView
.options()
.reporter
@@ -184,12 +171,8 @@
genericSignatureContextEvaluator.visitFieldTypeSignature(
fieldSignature, typeParameterContext),
invalidResult -> {
- KeepFieldInfo fieldInfo = appView.getKeepInfo().getFieldInfo(field, clazz);
- // Only report info messages for fields that are kept explicitly. This is to
- // ensure we do not spam the developer with messages they can do nothing about.
- if (appView.hasLiveness() && !fieldInfo.isShrinkingAllowed(appView.options())) {
- // If/when this no longer holds it should be moved into the condition.
- assert !fieldInfo.isSignatureAttributeRemovalAllowed(appView.options());
+ if (appView.hasLiveness()
+ && appView.getKeepInfo().getFieldInfo(field, clazz).isPinned()) {
appView
.options()
.reporter
