commit 4de31ac10e80d05013cc7270a082ccdbaab2478c
author Christoffer Quist Adamsen <christofferqa@google.com> Sat Feb 13 14:55:13 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Sat Feb 13 14:55:13 2021 +0100
tree 67de916ce8ccd21bf6494bd2042b99e7efdba725
parent 1d0e580eccaaad11f0e74e34e719b311163344d1

Process cf-synthesized code in desugared library compilations

Change-Id: I2d3e0efb473a27b0e494db5630c87a773d076c60

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
index dac2935..076c0c4 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaClass.java
@@ -581,7 +581,12 @@
         // processed, and thus we don't need to schedule it for processing in D8.
         assert !appView.options().isGeneratingClassFiles() || replacement.getCode().isCfCode();
         assert !appView.options().isGeneratingDex() || replacement.getCode().isDexCode();
-        return new ProgramMethod(implMethodHolder, replacement);
+        ProgramMethod newMethod = new ProgramMethod(implMethodHolder, replacement);
+        if (appView.options().isDesugaredLibraryCompilation()) {
+          assert appView.options().isGeneratingClassFiles();
+          needsProcessingConsumer.accept(newMethod);
+        }
+        return newMethod;
       }
       // The method might already have been moved by another invoke-dynamic targeting it.
       // If so, it must be defined on the holder.
@@ -657,7 +662,12 @@
         // processed, and thus we don't need to schedule it for processing in D8.
         assert !appView.options().isGeneratingClassFiles() || replacement.getCode().isCfCode();
         assert !appView.options().isGeneratingDex() || replacement.getCode().isDexCode();
-        return new ProgramMethod(implMethodHolder, replacement);
+        ProgramMethod newMethod = new ProgramMethod(implMethodHolder, replacement);
+        if (appView.options().isDesugaredLibraryCompilation()) {
+          assert appView.options().isGeneratingClassFiles();
+          needsProcessingConsumer.accept(newMethod);
+        }
+        return newMethod;
       }
       // The method might already have been moved by another invoke-dynamic targeting it.
       // If so, it must be defined on the holder.
@@ -707,7 +717,8 @@
                   AccessorMethodSourceCode.build(LambdaClass.this, callTarget),
                   true));
       accessorClass.addDirectMethod(accessorMethod.getDefinition());
-      if (appView.options().isGeneratingDex()) {
+      if (appView.options().isDesugaredLibraryCompilation()
+          || appView.options().isGeneratingDex()) {
         needsProcessingConsumer.accept(accessorMethod);
       }
       return accessorMethod;