Snap for 8736029 from e1af5d0f485f5d5699a767de29a2a9432404db21 to mainline-go-permission-releaseaml_go_per_330912000android13-mainline-go-permission-release

Change-Id: Ib3d01d3fb00373a5226b40d03a950a07679534bc

4 files changed, 117 insertions, 6 deletions

diff --git a/src/main/com/tonicsystems/jarjar/PackageRemapper.java b/src/main/com/tonicsystems/jarjar/PackageRemapper.java
index 4d102be..e281f24 100644
--- a/src/main/com/tonicsystems/jarjar/PackageRemapper.java
+++ b/src/main/com/tonicsystems/jarjar/PackageRemapper.java
@@ -16,7 +16,6 @@
 
 package com.tonicsystems.jarjar;
 
-import org.objectweb.asm.*;
 import org.objectweb.asm.commons.*;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -28,7 +27,7 @@ class PackageRemapper extends Remapper
     private static final Pattern ARRAY_FOR_NAME_PATTERN
         = Pattern.compile("\\[L[\\p{javaJavaIdentifierPart}\\.]+?;");
 
-    private final List<Wildcard> wildcards;
+    private final WildcardTrie wildcards;
     private final Map<String, String> typeCache = new HashMap<String, String>();
     private final Map<String, String> pathCache = new HashMap<String, String>();
     private final Map<Object, String> valueCache = new HashMap<Object, String>();
@@ -36,7 +35,7 @@ class PackageRemapper extends Remapper
 
     public PackageRemapper(List<Rule> ruleList, boolean verbose) {
         this.verbose = verbose;
-        wildcards = PatternElement.createWildcards(ruleList);
+        wildcards = new WildcardTrie(PatternElement.createWildcards(ruleList));
     }
 
     // also used by KeepProcessor
@@ -118,7 +117,7 @@ class PackageRemapper extends Remapper
     }
 
     private String replaceHelper(String value) {
-        for (Wildcard wildcard : wildcards) {
+        for (Wildcard wildcard : wildcards.getPossibleMatches(value)) {
             String test = wildcard.replace(value);
             if (test != null)
                 return test;
diff --git a/src/main/com/tonicsystems/jarjar/PatternElement.java b/src/main/com/tonicsystems/jarjar/PatternElement.java
index 6ccd9ea..6b852d7 100644
--- a/src/main/com/tonicsystems/jarjar/PatternElement.java
+++ b/src/main/com/tonicsystems/jarjar/PatternElement.java
@@ -32,12 +32,14 @@ abstract public class PatternElement
 
     static List<Wildcard> createWildcards(List<? extends PatternElement> patterns) {
         List<Wildcard> wildcards = new ArrayList<Wildcard>();
+        int ruleIndex = 0;
         for (PatternElement pattern : patterns) {
             String result = (pattern instanceof Rule) ? ((Rule)pattern).getResult() : "";
             String expr = pattern.getPattern();
             if (expr.indexOf('/') >= 0)
                 throw new IllegalArgumentException("Patterns cannot contain slashes");
-            wildcards.add(new Wildcard(expr.replace('.', '/'), result));
+            wildcards.add(new Wildcard(expr.replace('.', '/'), result, ruleIndex));
+            ruleIndex++;
         }
         return wildcards;
     }
diff --git a/src/main/com/tonicsystems/jarjar/Wildcard.java b/src/main/com/tonicsystems/jarjar/Wildcard.java
index 5cc486f..c92e0fb 100644
--- a/src/main/com/tonicsystems/jarjar/Wildcard.java
+++ b/src/main/com/tonicsystems/jarjar/Wildcard.java
@@ -27,14 +27,18 @@ class Wildcard
     private static Pattern star  = Pattern.compile("\\*");
     private static Pattern estar = Pattern.compile("\\+\\??\\)\\Z");
     private static Pattern dollar = Pattern.compile("\\$");
+    // Apart from stars and dollar signs, wildcards are plain-text full matches
+    private static Pattern plainTextPrefixPattern = Pattern.compile("^[^*$]*");
 
     private final Pattern pattern;
+    private final String plainTextPrefix;
+    private final int ruleIndex;
     private final int count;
     private final ArrayList<Object> parts = new ArrayList<Object>(16); // kept for debugging
     private final String[] strings;
     private final int[] refs;
 
-    public Wildcard(String pattern, String result) {
+    public Wildcard(String pattern, String result, int ruleIndex) {
         if (pattern.equals("**"))
             throw new IllegalArgumentException("'**' is not a valid pattern");
         if (!checkIdentifierChars(pattern, "/*"))
@@ -47,6 +51,13 @@ class Wildcard
         regex = replaceAllLiteral(star, regex, "([^/]+)");
         regex = replaceAllLiteral(estar, regex, "*)");
         regex = replaceAllLiteral(dollar, regex, "\\$");
+        Matcher prefixMatcher = plainTextPrefixPattern.matcher(pattern);
+        // prefixMatcher will always match, but may match an empty string
+        if (!prefixMatcher.find()) {
+            throw new IllegalArgumentException(plainTextPrefixPattern + " not found in " + pattern);
+        }
+        this.plainTextPrefix = prefixMatcher.group();
+        this.ruleIndex = ruleIndex;
         this.pattern = Pattern.compile("\\A" + regex + "\\Z");
         this.count = this.pattern.matcher("foo").groupCount();
 
@@ -95,6 +106,14 @@ class Wildcard
         // System.err.println(this);
     }
 
+    public String getPlainTextPrefix() {
+        return plainTextPrefix;
+    }
+
+    public int getRuleIndex() {
+        return ruleIndex;
+    }
+
     public boolean matches(String value) {
         return getMatcher(value) != null;
     }
diff --git a/src/main/com/tonicsystems/jarjar/WildcardTrie.java b/src/main/com/tonicsystems/jarjar/WildcardTrie.java
new file mode 100644
index 0000000..e80dbc9
--- /dev/null
+++ b/src/main/com/tonicsystems/jarjar/WildcardTrie.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tonicsystems.jarjar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeMap;
+
+/**
+ * A prefix trie of {@link Wildcard}, where the prefix is obtained from
+ * {@link Wildcard#getPlainTextPrefix()}.
+ *
+ * This allows quick lookup of applicable wildcards in the common case where wildcards have a
+ * non-empty plain-text prefix.
+ */
+public class WildcardTrie {
+    private final TreeMap<String, WildcardTrie> subTries = new TreeMap<>();
+    private final List<Wildcard> wildcards = new ArrayList<>();
+    private final String prefix;
+
+    public WildcardTrie(List<Wildcard> wildcards) {
+        this("");
+        final ArrayList<Wildcard> lst = new ArrayList<>(wildcards);
+        // Sort values to ensure that wildcards that prefix others are added first
+        lst.sort(Comparator.comparing(Wildcard::getPlainTextPrefix));
+        for (Wildcard w : lst) {
+            final String prefix = w.getPlainTextPrefix();
+            final WildcardTrie prefixTrie = findSubTrieWhichPrefixes(prefix, this);
+            if (prefixTrie.prefix.equals(prefix)) {
+                prefixTrie.wildcards.add(w);
+            } else {
+                final WildcardTrie newTrie = new WildcardTrie(prefix);
+                newTrie.wildcards.add(w);
+                prefixTrie.subTries.put(prefix, newTrie);
+            }
+        }
+    }
+
+    private WildcardTrie(String prefix) {
+        this.prefix = prefix;
+    }
+
+    private static WildcardTrie findSubTrieWhichPrefixes(String value, WildcardTrie baseTrie) {
+        final String possiblePrefix = baseTrie.subTries.floorKey(value);
+        // Because each level of the trie does not contain keys that are prefixes of each other,
+        // there can be at most one prefix of the value at that level, and that prefix will be the
+        // highest key ordered before the value (any non-prefix key would have a character
+        // difference with the prefix and so be ordered before the prefix or after the value).
+        if (possiblePrefix != null && value.startsWith(possiblePrefix)) {
+            return findSubTrieWhichPrefixes(value, baseTrie.subTries.get(possiblePrefix));
+        }
+        return baseTrie;
+    }
+
+    public List<Wildcard> getPossibleMatches(String value) {
+        WildcardTrie baseTrie = this;
+        List<Wildcard> prefixMatches = wildcards.isEmpty()
+                // If there's no match, don't even allocate a list and use the singleton emptyList
+                ? Collections.emptyList() : new ArrayList<>(wildcards);
+        while (true) {
+            final String possiblePrefix = baseTrie.subTries.floorKey(value);
+            if (possiblePrefix != null && value.startsWith(possiblePrefix)) {
+                baseTrie = baseTrie.subTries.get(possiblePrefix);
+                if (prefixMatches.isEmpty()) {
+                    prefixMatches = new ArrayList<>(baseTrie.wildcards);
+                } else {
+                    prefixMatches.addAll(baseTrie.wildcards);
+                }
+            } else {
+                prefixMatches.sort(Comparator.comparing(Wildcard::getRuleIndex));
+                return prefixMatches;
+            }
+        }
+    }
+}