commit 846677447a7f37b22a5193b9603cd23dd783b57b
author Rico Wind <ricow@google.com> Wed Feb 01 14:19:16 2023 +0100
committer Rico Wind <ricow@google.com> Thu Feb 02 06:49:24 2023 +0000
tree 4407c0eb2888844cfc744980eedab8833deadcc0
parent d8e9e36af41e2da97f3c7ee83d31c124d0b56eed

Make signature canonicalization use a ConcurrentHashMap

This broke on using d8 for redistribution internally
When we write out multiple dex files this can be accessed concurrently.

Change-Id: I8c0acf7edf884cc316b4dfac53968a35c3016f8b

src/main/java/com/android/tools/r8/naming/ClassNameMapper.java

diff --git a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
index 508c5db..0ee8077 100644
--- a/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
+++ b/src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ClassNameMapper implements ProguardMap {
 
@@ -218,7 +219,7 @@
 
   private final ImmutableMap<String, ClassNamingForNameMapper> classNameMappings;
   private BiMapContainer<String, String> nameMapping;
-  private final Map<Signature, Signature> signatureMap = new HashMap<>();
+  private final Map<Signature, Signature> signatureMap = new ConcurrentHashMap<>();
   private final LinkedHashSet<MapVersionMappingInformation> mapVersions;
   private final Map<String, String> originalSourceFiles;
   private final List<String> preamble;