Parcelable: Add test for clinit merging

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt

@@ -0,0 +1,14 @@
+// CURIOUS_ABOUT <clinit>
+// WITH_RUNTIME
+
+import kotlinx.android.parcel.*
+import android.os.Parcelable
+import kotlin.jvm.JvmStatic
+
+@MagicParcel
+class User(val firstName: String) : Parcelable {
+    companion object {
+        @JvmStatic
+        private val test = StringBuilder()
+    }
+}

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt

@@ -0,0 +1,60 @@
+public static class User$CREATOR : java/lang/Object, android/os/Parcelable$Creator {
+    public void <init>()
+
+    public final User createFromParcel(android.os.Parcel p0)
+
+    public final User[] newArray(int p0)
+}
+
+public final class User$Companion : java/lang/Object {
+    private void <init>()
+
+    public void <init>(kotlin.jvm.internal.DefaultConstructorMarker p0)
+
+    public final static java.lang.StringBuilder access$getTest$p(User$Companion p0)
+
+    private final java.lang.StringBuilder getTest()
+
+    private static void test$annotations()
+}
+
+public final class User : java/lang/Object, android/os/Parcelable {
+    public final static User$CREATOR CREATOR
+
+    public final static User$Companion Companion
+
+    private final java.lang.String firstName
+
+    private final static java.lang.StringBuilder test
+
+    static void <clinit>() {
+          NEW
+          DUP
+          ACONST_NULL
+          INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
+          PUTSTATIC (Companion, LUser$Companion;)
+        LABEL (L0)
+        LINENUMBER (12)
+          NEW
+          DUP
+          INVOKESPECIAL (java/lang/StringBuilder, <init>, ()V)
+          PUTSTATIC (test, Ljava/lang/StringBuilder;)
+          NEW
+          DUP
+          INVOKESPECIAL (User$CREATOR, <init>, ()V)
+          PUTSTATIC (CREATOR, LUser$CREATOR;)
+          RETURN
+    }
+
+    public void <init>(java.lang.String p0)
+
+    public final static java.lang.StringBuilder access$getTest$cp()
+
+    public final int describeContents()
+
+    public final java.lang.String getFirstName()
+
+    private final static java.lang.StringBuilder getTest()
+
+    public final void writeToParcel(android.os.Parcel p0, int p1)
+}

plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/ParcelBytecodeListingTestGenerated.java

@@ -54,6 +54,12 @@ public class ParcelBytecodeListingTestGenerated extends AbstractParcelBytecodeLi
         doTest(fileName);
     }
 
+    @TestMetadata("duplicatingClinit.kt")
+    public void testDuplicatingClinit() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("listInsideList.kt")
     public void testListInsideList() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.kt");