commit dd21ca40aa8163850da59b8e19b1eb5285021aec
author Christoffer Adamsen <christofferqa@google.com> Wed Apr 23 12:46:05 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Sun Apr 27 23:18:40 2025 -0700
tree 76738c7cbddfd495507c10bf763a4a298c5df5fa
parent f83e0beb10bd999cec18f062979ef891122c0b9e

Add validation of R8 partial include/exclude patterns

Failing compilation in presence of invalid patterns avoid confusion why the patterns are not evaluated correctly.

Fixes: b/410541056
Change-Id: Ibf3fbc466b69877c91d1afce3b5628017f7144be

src/main/java/com/android/tools/r8/partial/R8PartialCompilationConfiguration.java

diff --git a/src/main/java/com/android/tools/r8/partial/R8PartialCompilationConfiguration.java b/src/main/java/com/android/tools/r8/partial/R8PartialCompilationConfiguration.java
index d090004..20514e3 100644
--- a/src/main/java/com/android/tools/r8/partial/R8PartialCompilationConfiguration.java
+++ b/src/main/java/com/android/tools/r8/partial/R8PartialCompilationConfiguration.java
@@ -190,15 +190,28 @@
         return new UnnamedPackageMatcher();
       } else if (descriptorPrefix.endsWith("/**")) {
         return new PackageAndSubpackagePrefixMatcher(
-            descriptorPrefix.substring(0, descriptorPrefix.length() - 2));
+            extractDescriptorPrefixWithoutWildcards(descriptorPrefix, 2));
       } else if (descriptorPrefix.endsWith("/*")) {
         return new PackagePrefixMatcher(
-            descriptorPrefix.substring(0, descriptorPrefix.length() - 1));
+            extractDescriptorPrefixWithoutWildcards(descriptorPrefix, 1));
       } else if (descriptorPrefix.endsWith("*")) {
-        return new ClassPrefixMatcher(descriptorPrefix.substring(0, descriptorPrefix.length() - 1));
+        return new ClassPrefixMatcher(extractDescriptorPrefixWithoutWildcards(descriptorPrefix, 1));
       } else {
-        return new ClassNameMatcher(descriptorPrefix + ';');
+        return new ClassNameMatcher(
+            extractDescriptorPrefixWithoutWildcards(descriptorPrefix, 0) + ';');
       }
     }
+
+    private static String extractDescriptorPrefixWithoutWildcards(
+        String descriptorPattern, int numberOfWildcardsToRemove) {
+      String descriptorPrefixWithoutWildcards =
+          descriptorPattern.substring(0, descriptorPattern.length() - numberOfWildcardsToRemove);
+      if (descriptorPrefixWithoutWildcards.indexOf('*') >= 0) {
+        throw new IllegalArgumentException(
+            "Expected descriptor prefix without wildcards, got: "
+                + descriptorPrefixWithoutWildcards);
+      }
+      return descriptorPrefixWithoutWildcards;
+    }
   }
 }

src/main/java/com/android/tools/r8/partial/predicate/ClassNameMatcher.java

diff --git a/src/main/java/com/android/tools/r8/partial/predicate/ClassNameMatcher.java b/src/main/java/com/android/tools/r8/partial/predicate/ClassNameMatcher.java
index 76f8603..8292d34 100644
--- a/src/main/java/com/android/tools/r8/partial/predicate/ClassNameMatcher.java
+++ b/src/main/java/com/android/tools/r8/partial/predicate/ClassNameMatcher.java
@@ -11,8 +11,7 @@
   private final String descriptor;
 
   public ClassNameMatcher(String descriptor) {
-    assert descriptor.charAt(0) == 'L';
-    assert descriptor.charAt(descriptor.length() - 1) == ';';
+    assert DescriptorUtils.isValidClassDescriptor(descriptor);
     this.descriptor = descriptor;
   }