commit f20a530fd1e997eb12e2b8c2c0808476e9a20a0a
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Oct 01 19:41:11 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Oct 04 09:12:34 2021 +0000
tree c5f6815057dab5b55693dcc59599bcb920dee8c0
parent 2ce1d725f077aea47ef37429e550675df0fb5355

Fixup invalid EnclosingMethodAttribute if referencing clinit

Bug: 201622820
Bug: 201975229
Change-Id: I1b6962ebdb5c3eb2f001e70fc3cf4690d35b988a

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

diff --git a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
index 296f792..0c78a72 100644
--- a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
@@ -276,7 +276,7 @@
       assert enclosingMember == null;
       DexType ownerType = application.getTypeFromName(owner);
       enclosingMember =
-          name == null
+          name == null || name.equals("<clinit>")
               ? new EnclosingMethodAttribute(ownerType)
               : new EnclosingMethodAttribute(application.getMethod(ownerType, name, desc));
     }

src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
index bf737b9b..6183472 100644
--- a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
@@ -8,7 +8,6 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.references.Reference;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -35,43 +34,27 @@
   @Test
   public void testRuntime() throws Exception {
     testForRuntime(parameters)
-        .addProgramClasses(Main.class, A.class)
+        .addProgramClasses(Main.class)
         .addProgramClassFileData(getProgramClassFileDataWithRewrittenEnclosingMethod())
         .run(parameters.getRuntime(), Main.class)
-        .assertSuccessWithOutputLinesIf(
-            parameters.isCfRuntime()
-                || parameters.getDexRuntimeVersion().isNewerThanOrEqual(Version.V7_0_0),
-            "null",
-            typeName(Main.class))
-        .assertSuccessWithOutputLinesIf(
-            parameters.isDexRuntime() && parameters.getDexRuntimeVersion().isDalvik(),
-            "<clinit>",
-            typeName(Main.class))
-        .assertFailureWithErrorThatThrowsIf(
-            parameters.isDexRuntime()
-                && parameters
-                    .getDexRuntimeVersion()
-                    .isInRangeInclusive(Version.V5_1_1, Version.V6_0_1),
-            IncompatibleClassChangeError.class);
+        .assertSuccessWithOutputLines("null", typeName(Main.class));
   }
 
   @Test
   public void testR8() throws Exception {
     testForR8(parameters.getBackend())
-        .addProgramClasses(Main.class, A.class)
+        .addProgramClasses(Main.class)
         .addProgramClassFileData(getProgramClassFileDataWithRewrittenEnclosingMethod())
         .setMinApi(parameters.getApiLevel())
         .addKeepAttributeInnerClassesAndEnclosingMethod()
         .addKeepAllClassesRule()
         .run(parameters.getRuntime(), Main.class)
-        // TODO(b/201790364): We remove the method even if keeping all classes due to <clinit> not
-        //  being pinned.
-        .assertSuccessWithOutputLines("null", "null");
+        .assertSuccessWithOutputLines("null", typeName(Main.class));
   }
 
   private byte[] getProgramClassFileDataWithRewrittenEnclosingMethod() throws IOException {
     Path innerClass = ToolHelper.getClassFilesForInnerClasses(Main.class).iterator().next();
-    return transformer(innerClass, Reference.classFromBinaryName(binaryName(A.class) + "$1"))
+    return transformer(innerClass, Reference.classFromBinaryName(binaryName(Main.class) + "$1"))
         .rewriteEnclosingMethod(binaryName(Main.class), "<clinit>", "()V")
         .transform();
   }