commit 61b897490596d199986df8d7ada2f4500dc2cae2
author Søren Gjesse <sgjesse@google.com> Fri Feb 14 11:02:29 2020 +0100
committer Søren Gjesse <sgjesse@google.com> Fri Feb 14 11:36:24 2020 +0000
tree ff85fac40a1a562ded92b32e8300a420dfe0f59b
parent be80d124a567546e308636dc1238d3ae6f6a3c9c

Use a concurrent TreeSet implementation for direct sub types

This set can be updated by synthesized classes added during IR processing.

Bug: 149516488
Change-Id: If564eb6e140adbd3cfe6ba3badb0af212578bce6

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

diff --git a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
index 3381ea2..813ea84 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
@@ -22,8 +22,8 @@
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -82,7 +82,7 @@
 
     private void ensureDirectSubTypeSet() {
       if (directSubtypes == NO_DIRECT_SUBTYPE) {
-        directSubtypes = new TreeSet<>(DexType::slowCompareTo);
+        directSubtypes = new ConcurrentSkipListSet<>(DexType::slowCompareTo);
       }
     }