commit 26cd49cbfc6433db9e4f965aa2b0ef49ae61a79a
author Ian Zerny <zerny@google.com> Thu Jan 20 10:36:59 2022 +0100
committer Ian Zerny <zerny@google.com> Fri Jan 21 10:17:18 2022 +0000
tree d30c5cbedc9ac6ed013e2d02e5878a38ee2acb2f
parent 614afe5fda12f154c4cde5aef6e3895b36554c5b

Don't add null rewritings.

Change-Id: I308c01e644e8127055c6a751b98aef3d7a56f29c

src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineRewritingFlags.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineRewritingFlags.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineRewritingFlags.java
index 85cd916..a6c487e 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineRewritingFlags.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineRewritingFlags.java
@@ -135,6 +135,8 @@
         ImmutableMap.builder();
 
     public void rewriteType(DexType src, DexType target) {
+      assert src != null;
+      assert target != null;
       rewriteType.put(src, target);
     }
 

src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/specificationconversion/HumanToMachinePrefixConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/specificationconversion/HumanToMachinePrefixConverter.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/specificationconversion/HumanToMachinePrefixConverter.java
index 69c409a..6ff7428 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/specificationconversion/HumanToMachinePrefixConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/specificationconversion/HumanToMachinePrefixConverter.java
@@ -71,7 +71,9 @@
       Map<?, DexType> flags) {
     for (DexType type : flags.values()) {
       DexType rewrittenType = rewrittenType(descriptorPrefix, type);
-      builder.rewriteType(type, rewrittenType);
+      if (rewrittenType != null) {
+        builder.rewriteType(type, rewrittenType);
+      }
     }
   }
 
@@ -80,10 +82,9 @@
     for (DexProgramClass clazz : appInfo.classes()) {
       DexType type = clazz.type;
       DexType rewrittenType = rewrittenType(descriptorPrefix, type);
-      if (rewrittenType == null) {
-        continue;
+      if (rewrittenType != null) {
+        builder.rewriteType(type, rewrittenType);
       }
-      builder.rewriteType(type, rewrittenType);
     }
   }