commit 9433a53caeac0db98f9be45f2404d05348090dc4
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Apr 06 11:05:51 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Apr 06 11:54:13 2022 +0000
tree 91df6333e0fcc5ac8e46bfbb9889cfa0e7845b86
parent f586fc1c86a6ef37f0c74deb842884378fa0d18d

Remove synchronization in SubtypingInfo

Fixes: 169896403
Change-Id: Iab6edb54b120a51a5e3dede048c5d3bf32b6b913

src/main/java/com/android/tools/r8/graph/SubtypingInfo.java

diff --git a/src/main/java/com/android/tools/r8/graph/SubtypingInfo.java b/src/main/java/com/android/tools/r8/graph/SubtypingInfo.java
index b61f288..f303854 100644
--- a/src/main/java/com/android/tools/r8/graph/SubtypingInfo.java
+++ b/src/main/java/com/android/tools/r8/graph/SubtypingInfo.java
@@ -234,6 +234,10 @@
     return ImmutableList.of();
   }
 
+  public Set<DexType> allImmediateSubtypes(DexType type) {
+    return getTypeInfo(type).directSubtypes;
+  }
+
   public void forAllInterfaceRoots(Consumer<DexType> fn) {
     Iterables.filter(
             getTypeInfo(factory.objectType).directSubtypes,
@@ -245,12 +249,13 @@
 
     private final DexType type;
 
-    int hierarchyLevel = UNKNOWN_LEVEL;
+    private int hierarchyLevel = UNKNOWN_LEVEL;
+
     /**
      * Set of direct subtypes. This set has to remain sorted to ensure determinism. The actual
      * sorting is not important but {@link DexType#compareTo(StructuralItem)} works well.
      */
-    Set<DexType> directSubtypes = NO_DIRECT_SUBTYPE;
+    private Set<DexType> directSubtypes = NO_DIRECT_SUBTYPE;
 
     TypeInfo(DexType type) {
       this.type = type;
@@ -296,32 +301,28 @@
       }
     }
 
-    synchronized void addDirectSubtype(TypeInfo subtypeInfo) {
+    private void addDirectSubtype(TypeInfo subtypeInfo) {
       assert hierarchyLevel != UNKNOWN_LEVEL;
       ensureDirectSubTypeSet();
       directSubtypes.add(subtypeInfo.type);
       subtypeInfo.setLevel(hierarchyLevel + 1);
     }
 
-    void tagAsSubtypeRoot() {
+    private void tagAsSubtypeRoot() {
       setLevel(ROOT_LEVEL);
     }
 
-    void tagAsInterface() {
+    private void tagAsInterface() {
       setLevel(INTERFACE_LEVEL);
     }
 
-    public boolean isInterface() {
+    private boolean isInterface() {
       assert hierarchyLevel != UNKNOWN_LEVEL : "Program class missing: " + this;
       assert type.isClassType();
       return hierarchyLevel == INTERFACE_LEVEL;
     }
 
-    public boolean isUnknown() {
-      return hierarchyLevel == UNKNOWN_LEVEL;
-    }
-
-    synchronized void addInterfaceSubtype(DexType type) {
+    private void addInterfaceSubtype(DexType type) {
       // Interfaces all inherit from java.lang.Object. However, we assign a special level to
       // identify them later on.
       setLevel(INTERFACE_LEVEL);
@@ -329,21 +330,4 @@
       directSubtypes.add(type);
     }
   }
-
-  public Set<DexType> allImmediateSubtypes(DexType type) {
-    return getTypeInfo(type).directSubtypes;
-  }
-
-  public boolean isUnknown(DexType type) {
-    return getTypeInfo(type).isUnknown();
-  }
-
-  public boolean hasSubtypes(DexType type) {
-    return !getTypeInfo(type).directSubtypes.isEmpty();
-  }
-
-  void registerNewType(DexType newType, DexType superType) {
-    // Register the relationship between this type and its superType.
-    getTypeInfo(superType).addDirectSubtype(getTypeInfo(newType));
-  }
 }