commit d901fb10f28f59c88c9c220c76e5a8db6be13507
author Jinseong Jeon <jsjeon@google.com> Mon Jan 14 23:25:02 2019 -0800
committer Jinseong Jeon <jsjeon@google.com> Mon Jan 14 23:25:02 2019 -0800
tree af2f8c5940b68244d9520ca5d555d6f982afcbec
parent 224ca38cf7339211f5417977f9059b0a4c4a1058

Do not add identity mappings to nested lense.

Bug: 122846041
Change-Id: Iac0a12e52df08282fd330734f786ee053e1d18b6

src/main/java/com/android/tools/r8/graph/GraphLense.java

diff --git a/src/main/java/com/android/tools/r8/graph/GraphLense.java b/src/main/java/com/android/tools/r8/graph/GraphLense.java
index 50c91eb..abcf374 100644
--- a/src/main/java/com/android/tools/r8/graph/GraphLense.java
+++ b/src/main/java/com/android/tools/r8/graph/GraphLense.java
@@ -300,23 +300,38 @@
     private final BiMap<DexMethod, DexMethod> originalMethodSignatures = HashBiMap.create();
 
     public void map(DexType from, DexType to) {
+      if (from == to) {
+        return;
+      }
       typeMap.put(from, to);
     }
 
     public void map(DexMethod from, DexMethod to) {
+      if (from == to) {
+        return;
+      }
       methodMap.put(from, to);
     }
 
     public void map(DexField from, DexField to) {
+      if (from == to) {
+        return;
+      }
       fieldMap.put(from, to);
     }
 
     public void move(DexMethod from, DexMethod to) {
+      if (from == to) {
+        return;
+      }
       map(from, to);
       originalMethodSignatures.put(to, from);
     }
 
     public void move(DexField from, DexField to) {
+      if (from == to) {
+        return;
+      }
       fieldMap.put(from, to);
       originalFieldSignatures.put(to, from);
     }