commit a732058daaa5ba9a57d5c8e0f9c7f47dd933248e
author Ian Zerny <zerny@google.com> Mon Oct 21 09:57:21 2019 +0200
committer Ian Zerny <zerny@google.com> Mon Oct 21 09:57:21 2019 +0200
tree 29049c0f4e4011eafb562ff67bc2edb5785d908a
parent 55f3dc7d8c80ff3e92d7cea114eb0c6b9b4770f9

Version 1.6.38

Cherry-pick: Don't allow type lookup of null value.
CL: https://r8-review.googlesource.com/c/r8/+/44433

Cherry-pick: Use concurrent hash map instead of synchronized map.
CL: https://r8-review.googlesource.com/c/r8/+/44431

Bug: 141096337
Change-Id: I7dc4d17b4831eafc16ba0155f1b1e69a9bdec2ba

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 1be5bda..42f429f 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.6.37";
+  public static final String LABEL = "1.6.38";
 
   private Version() {
   }

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 2e37930..c4e704c 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithSubtyping.java
@@ -125,7 +125,7 @@
 
   public AppInfoWithSubtyping(DexApplication application) {
     super(application);
-    typeInfo = Collections.synchronizedMap(new IdentityHashMap<>());
+    typeInfo = new ConcurrentHashMap<>();
     // Recompute subtype map if we have modified the graph.
     populateSubtypeMap(application.asDirect(), application.dexItemFactory);
   }
@@ -134,7 +134,7 @@
     super(previous);
     missingClasses.addAll(previous.missingClasses);
     subtypeMap.putAll(previous.subtypeMap);
-    typeInfo = Collections.synchronizedMap(new IdentityHashMap<>(previous.typeInfo));
+    typeInfo = new ConcurrentHashMap<>(previous.typeInfo);
     assert app() instanceof DirectMappedDexApplication;
   }
 
@@ -205,6 +205,7 @@
   }
 
   private TypeInfo getTypeInfo(DexType type) {
+    assert type != null;
     return typeInfo.computeIfAbsent(type, TypeInfo::new);
   }
 
@@ -268,11 +269,11 @@
       }
       assert !seenTypes.contains(next);
       seenTypes.add(next);
-      TypeInfo superInfo = getTypeInfo(superType);
       TypeInfo nextInfo = getTypeInfo(next);
       if (superType == null) {
         assert nextInfo.hierarchyLevel == ROOT_LEVEL;
       } else {
+        TypeInfo superInfo = getTypeInfo(superType);
         assert superInfo.hierarchyLevel == nextInfo.hierarchyLevel - 1
             || (superInfo.hierarchyLevel == ROOT_LEVEL
                 && nextInfo.hierarchyLevel == INTERFACE_LEVEL);