commit 0a61f83177efd58dd783e2e839fd9a0f2f09b7e3
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Apr 14 14:42:31 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Apr 17 06:30:46 2023 +0000
tree 3f6a23fa7e5fe053480249769edda7daccc73679
parent 7038e7558f295669d7b22aab4b602787eafbabb9

Remove unused ProguardClassType UNSPECIFIED

Change-Id: I874876698ee5ba5ae416127f63785641ccc3c899

src/main/java/com/android/tools/r8/shaking/ProguardClassSpecification.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardClassSpecification.java b/src/main/java/com/android/tools/r8/shaking/ProguardClassSpecification.java
index 80d3b34..f4542d8 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardClassSpecification.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardClassSpecification.java
@@ -28,7 +28,7 @@
     protected ProguardAccessFlags classAccessFlags = new ProguardAccessFlags();
     protected ProguardAccessFlags negatedClassAccessFlags = new ProguardAccessFlags();
     protected boolean classTypeNegated = false;
-    protected ProguardClassType classType = ProguardClassType.UNSPECIFIED;
+    protected ProguardClassType classType;
     protected ProguardClassNameList classNames;
     private final ImmutableList.Builder<ProguardTypeMatcher> inheritanceAnnotations =
         ImmutableList.builder();
@@ -132,7 +132,7 @@
     }
 
     public boolean hasClassType() {
-      return classType != null && classType != ProguardClassType.UNSPECIFIED;
+      return classType != null;
     }
 
     public ProguardClassType getClassType() {
@@ -221,7 +221,6 @@
       boolean inheritanceIsExtends,
       List<ProguardMemberRule> memberRules) {
     assert classType != null;
-    assert classType != ProguardClassType.UNSPECIFIED;
     assert origin != null;
     assert position != null;
     assert source != null || origin != Origin.unknown();
@@ -233,7 +232,6 @@
     this.negatedClassAccessFlags = negatedClassAccessFlags;
     this.classTypeNegated = classTypeNegated;
     this.classType = classType;
-    assert classType != null;
     this.classNames = classNames;
     this.inheritanceAnnotations = inheritanceAnnotations;
     this.inheritanceClassName = inheritanceClassName;

src/main/java/com/android/tools/r8/shaking/ProguardClassType.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardClassType.java b/src/main/java/com/android/tools/r8/shaking/ProguardClassType.java
index de70c89..41fe36e 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardClassType.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardClassType.java
@@ -30,12 +30,6 @@
     public boolean matches(DexClass clazz) {
       return clazz.accessFlags.isInterface();
     }
-  },
-  UNSPECIFIED {
-    @Override
-    public boolean matches(DexClass clazz) {
-      return true;
-    }
   };
 
   @Override
@@ -45,8 +39,6 @@
       case CLASS: return "class";
       case ENUM: return "enum";
       case INTERFACE: return "interface";
-      case UNSPECIFIED:
-        return "";
       default:
         throw new Unreachable("Invalid proguard class type '" + this + "'");
     }