commit 9fc01c87cb8763fa6b28a234a9bcddf9a150cf7d
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Jan 18 14:47:34 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Thu Jan 18 13:52:59 2024 +0000
tree b74c4f63eefac25d72ce01613d74ff5b42670018
parent 916a6d04b1c84a95bca923f2ea273fd7d52532fa

Remove caching of array type lookups in graph lens

Bug: b/320707371
Change-Id: Ie14a40651e2b0cbb16f3d2f2a5f1dad9ccb0bd46

src/main/java/com/android/tools/r8/graph/lens/NonIdentityGraphLens.java

diff --git a/src/main/java/com/android/tools/r8/graph/lens/NonIdentityGraphLens.java b/src/main/java/com/android/tools/r8/graph/lens/NonIdentityGraphLens.java
index fb0c944..3804772 100644
--- a/src/main/java/com/android/tools/r8/graph/lens/NonIdentityGraphLens.java
+++ b/src/main/java/com/android/tools/r8/graph/lens/NonIdentityGraphLens.java
@@ -11,8 +11,6 @@
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.ir.code.InvokeType;
 import com.android.tools.r8.utils.Action;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
 public abstract class NonIdentityGraphLens extends GraphLens {
@@ -20,8 +18,6 @@
   private final DexItemFactory dexItemFactory;
   private GraphLens previousLens;
 
-  private final Map<DexType, DexType> arrayTypeCache = new ConcurrentHashMap<>();
-
   public NonIdentityGraphLens(AppView<?> appView) {
     this(appView.dexItemFactory(), appView.graphLens());
   }
@@ -105,14 +101,9 @@
       return type;
     }
     if (type.isArrayType()) {
-      DexType result = arrayTypeCache.get(type);
-      if (result == null) {
-        DexType baseType = type.toBaseType(dexItemFactory);
-        DexType newType = lookupType(baseType);
-        result = baseType == newType ? type : type.replaceBaseType(newType, dexItemFactory);
-        arrayTypeCache.put(type, result);
-      }
-      return result;
+      DexType baseType = type.toBaseType(dexItemFactory);
+      DexType newType = lookupType(baseType);
+      return baseType == newType ? type : type.replaceBaseType(newType, dexItemFactory);
     }
     return lookupClassType(type);
   }