commit 540ce6c1eec902ad49785ac37d1dc2d6257a3a1a
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 20:33:10 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 20:33:10 2021 +0200
tree 1d17764cb74f5fd302a3878518979cb18ee3f448
parent 17095b9d7ae39a1fa8c8f7b97b5fe7f971865d8e

Fix thread unsafe accesses to methodProcessingContexts

Bug: 181095653
Change-Id: I253b3063194bd1fdee2661f521de1086018033cd

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index d377362..f6d9e6e 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -156,6 +156,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiConsumer;
@@ -3065,7 +3066,7 @@
 
     private final ProcessorContext processorContext;
     private Map<DexMethod, MethodProcessingContext> methodProcessingContexts =
-        new IdentityHashMap<>();
+        new ConcurrentHashMap<>();
 
     List<ProgramMethod> desugaredMethods = new LinkedList<>();