commit 927bec99f5b4887c0bbeb778e6cf7901de84502b
author Tamas Kenez <tamaskenez@google.com> Fri Apr 12 11:42:00 2019 +0200
committer Tamas Kenez <tamaskenez@google.com> Fri Apr 12 09:48:37 2019 +0000
tree f781c0170c2d3cab26109457e726a731dce7955c
parent 391e2992aee375adf46edbb5e7b098556c8604ed

Fix concurrent modification issue in AppInfoWithSubtyping.typeInfo.

Change-Id: Icf8b0b7447ccd50badeb1019c0288b65cfafc6f3

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 0c8196d..cc6235a 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
@@ -115,10 +115,11 @@
   private final Map<DexType, ImmutableSet<DexType>> subtypeMap = new IdentityHashMap<>();
 
   // Map from types to their subtyping information.
-  private Map<DexType, TypeInfo> typeInfo;
+  private final Map<DexType, TypeInfo> typeInfo;
 
   public AppInfoWithSubtyping(DexApplication application) {
     super(application);
+    typeInfo = Collections.synchronizedMap(new IdentityHashMap<>());
     // Recompute subtype map if we have modified the graph.
     populateSubtypeMap(application.asDirect(), application.dexItemFactory);
   }
@@ -127,7 +128,7 @@
     super(previous);
     missingClasses.addAll(previous.missingClasses);
     subtypeMap.putAll(previous.subtypeMap);
-    typeInfo = new IdentityHashMap<>(previous.typeInfo);
+    typeInfo = Collections.synchronizedMap(new IdentityHashMap<>(previous.typeInfo));
     assert app() instanceof DirectMappedDexApplication;
   }
 
@@ -199,7 +200,6 @@
   }
 
   private void populateSubtypeMap(DirectMappedDexApplication app, DexItemFactory dexItemFactory) {
-    typeInfo = new IdentityHashMap<>();
     getTypeInfo(dexItemFactory.objectType).tagAsSubtypeRoot();
     Map<DexType, Set<DexType>> map = new IdentityHashMap<>();
     for (DexClass clazz : app.allClasses()) {