commit d4085f300223297a16d9030a29f1a7f7216b9d94
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 14:03:28 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 14:03:28 2021 +0200
tree 8ef1f3a92ff29b04a689f43fa4b759964cefcbec
parent 1ab58675c87985665c5e25904c3aae59867ab9f1

Enable intermediate mode in L8 desugar pass

Change-Id: I560c8c9e6299363686ddca091ae9324c186f911d

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

diff --git a/src/main/java/com/android/tools/r8/L8Command.java b/src/main/java/com/android/tools/r8/L8Command.java
index ec9955d..6fea9a2 100644
--- a/src/main/java/com/android/tools/r8/L8Command.java
+++ b/src/main/java/com/android/tools/r8/L8Command.java
@@ -160,6 +160,7 @@
     assert !internal.minimalMainDex;
     internal.minApiLevel = getMinApiLevel();
     assert !internal.intermediate;
+    internal.intermediate = true;
     assert internal.readCompileTimeAnnotations;
     internal.programConsumer = getProgramConsumer();
     assert internal.programConsumer instanceof ClassFileConsumer;

src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
index 25f44af..ac15138 100644
--- a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
+++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
@@ -589,8 +589,9 @@
               group.replaceAndRemoveRepresentative(synthetic);
               synthetic = representative;
             }
+          } else {
+            equivalenceGroup = group;
           }
-          equivalenceGroup = group;
           break;
         }
       }