commit 697e09e59c3f08b2be421c39d16c479584a9d9ac
author Ian Zerny <zerny@google.com> Tue Sep 14 14:21:06 2021 +0200
committer Ian Zerny <zerny@google.com> Fri Sep 17 11:52:37 2021 +0000
tree b8939605a8e122603b5ec2afb597f4806281ac56
parent 7203deee575539faef4d60e769053167fa81d945

Clear the correct set in desugar finalization.

Bug: 178172809
Change-Id: Ie4e828e4169f80fe8e2b7f882aba62e0042fa30e

src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
index 2493dd3..929b5a8 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CfInstructionDesugaringEventConsumer.java
@@ -343,12 +343,13 @@
       for (ConstantDynamicClass constantDynamicClass : synthesizedConstantDynamicClasses) {
         constantDynamicClass.getConstantDynamicProgramClass().forEachProgramMethod(needsProcessing);
       }
-      synthesizedLambdaClasses.clear();
+      synthesizedConstantDynamicClasses.clear();
     }
 
     public boolean verifyNothingToFinalize() {
       assert pendingInvokeSpecialBridges.isEmpty();
       assert synthesizedLambdaClasses.isEmpty();
+      assert synthesizedConstantDynamicClasses.isEmpty();
       return true;
     }
   }