AsmLikeInstructionListingTest: Print owner for FieldInsnNode

compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractAsmLikeInstructionListingTest.kt

@@ -308,7 +308,7 @@ abstract class AbstractAsmLikeInstructionListingTest : CodegenTestCase() {
         append("  ").append(Printer.OPCODES[node.opcode] ?: error("Invalid opcode ${node.opcode}"))
 
         when (node) {
-            is FieldInsnNode -> append(" (" + node.name + ", " + node.desc + ")")
+            is FieldInsnNode -> append(" (" + node.owner + ", " + node.name + ", " + node.desc + ")")
             is JumpInsnNode -> append(" (L" + labelMappings[node.label.label] + ")")
             is IntInsnNode -> append(" (" + node.operand + ")")
             is MethodInsnNode -> append(" (" + node.owner + ", "+ node.name + ", " + node.desc + ")")

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.ir.txt

@@ -68,19 +68,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binder, Landroid/os/IBinder;)
+          GETFIELD (User, binder, Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeStrongBinder, (Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArray, [Landroid/os/IBinder;)
+          GETFIELD (User, binderArray, [Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderArray, ([Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderList, Ljava/util/List;)
+          GETFIELD (User, binderList, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArrayList, Ljava/util/ArrayList;)
+          GETFIELD (User, binderArrayList, Ljava/util/ArrayList;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           RETURN

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

@@ -90,19 +90,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binder, Landroid/os/IBinder;)
+          GETFIELD (User, binder, Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeStrongBinder, (Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArray, [Landroid/os/IBinder;)
+          GETFIELD (User, binderArray, [Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderArray, ([Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderList, Ljava/util/List;)
+          GETFIELD (User, binderList, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArrayList, Ljava/util/ArrayList;)
+          GETFIELD (User, binderArrayList, Ljava/util/ArrayList;)
           DUP_X1
           INVOKEINTERFACE (java/util/Collection, size, ()I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.ir.txt

@@ -42,7 +42,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -59,7 +59,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Landroid/accounts/Account;)
+          GETFIELD (test/Foo, kp, Landroid/accounts/Account;)
           CHECKCAST
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)

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

@@ -41,7 +41,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -58,7 +58,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Landroid/accounts/Account;)
+          GETFIELD (test/Foo, kp, Landroid/accounts/Account;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.ir.txt

@@ -54,13 +54,13 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
           DUP
           ACONST_NULL
           INVOKESPECIAL (k/KotlinParcelable$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, Lk/KotlinParcelable$Companion;)
+          PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;)
         LABEL (L0)
         LINENUMBER (18)
           NEW
           DUP
           INVOKESPECIAL (k/KotlinParcelable$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           RETURN
     }
 
@@ -93,7 +93,7 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
         LINENUMBER (13)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (data, I)
+          GETFIELD (k/KotlinParcelable, data, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
         LABEL (L2)
         LINENUMBER (14)
@@ -112,7 +112,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           NEW
           DUP
-          GETSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          GETSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           ALOAD (1)
           INVOKEVIRTUAL (k/KotlinParcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Lk/KotlinParcelable;)
           INVOKESPECIAL (test/Foo, <init>, (Lk/KotlinParcelable;)V)
@@ -144,7 +144,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -160,11 +160,11 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (kp, Lk/KotlinParcelable;)
+          GETFIELD (test/Foo, kp, Lk/KotlinParcelable;)
           ALOAD (1)
           ILOAD (2)
           INVOKEVIRTUAL (k/KotlinParcelable, writeToParcel, (Landroid/os/Parcel;I)V)
           RETURN
         LABEL (L1)
     }
-}
+}

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

@@ -53,13 +53,13 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
           DUP
           ACONST_NULL
           INVOKESPECIAL (k/KotlinParcelable$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, Lk/KotlinParcelable$Companion;)
+          PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;)
         LABEL (L0)
         LINENUMBER (18)
           NEW
           DUP
           INVOKESPECIAL (k/KotlinParcelable$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           RETURN
     }
 
@@ -92,7 +92,7 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
         LINENUMBER (13)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (data, I)
+          GETFIELD (k/KotlinParcelable, data, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
         LABEL (L2)
         LINENUMBER (14)
@@ -144,7 +144,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -161,7 +161,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Lk/KotlinParcelable;)
+          GETFIELD (test/Foo, kp, Lk/KotlinParcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.ir.txt

@@ -11,6 +11,7 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler {
         LABEL (L0)
         LINENUMBER (10)
           ALOAD (0)
+          CHECKCAST
           ILOAD (1)
           INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;)
           CHECKCAST
@@ -105,7 +106,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           ALOAD (1)
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (0)
           ALOAD (1)
           ILOAD (2)
@@ -113,4 +114,4 @@ public final class User : java/lang/Object, android/os/Parcelable {
           RETURN
         LABEL (L1)
     }
-}
+}

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

@@ -40,7 +40,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato
           ALOAD (1)
           LDC (in)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (1)
           INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
           ARETURN
@@ -102,7 +102,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           ALOAD (1)
           LDC (parcel)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (0)
           ALOAD (1)
           ILOAD (2)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.ir.txt

@@ -83,4 +83,4 @@ public final class User : java/lang/Object, android/os/Parcelable {
     public final java.lang.String getLastName()
 
     public void writeToParcel(android.os.Parcel out, int flags)
-}
+}

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

@@ -39,7 +39,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato
 
     public final User[] newArray(int size) {
         LABEL (L0)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ILOAD (1)
           INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
           ARETURN

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

@@ -32,18 +32,18 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
         LABEL (L0)
         LINENUMBER (12)
           NEW
           DUP
           INVOKESPECIAL (java/lang/StringBuilder, <init>, ()V)
-          PUTSTATIC (test, Ljava/lang/StringBuilder;)
+          PUTSTATIC (User, test, Ljava/lang/StringBuilder;)
           RETURN
     }
 

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

@@ -32,17 +32,17 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
         LABEL (L0)
         LINENUMBER (12)
           NEW
           DUP
           INVOKESPECIAL (java/lang/StringBuilder, <init>, ()V)
-          PUTSTATIC (test, Ljava/lang/StringBuilder;)
+          PUTSTATIC (User, test, Ljava/lang/StringBuilder;)
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.ir.txt

@@ -15,7 +15,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr
           ACONST_NULL
           GOTO (L3)
         LABEL (L2)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           ALOAD (1)
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
         LABEL (L3)
@@ -49,7 +49,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Bar$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -65,7 +65,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (foo, Ltest/Foo;)
+          GETFIELD (test/Bar, foo, Ltest/Foo;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)
@@ -97,7 +97,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           NEW
           DUP
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           ALOAD (1)
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -130,7 +130,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -146,7 +146,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (bar, Ltest/Bar;)
+          GETFIELD (test/Foo, bar, Ltest/Bar;)
           ALOAD (1)
           ILOAD (2)
           INVOKEVIRTUAL (test/Bar, writeToParcel, (Landroid/os/Parcel;I)V)

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

@@ -13,7 +13,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKEVIRTUAL (android/os/Parcel, readInt, ()I)
           IFEQ (L2)
           ALOAD (1)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           SWAP
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -49,7 +49,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Bar$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -66,7 +66,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (foo, Ltest/Foo;)
+          GETFIELD (test/Bar, foo, Ltest/Foo;)
           DUP
           IFNULL (L1)
           ALOAD (1)
@@ -97,7 +97,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           NEW
           DUP
           ALOAD (1)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           SWAP
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -129,7 +129,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -146,7 +146,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (bar, Ltest/Bar;)
+          GETFIELD (test/Foo, bar, Ltest/Bar;)
           SWAP
           LDC (0)
           INVOKEINTERFACE (android/os/Parcelable, writeToParcel, (Landroid/os/Parcel;I)V)

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

@@ -68,4 +68,4 @@ public final class test/SomeClass : java/lang/Object, android/os/Parcelable {
           RETURN
         LABEL (L3)
     }
-}
+}

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.ir.txt

@@ -29,7 +29,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           ASTORE (3)
           ALOAD (1)
           ALOAD (3)

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

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           DUP_X1
           INVOKEINTERFACE (java/util/Collection, size, ()I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.ir.txt

@@ -30,7 +30,7 @@ public final class TestNotNull : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNotNull, a, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           RETURN
         LABEL (L1)
@@ -68,7 +68,7 @@ public final class TestNullable : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNullable, a, Landroid/util/Size;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)

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

@@ -30,7 +30,7 @@ public final class TestNotNull : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNotNull, a, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           RETURN
         LABEL (L1)
@@ -69,7 +69,7 @@ public final class TestNullable : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNullable, a, Landroid/util/Size;)
           DUP
           IFNULL (L1)
           ALOAD (1)
@@ -85,4 +85,4 @@ public final class TestNullable : java/lang/Object, android/os/Parcelable {
           RETURN
         LABEL (L3)
     }
-}
+}

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.ir.txt

@@ -41,7 +41,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -58,7 +58,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (parcelable, Landroid/os/Parcelable;)
+          GETFIELD (test/Foo, parcelable, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

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

@@ -40,7 +40,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -57,7 +57,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (parcelable, Landroid/os/Parcelable;)
+          GETFIELD (test/Foo, parcelable, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.ir.txt

@@ -57,7 +57,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -76,12 +76,12 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (notNull, LSerializableSimple;)
+          GETFIELD (User, notNull, LSerializableSimple;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, LSerializableSimple;)
+          GETFIELD (User, nullable, LSerializableSimple;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           RETURN

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

@@ -56,7 +56,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -75,11 +75,11 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (notNull, LSerializableSimple;)
+          GETFIELD (User, notNull, LSerializableSimple;)
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, LSerializableSimple;)
+          GETFIELD (User, nullable, LSerializableSimple;)
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           RETURN
         LABEL (L1)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.ir.txt

@@ -42,7 +42,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (Test$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -64,7 +64,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (value, LValue;)
+          GETFIELD (Test, value, LValue;)
           INVOKEVIRTUAL (android/os/Parcel, writeValue, (Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)

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

@@ -41,7 +41,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (Test$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -63,7 +63,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (value, LValue;)
+          GETFIELD (Test, value, LValue;)
           INVOKEVIRTUAL (android/os/Parcel, writeValue, (Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.ir.txt

@@ -77,7 +77,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -132,19 +132,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (age, I)
+          GETFIELD (User, age, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (isProUser, Z)
+          GETFIELD (User, isProUser, Z)
           IFEQ (L1)
           ICONST_1
           GOTO (L2)

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

@@ -68,7 +68,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -123,19 +123,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (age, I)
+          GETFIELD (User, age, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (isProUser, Z)
+          GETFIELD (User, isProUser, Z)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           RETURN
         LABEL (L1)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.ir.txt

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeStringList, (Ljava/util/List;)V)
           RETURN
         LABEL (L1)

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

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeStringList, (Ljava/util/List;)V)
           RETURN
         LABEL (L1)

plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.ir.txt

@@ -77,10 +77,10 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/Size;)
+          GETFIELD (Test, size, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/Size;)
+          GETFIELD (Test, nullable, Landroid/util/Size;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)
@@ -180,10 +180,10 @@ public final class TestF : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/SizeF;)
+          GETFIELD (TestF, size, Landroid/util/SizeF;)
           INVOKEVIRTUAL (android/os/Parcel, writeSizeF, (Landroid/util/SizeF;)V)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/SizeF;)
+          GETFIELD (TestF, nullable, Landroid/util/SizeF;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)
@@ -202,4 +202,4 @@ public final class TestF : java/lang/Object, android/os/Parcelable {
           RETURN
         LABEL (L3)
     }
-}
+}

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

@@ -77,11 +77,11 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/Size;)
+          GETFIELD (Test, size, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/Size;)
+          GETFIELD (Test, nullable, Landroid/util/Size;)
           DUP
           IFNULL (L1)
           ALOAD (1)
@@ -178,11 +178,11 @@ public final class TestF : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/SizeF;)
+          GETFIELD (TestF, size, Landroid/util/SizeF;)
           INVOKEVIRTUAL (android/os/Parcel, writeSizeF, (Landroid/util/SizeF;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/SizeF;)
+          GETFIELD (TestF, nullable, Landroid/util/SizeF;)
           DUP
           IFNULL (L1)
           ALOAD (1)

plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt

@@ -7,13 +7,13 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           NEW
           DUP
           INVOKESPECIAL (ListOfUsers$$serializer, <init>, ()V)
-          PUTSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          PUTSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
         LABEL (L0)
         LINENUMBER (12)
           NEW
           DUP
           LDC (ListOfUsers)
-          GETSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          GETSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
           CHECKCAST
           ICONST_1
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -24,7 +24,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
           CHECKCAST
-          PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (ListOfUsers$$serializer, descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
         LABEL (L1)
         LINENUMBER (13)
           RETURN
@@ -49,7 +49,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           CHECKCAST
@@ -87,7 +87,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           CHECKCAST
@@ -118,7 +118,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           CHECKCAST
@@ -237,7 +237,7 @@ public final class ListOfUsers : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (ListOfUsers$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LListOfUsers$Companion;)
+          PUTSTATIC (ListOfUsers, Companion, LListOfUsers$Companion;)
           RETURN
     }
 
@@ -254,7 +254,7 @@ public final class ListOfUsers : java/lang/Object {
         LINENUMBER (13)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (list, Ljava/util/List;)
+          PUTFIELD (ListOfUsers, list, Ljava/util/List;)
           RETURN
         LABEL (L3)
     }
@@ -269,7 +269,7 @@ public final class ListOfUsers : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          GETSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
           INVOKEVIRTUAL (ListOfUsers$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
         LABEL (L1)
@@ -277,7 +277,7 @@ public final class ListOfUsers : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (list, Ljava/util/List;)
+          PUTFIELD (ListOfUsers, list, Ljava/util/List;)
           RETURN
         LABEL (L2)
     }
@@ -302,12 +302,12 @@ public final class ListOfUsers : java/lang/Object {
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           CHECKCAST
           ALOAD (0)
-          GETFIELD (list, Ljava/util/List;)
+          GETFIELD (ListOfUsers, list, Ljava/util/List;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
           RETURN
         LABEL (L2)
@@ -323,13 +323,13 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           NEW
           DUP
           INVOKESPECIAL (OptionalUser$$serializer, <init>, ()V)
-          PUTSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          PUTSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
         LABEL (L0)
         LINENUMBER (9)
           NEW
           DUP
           LDC (OptionalUser)
-          GETSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          GETSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
           CHECKCAST
           ICONST_1
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -340,7 +340,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
           CHECKCAST
-          PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (OptionalUser$$serializer, descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
         LABEL (L1)
         LINENUMBER (10)
           RETURN
@@ -363,7 +363,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ASTORE (1)
           ALOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           AASTORE
           ALOAD (1)
@@ -397,7 +397,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (7)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (6)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;)
@@ -424,7 +424,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (7)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (6)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;)
@@ -541,7 +541,7 @@ public final class OptionalUser : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (OptionalUser$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LOptionalUser$Companion;)
+          PUTSTATIC (OptionalUser, Companion, LOptionalUser$Companion;)
           RETURN
     }
 
@@ -558,7 +558,7 @@ public final class OptionalUser : java/lang/Object {
         LINENUMBER (10)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
           RETURN
         LABEL (L3)
     }
@@ -592,7 +592,7 @@ public final class OptionalUser : java/lang/Object {
           IFEQ (L1)
           ILOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          GETSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
           INVOKEVIRTUAL (OptionalUser$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
         LABEL (L1)
@@ -612,12 +612,12 @@ public final class OptionalUser : java/lang/Object {
           INVOKESPECIAL (User, <init>, (Ljava/lang/String;Ljava/lang/String;)V)
         LABEL (L4)
         LINENUMBER (9)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
           GOTO (L5)
         LABEL (L2)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
         LABEL (L5)
           RETURN
         LABEL (L6)
@@ -658,7 +658,7 @@ public final class OptionalUser : java/lang/Object {
           GOTO (L3)
         LABEL (L2)
           ALOAD (0)
-          GETFIELD (user, LUser;)
+          GETFIELD (OptionalUser, user, LUser;)
         LABEL (L4)
         LINENUMBER (10)
           NEW
@@ -679,10 +679,10 @@ public final class OptionalUser : java/lang/Object {
           ALOAD (1)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (0)
-          GETFIELD (user, LUser;)
+          GETFIELD (OptionalUser, user, LUser;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
         LABEL (L6)
           RETURN
@@ -699,13 +699,13 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           NEW
           DUP
           INVOKESPECIAL (User$$serializer, <init>, ()V)
-          PUTSTATIC (INSTANCE, LUser$$serializer;)
+          PUTSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
         LABEL (L0)
         LINENUMBER (6)
           NEW
           DUP
           LDC (User)
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ICONST_2
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -720,7 +720,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
           CHECKCAST
-          PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (User$$serializer, descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
         LABEL (L1)
         LINENUMBER (7)
           RETURN
@@ -743,12 +743,12 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           ASTORE (1)
           ALOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           ALOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           ALOAD (1)
@@ -944,7 +944,7 @@ public final class User : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
           RETURN
     }
 
@@ -964,10 +964,10 @@ public final class User : java/lang/Object {
         LINENUMBER (7)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (firstName, Ljava/lang/String;)
+          PUTFIELD (User, firstName, Ljava/lang/String;)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (lastName, Ljava/lang/String;)
+          PUTFIELD (User, lastName, Ljava/lang/String;)
           RETURN
         LABEL (L3)
     }
@@ -982,7 +982,7 @@ public final class User : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_3
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           INVOKEVIRTUAL (User$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
         LABEL (L1)
@@ -990,10 +990,10 @@ public final class User : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (firstName, Ljava/lang/String;)
+          PUTFIELD (User, firstName, Ljava/lang/String;)
           ALOAD (0)
           ALOAD (3)
-          PUTFIELD (lastName, Ljava/lang/String;)
+          PUTFIELD (User, lastName, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -1019,13 +1019,13 @@ public final class User : java/lang/Object {
           ALOAD (2)
           ICONST_0
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           ALOAD (1)
           ALOAD (2)
           ICONST_1
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           RETURN
         LABEL (L2)

plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt

@@ -11,11 +11,11 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           INVOKESPECIAL (ListOfUsers$$serializer, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          PUTSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
           NEW
           DUP
           LDC (ListOfUsers)
-          GETSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          GETSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
           CHECKCAST
           LDC (1)
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -25,7 +25,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
-          PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (ListOfUsers$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -46,7 +46,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           AASTORE
@@ -59,7 +59,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ALOAD (1)
           LDC (decoder)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (ListOfUsers$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (2)
           ICONST_0
           ISTORE (4)
@@ -77,7 +77,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           ALOAD (5)
@@ -100,7 +100,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           ALOAD (5)
@@ -152,7 +152,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
           ALOAD (2)
           LDC (value)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (ListOfUsers$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (3)
           ALOAD (1)
           ALOAD (3)
@@ -215,7 +215,7 @@ public final class ListOfUsers : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (ListOfUsers$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LListOfUsers$Companion;)
+          PUTSTATIC (ListOfUsers, Companion, LListOfUsers$Companion;)
           RETURN
     }
 
@@ -230,7 +230,7 @@ public final class ListOfUsers : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (list, Ljava/util/List;)
+          PUTFIELD (ListOfUsers, list, Ljava/util/List;)
           RETURN
         LABEL (L2)
     }
@@ -244,7 +244,7 @@ public final class ListOfUsers : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LListOfUsers$$serializer;)
+          GETSTATIC (ListOfUsers$$serializer, INSTANCE, LListOfUsers$$serializer;)
           CHECKCAST
           INVOKEINTERFACE (kotlinx/serialization/KSerializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
@@ -253,7 +253,7 @@ public final class ListOfUsers : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (list, Ljava/util/List;)
+          PUTFIELD (ListOfUsers, list, Ljava/util/List;)
           RETURN
         LABEL (L2)
     }
@@ -276,11 +276,11 @@ public final class ListOfUsers : java/lang/Object {
           ICONST_0
           NEW
           DUP
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, <init>, (Lkotlinx/serialization/KSerializer;)V)
           ALOAD (0)
-          GETFIELD (list, Ljava/util/List;)
+          GETFIELD (ListOfUsers, list, Ljava/util/List;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)
@@ -300,11 +300,11 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           INVOKESPECIAL (OptionalUser$$serializer, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          PUTSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
           NEW
           DUP
           LDC (OptionalUser)
-          GETSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          GETSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
           CHECKCAST
           LDC (1)
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -314,7 +314,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ICONST_1
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
-          PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (OptionalUser$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -333,7 +333,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           AASTORE
           ARETURN
@@ -345,7 +345,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (1)
           LDC (decoder)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (OptionalUser$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (2)
           ICONST_0
           ISTORE (4)
@@ -361,7 +361,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (1)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (5)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;)
@@ -381,7 +381,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (1)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (5)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;)
@@ -432,7 +432,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
           ALOAD (2)
           LDC (value)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (OptionalUser$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (3)
           ALOAD (1)
           ALOAD (3)
@@ -495,7 +495,7 @@ public final class OptionalUser : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (OptionalUser$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LOptionalUser$Companion;)
+          PUTSTATIC (OptionalUser, Companion, LOptionalUser$Companion;)
           RETURN
     }
 
@@ -510,7 +510,7 @@ public final class OptionalUser : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
           RETURN
         LABEL (L2)
     }
@@ -553,7 +553,7 @@ public final class OptionalUser : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, LOptionalUser$$serializer;)
+          GETSTATIC (OptionalUser$$serializer, INSTANCE, LOptionalUser$$serializer;)
           CHECKCAST
           INVOKEINTERFACE (kotlinx/serialization/KSerializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
@@ -566,7 +566,7 @@ public final class OptionalUser : java/lang/Object {
           IFEQ (L2)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
           GOTO (L3)
         LABEL (L2)
           ALOAD (0)
@@ -577,7 +577,7 @@ public final class OptionalUser : java/lang/Object {
           LDC ()
           LDC ()
           INVOKESPECIAL (User, <init>, (Ljava/lang/String;Ljava/lang/String;)V)
-          PUTFIELD (user, LUser;)
+          PUTFIELD (OptionalUser, user, LUser;)
         LABEL (L3)
           RETURN
         LABEL (L5)
@@ -597,7 +597,7 @@ public final class OptionalUser : java/lang/Object {
           LDC (serialDesc)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (user, LUser;)
+          GETFIELD (OptionalUser, user, LUser;)
         LABEL (L1)
         LINENUMBER (10)
           NEW
@@ -618,10 +618,10 @@ public final class OptionalUser : java/lang/Object {
           ALOAD (1)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           ALOAD (0)
-          GETFIELD (user, LUser;)
+          GETFIELD (OptionalUser, user, LUser;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
         LABEL (L3)
           RETURN
@@ -642,11 +642,11 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           INVOKESPECIAL (User$$serializer, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LUser$$serializer;)
+          PUTSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           NEW
           DUP
           LDC (User)
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           LDC (2)
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -660,7 +660,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           ICONST_0
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
-          PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (User$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -679,12 +679,12 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           DUP
           ICONST_1
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           ARETURN
@@ -696,7 +696,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           ALOAD (1)
           LDC (decoder)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (User$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (2)
           ICONST_0
           ISTORE (4)
@@ -794,7 +794,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
           ALOAD (2)
           LDC (value)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (User$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (3)
           ALOAD (1)
           ALOAD (3)
@@ -859,7 +859,7 @@ public final class User : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
           RETURN
     }
 
@@ -877,10 +877,10 @@ public final class User : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (firstName, Ljava/lang/String;)
+          PUTFIELD (User, firstName, Ljava/lang/String;)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (lastName, Ljava/lang/String;)
+          PUTFIELD (User, lastName, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -894,7 +894,7 @@ public final class User : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_3
-          GETSTATIC (INSTANCE, LUser$$serializer;)
+          GETSTATIC (User$$serializer, INSTANCE, LUser$$serializer;)
           CHECKCAST
           INVOKEINTERFACE (kotlinx/serialization/KSerializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
@@ -903,10 +903,10 @@ public final class User : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (firstName, Ljava/lang/String;)
+          PUTFIELD (User, firstName, Ljava/lang/String;)
           ALOAD (0)
           ALOAD (3)
-          PUTFIELD (lastName, Ljava/lang/String;)
+          PUTFIELD (User, lastName, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -930,13 +930,13 @@ public final class User : java/lang/Object {
           ALOAD (2)
           ICONST_0
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           ALOAD (1)
           ALOAD (2)
           ICONST_1
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           RETURN
         LABEL (L1)

plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Sealed.ir.txt

@@ -7,13 +7,13 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           NEW
           DUP
           INVOKESPECIAL (Container$$serializer, <init>, ()V)
-          PUTSTATIC (INSTANCE, LContainer$$serializer;)
+          PUTSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
         LABEL (L0)
         LINENUMBER (13)
           NEW
           DUP
           LDC (Container)
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           CHECKCAST
           ICONST_1
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -24,7 +24,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
           CHECKCAST
-          PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (Container$$serializer, descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
         LABEL (L1)
         LINENUMBER (14)
           RETURN
@@ -47,7 +47,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ASTORE (1)
           ALOAD (1)
           ICONST_0
-          GETSTATIC (Companion, LResult$Companion;)
+          GETSTATIC (Result, Companion, LResult$Companion;)
           INVOKEVIRTUAL (Result$Companion, serializer, ()Lkotlinx/serialization/KSerializer;)
           AASTORE
           ALOAD (1)
@@ -81,7 +81,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ALOAD (7)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (Companion, LResult$Companion;)
+          GETSTATIC (Result, Companion, LResult$Companion;)
           INVOKEVIRTUAL (Result$Companion, serializer, ()Lkotlinx/serialization/KSerializer;)
           CHECKCAST
           ALOAD (6)
@@ -109,7 +109,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ALOAD (7)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (Companion, LResult$Companion;)
+          GETSTATIC (Result, Companion, LResult$Companion;)
           INVOKEVIRTUAL (Result$Companion, serializer, ()Lkotlinx/serialization/KSerializer;)
           CHECKCAST
           ALOAD (6)
@@ -181,7 +181,7 @@ public final class Container$Companion : java/lang/Object {
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
         LINENUMBER (13)
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           CHECKCAST
           ARETURN
         LABEL (L1)
@@ -198,7 +198,7 @@ public final class Container : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Container$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LContainer$Companion;)
+          PUTSTATIC (Container, Companion, LContainer$Companion;)
           RETURN
     }
 
@@ -215,7 +215,7 @@ public final class Container : java/lang/Object {
         LINENUMBER (14)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (r, LResult;)
+          PUTFIELD (Container, r, LResult;)
           RETURN
         LABEL (L3)
     }
@@ -230,7 +230,7 @@ public final class Container : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           INVOKEVIRTUAL (Container$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
         LABEL (L1)
@@ -238,7 +238,7 @@ public final class Container : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (r, LResult;)
+          PUTFIELD (Container, r, LResult;)
           RETURN
         LABEL (L2)
     }
@@ -261,11 +261,11 @@ public final class Container : java/lang/Object {
           ALOAD (1)
           ALOAD (2)
           ICONST_0
-          GETSTATIC (Companion, LResult$Companion;)
+          GETSTATIC (Result, Companion, LResult$Companion;)
           INVOKEVIRTUAL (Result$Companion, serializer, ()Lkotlinx/serialization/KSerializer;)
           CHECKCAST
           ALOAD (0)
-          GETFIELD (r, LResult;)
+          GETFIELD (Container, r, LResult;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
           RETURN
         LABEL (L2)
@@ -279,7 +279,7 @@ final class Result$Companion$$cachedSerializer$delegate$1 : kotlin/jvm/internal/
           NEW
           DUP
           INVOKESPECIAL (Result$Companion$$cachedSerializer$delegate$1, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$Companion$$cachedSerializer$delegate$1;)
+          PUTSTATIC (Result$Companion$$cachedSerializer$delegate$1, INSTANCE, LResult$Companion$$cachedSerializer$delegate$1;)
           RETURN
     }
 
@@ -319,7 +319,7 @@ final class Result$Companion$$cachedSerializer$delegate$1 : kotlin/jvm/internal/
           ASTORE (1)
           ALOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           ALOAD (1)
@@ -327,7 +327,7 @@ final class Result$Companion$$cachedSerializer$delegate$1 : kotlin/jvm/internal/
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           CHECKCAST
           AASTORE
@@ -387,7 +387,7 @@ final class Result$Err$$cachedSerializer$delegate$1 : kotlin/jvm/internal/Lambda
           NEW
           DUP
           INVOKESPECIAL (Result$Err$$cachedSerializer$delegate$1, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$Err$$cachedSerializer$delegate$1;)
+          PUTSTATIC (Result$Err$$cachedSerializer$delegate$1, INSTANCE, LResult$Err$$cachedSerializer$delegate$1;)
           RETURN
     }
 
@@ -406,7 +406,7 @@ final class Result$Err$$cachedSerializer$delegate$1 : kotlin/jvm/internal/Lambda
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           CHECKCAST
           ARETURN
@@ -432,14 +432,14 @@ public final class Result$Err : Result {
           NEW
           DUP
           INVOKESPECIAL (Result$Err, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$Err;)
+          PUTSTATIC (Result$Err, INSTANCE, LResult$Err;)
         LABEL (L0)
         LINENUMBER (10)
-          GETSTATIC (PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
+          GETSTATIC (kotlin/LazyThreadSafetyMode, PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
-          GETSTATIC (INSTANCE, LResult$Err$$cachedSerializer$delegate$1;)
+          GETSTATIC (Result$Err$$cachedSerializer$delegate$1, INSTANCE, LResult$Err$$cachedSerializer$delegate$1;)
           CHECKCAST
           INVOKESTATIC (kotlin/LazyKt, lazy, (Lkotlin/LazyThreadSafetyMode;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;)
-          PUTSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          PUTSTATIC (Result$Err, $cachedSerializer$delegate, Lkotlin/Lazy;)
           RETURN
     }
 
@@ -476,13 +476,13 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           NEW
           DUP
           INVOKESPECIAL (Result$OK$$serializer, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$OK$$serializer;)
+          PUTSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
         LABEL (L0)
         LINENUMBER (9)
           NEW
           DUP
           LDC (Result.OK)
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           ICONST_1
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -493,7 +493,7 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
           CHECKCAST
-          PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (Result$OK$$serializer, descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -514,7 +514,7 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           ASTORE (1)
           ALOAD (1)
           ICONST_0
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           ALOAD (1)
@@ -639,7 +639,7 @@ public final class Result$OK$Companion : java/lang/Object {
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
         LINENUMBER (9)
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           ARETURN
         LABEL (L1)
@@ -656,7 +656,7 @@ public final class Result$OK : Result {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Result$OK$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LResult$OK$Companion;)
+          PUTSTATIC (Result$OK, Companion, LResult$OK$Companion;)
           RETURN
     }
 
@@ -672,7 +672,7 @@ public final class Result$OK : Result {
           INVOKESPECIAL (Result, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (s, Ljava/lang/String;)
+          PUTFIELD (Result$OK, s, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -687,7 +687,7 @@ public final class Result$OK : Result {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           INVOKEVIRTUAL (Result$OK$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
         LABEL (L1)
@@ -697,7 +697,7 @@ public final class Result$OK : Result {
           INVOKESPECIAL (Result, <init>, (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (s, Ljava/lang/String;)
+          PUTFIELD (Result$OK, s, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -726,7 +726,7 @@ public final class Result$OK : Result {
           ALOAD (2)
           ICONST_0
           ALOAD (0)
-          GETFIELD (s, Ljava/lang/String;)
+          GETFIELD (Result$OK, s, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           RETURN
         LABEL (L2)
@@ -743,14 +743,14 @@ public abstract class Result : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Result$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LResult$Companion;)
+          PUTSTATIC (Result, Companion, LResult$Companion;)
         LABEL (L0)
         LINENUMBER (7)
-          GETSTATIC (PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
+          GETSTATIC (kotlin/LazyThreadSafetyMode, PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
-          GETSTATIC (INSTANCE, LResult$Companion$$cachedSerializer$delegate$1;)
+          GETSTATIC (Result$Companion$$cachedSerializer$delegate$1, INSTANCE, LResult$Companion$$cachedSerializer$delegate$1;)
           CHECKCAST
           INVOKESTATIC (kotlin/LazyKt, lazy, (Lkotlin/LazyThreadSafetyMode;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;)
-          PUTSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          PUTSTATIC (Result, $cachedSerializer$delegate, Lkotlin/Lazy;)
           RETURN
     }
 

plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Sealed.txt

@@ -11,11 +11,11 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           INVOKESPECIAL (Container$$serializer, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LContainer$$serializer;)
+          PUTSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           NEW
           DUP
           LDC (Container)
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           CHECKCAST
           LDC (1)
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -25,7 +25,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ICONST_0
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
-          PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (Container$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -65,7 +65,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           DUP
@@ -73,7 +73,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           AASTORE
           INVOKESPECIAL (kotlinx/serialization/SealedClassSerializer, <init>, (Ljava/lang/String;Lkotlin/reflect/KClass;[Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)V)
@@ -87,7 +87,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ALOAD (1)
           LDC (decoder)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (Container$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (2)
           ICONST_0
           ISTORE (4)
@@ -124,7 +124,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           DUP
@@ -132,7 +132,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           AASTORE
           INVOKESPECIAL (kotlinx/serialization/SealedClassSerializer, <init>, (Ljava/lang/String;Lkotlin/reflect/KClass;[Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)V)
@@ -175,7 +175,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           DUP
@@ -183,7 +183,7 @@ public final class Container$$serializer : java/lang/Object, kotlinx/serializati
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           AASTORE
           INVOKESPECIAL (kotlinx/serialization/SealedClassSerializer, <init>, (Ljava/lang/String;Lkotlin/reflect/KClass;[Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)V)
@@ -256,7 +256,7 @@ public final class Container$Companion : java/lang/Object {
 
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           CHECKCAST
           ARETURN
         LABEL (L1)
@@ -273,7 +273,7 @@ public final class Container : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Container$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LContainer$Companion;)
+          PUTSTATIC (Container, Companion, LContainer$Companion;)
           RETURN
     }
 
@@ -288,7 +288,7 @@ public final class Container : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (r, LResult;)
+          PUTFIELD (Container, r, LResult;)
           RETURN
         LABEL (L2)
     }
@@ -302,7 +302,7 @@ public final class Container : java/lang/Object {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LContainer$$serializer;)
+          GETSTATIC (Container$$serializer, INSTANCE, LContainer$$serializer;)
           CHECKCAST
           INVOKEINTERFACE (kotlinx/serialization/KSerializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
@@ -311,7 +311,7 @@ public final class Container : java/lang/Object {
           INVOKESPECIAL (java/lang/Object, <init>, ()V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (r, LResult;)
+          PUTFIELD (Container, r, LResult;)
           RETURN
         LABEL (L2)
     }
@@ -353,7 +353,7 @@ public final class Container : java/lang/Object {
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           DUP
@@ -361,12 +361,12 @@ public final class Container : java/lang/Object {
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           AASTORE
           INVOKESPECIAL (kotlinx/serialization/SealedClassSerializer, <init>, (Ljava/lang/String;Lkotlin/reflect/KClass;[Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)V)
           ALOAD (0)
-          GETFIELD (r, LResult;)
+          GETFIELD (Container, r, LResult;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)
@@ -380,7 +380,7 @@ final class Result$Companion$serializer$1 : kotlin/jvm/internal/Lambda, kotlin/j
           NEW
           DUP
           INVOKESPECIAL (Result$Companion$serializer$1, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$Companion$serializer$1;)
+          PUTSTATIC (Result$Companion$serializer$1, INSTANCE, LResult$Companion$serializer$1;)
           RETURN
     }
 
@@ -416,7 +416,7 @@ final class Result$Companion$serializer$1 : kotlin/jvm/internal/Lambda, kotlin/j
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           AASTORE
           DUP
@@ -424,7 +424,7 @@ final class Result$Companion$serializer$1 : kotlin/jvm/internal/Lambda, kotlin/j
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           AASTORE
           INVOKESPECIAL (kotlinx/serialization/SealedClassSerializer, <init>, (Ljava/lang/String;Lkotlin/reflect/KClass;[Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)V)
@@ -445,11 +445,11 @@ public final class Result$Companion : java/lang/Object {
     private final static kotlin.Lazy $cachedSerializer$delegate
 
     static void <clinit>() {
-          GETSTATIC (PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
+          GETSTATIC (kotlin/LazyThreadSafetyMode, PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
-          GETSTATIC (INSTANCE, LResult$Companion$serializer$1;)
+          GETSTATIC (Result$Companion$serializer$1, INSTANCE, LResult$Companion$serializer$1;)
           CHECKCAST
           INVOKESTATIC (kotlin/LazyKt, lazy, (Lkotlin/LazyThreadSafetyMode;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;)
-          PUTSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          PUTSTATIC (Result$Companion, $cachedSerializer$delegate, Lkotlin/Lazy;)
           RETURN
     }
 
@@ -473,7 +473,7 @@ public final class Result$Companion : java/lang/Object {
 
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
-          GETSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          GETSTATIC (Result$Companion, $cachedSerializer$delegate, Lkotlin/Lazy;)
           INVOKEINTERFACE (kotlin/Lazy, getValue, ()Ljava/lang/Object;)
           CHECKCAST
           ARETURN
@@ -488,7 +488,7 @@ final class Result$Err$serializer$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/fun
           NEW
           DUP
           INVOKESPECIAL (Result$Err$serializer$1, <init>, ()V)
-          PUTSTATIC (INSTANCE, LResult$Err$serializer$1;)
+          PUTSTATIC (Result$Err$serializer$1, INSTANCE, LResult$Err$serializer$1;)
           RETURN
     }
 
@@ -506,7 +506,7 @@ final class Result$Err$serializer$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/fun
           NEW
           DUP
           LDC (Result.Err)
-          GETSTATIC (INSTANCE, LResult$Err;)
+          GETSTATIC (Result$Err, INSTANCE, LResult$Err;)
           INVOKESPECIAL (kotlinx/serialization/internal/ObjectSerializer, <init>, (Ljava/lang/String;Ljava/lang/Object;)V)
           ARETURN
         LABEL (L1)
@@ -534,12 +534,12 @@ public final class Result$Err : Result {
           INVOKESPECIAL (Result$Err, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LResult$Err;)
+          PUTSTATIC (Result$Err, INSTANCE, LResult$Err;)
-          GETSTATIC (PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
+          GETSTATIC (kotlin/LazyThreadSafetyMode, PUBLICATION, Lkotlin/LazyThreadSafetyMode;)
-          GETSTATIC (INSTANCE, LResult$Err$serializer$1;)
+          GETSTATIC (Result$Err$serializer$1, INSTANCE, LResult$Err$serializer$1;)
           CHECKCAST
           INVOKESTATIC (kotlin/LazyKt, lazy, (Lkotlin/LazyThreadSafetyMode;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;)
-          PUTSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          PUTSTATIC (Result$Err, $cachedSerializer$delegate, Lkotlin/Lazy;)
           RETURN
     }
 
@@ -557,7 +557,7 @@ public final class Result$Err : Result {
 
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
-          GETSTATIC ($cachedSerializer$delegate, Lkotlin/Lazy;)
+          GETSTATIC (Result$Err, $cachedSerializer$delegate, Lkotlin/Lazy;)
           INVOKEINTERFACE (kotlin/Lazy, getValue, ()Ljava/lang/Object;)
           CHECKCAST
           ARETURN
@@ -578,11 +578,11 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           INVOKESPECIAL (Result$OK$$serializer, <init>, ()V)
           ASTORE (0)
           ALOAD (0)
-          PUTSTATIC (INSTANCE, LResult$OK$$serializer;)
+          PUTSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           NEW
           DUP
           LDC (Result.OK)
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           LDC (1)
           INVOKESPECIAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, <init>, (Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V)
@@ -592,7 +592,7 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           ICONST_0
           INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V)
           ALOAD (0)
-          PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          PUTSTATIC (Result$OK$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           RETURN
     }
 
@@ -611,7 +611,7 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           ANEWARRAY
           DUP
           ICONST_0
-          GETSTATIC (INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
+          GETSTATIC (kotlinx/serialization/internal/StringSerializer, INSTANCE, Lkotlinx/serialization/internal/StringSerializer;)
           CHECKCAST
           AASTORE
           ARETURN
@@ -623,7 +623,7 @@ public final class Result$OK$$serializer : java/lang/Object, kotlinx/serializati
           ALOAD (1)
           LDC (decoder)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
+          GETSTATIC (Result$OK$$serializer, $$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;)
           ASTORE (2)
           ICONST_0
           ISTORE (4)
@@ -722,7 +722,7 @@ public final class Result$OK$Companion : java/lang/Object {
 
     public final kotlinx.serialization.KSerializer serializer() {
         LABEL (L0)
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           ARETURN
         LABEL (L1)
@@ -739,7 +739,7 @@ public final class Result$OK : Result {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Result$OK$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LResult$OK$Companion;)
+          PUTSTATIC (Result$OK, Companion, LResult$OK$Companion;)
           RETURN
     }
 
@@ -755,7 +755,7 @@ public final class Result$OK : Result {
           INVOKESPECIAL (Result, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
           ALOAD (0)
           ALOAD (1)
-          PUTFIELD (s, Ljava/lang/String;)
+          PUTFIELD (Result$OK, s, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -769,7 +769,7 @@ public final class Result$OK : Result {
           IF_ICMPEQ (L1)
           ILOAD (1)
           ICONST_1
-          GETSTATIC (INSTANCE, LResult$OK$$serializer;)
+          GETSTATIC (Result$OK$$serializer, INSTANCE, LResult$OK$$serializer;)
           CHECKCAST
           INVOKEINTERFACE (kotlinx/serialization/KSerializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;)
           INVOKESTATIC (kotlinx/serialization/internal/PluginExceptionsKt, throwMissingFieldException, (IILkotlinx/serialization/descriptors/SerialDescriptor;)V)
@@ -780,7 +780,7 @@ public final class Result$OK : Result {
           INVOKESPECIAL (Result, <init>, (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V)
           ALOAD (0)
           ALOAD (2)
-          PUTFIELD (s, Ljava/lang/String;)
+          PUTFIELD (Result$OK, s, Ljava/lang/String;)
           RETURN
         LABEL (L2)
     }
@@ -806,7 +806,7 @@ public final class Result$OK : Result {
           ALOAD (2)
           ICONST_0
           ALOAD (0)
-          GETFIELD (s, Ljava/lang/String;)
+          GETFIELD (Result$OK, s, Ljava/lang/String;)
           INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V)
           RETURN
         LABEL (L1)
@@ -821,7 +821,7 @@ public abstract class Result : java/lang/Object {
           DUP
           ACONST_NULL
           INVOKESPECIAL (Result$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LResult$Companion;)
+          PUTSTATIC (Result, Companion, LResult$Companion;)
           RETURN
     }
 

plugins/parcelize/parcelize-compiler/testData/codegen/IBinderIInterface.ir.txt

@@ -68,19 +68,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binder, Landroid/os/IBinder;)
+          GETFIELD (User, binder, Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeStrongBinder, (Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArray, [Landroid/os/IBinder;)
+          GETFIELD (User, binderArray, [Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderArray, ([Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderList, Ljava/util/List;)
+          GETFIELD (User, binderList, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArrayList, Ljava/util/ArrayList;)
+          GETFIELD (User, binderArrayList, Ljava/util/ArrayList;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/IBinderIInterface.txt

@@ -90,19 +90,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binder, Landroid/os/IBinder;)
+          GETFIELD (User, binder, Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeStrongBinder, (Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArray, [Landroid/os/IBinder;)
+          GETFIELD (User, binderArray, [Landroid/os/IBinder;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderArray, ([Landroid/os/IBinder;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderList, Ljava/util/List;)
+          GETFIELD (User, binderList, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (binderArrayList, Ljava/util/ArrayList;)
+          GETFIELD (User, binderArrayList, Ljava/util/ArrayList;)
           DUP_X1
           INVOKEINTERFACE (java/util/Collection, size, ()I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/customParcelablesDifferentModule.ir.txt

@@ -42,7 +42,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -59,7 +59,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Landroid/accounts/Account;)
+          GETFIELD (test/Foo, kp, Landroid/accounts/Account;)
           CHECKCAST
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/customParcelablesDifferentModule.txt

@@ -41,7 +41,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -58,7 +58,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Landroid/accounts/Account;)
+          GETFIELD (test/Foo, kp, Landroid/accounts/Account;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/customParcelablesSameModule.ir.txt

@@ -54,13 +54,13 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
           DUP
           ACONST_NULL
           INVOKESPECIAL (k/KotlinParcelable$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, Lk/KotlinParcelable$Companion;)
+          PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;)
         LABEL (L0)
         LINENUMBER (18)
           NEW
           DUP
           INVOKESPECIAL (k/KotlinParcelable$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           RETURN
     }
 
@@ -93,7 +93,7 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
         LINENUMBER (13)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (data, I)
+          GETFIELD (k/KotlinParcelable, data, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
         LABEL (L2)
         LINENUMBER (14)
@@ -112,7 +112,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           NEW
           DUP
-          GETSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          GETSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           ALOAD (1)
           INVOKEVIRTUAL (k/KotlinParcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Lk/KotlinParcelable;)
           INVOKESPECIAL (test/Foo, <init>, (Lk/KotlinParcelable;)V)
@@ -144,7 +144,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -160,7 +160,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (kp, Lk/KotlinParcelable;)
+          GETFIELD (test/Foo, kp, Lk/KotlinParcelable;)
           ALOAD (1)
           ILOAD (2)
           INVOKEVIRTUAL (k/KotlinParcelable, writeToParcel, (Landroid/os/Parcel;I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/customParcelablesSameModule.txt

@@ -53,13 +53,13 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
           DUP
           ACONST_NULL
           INVOKESPECIAL (k/KotlinParcelable$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, Lk/KotlinParcelable$Companion;)
+          PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;)
         LABEL (L0)
         LINENUMBER (18)
           NEW
           DUP
           INVOKESPECIAL (k/KotlinParcelable$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
+          PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;)
           RETURN
     }
 
@@ -92,7 +92,7 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable
         LINENUMBER (13)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (data, I)
+          GETFIELD (k/KotlinParcelable, data, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
         LABEL (L2)
         LINENUMBER (14)
@@ -144,7 +144,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -161,7 +161,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (kp, Lk/KotlinParcelable;)
+          GETFIELD (test/Foo, kp, Lk/KotlinParcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.ir.txt

@@ -106,7 +106,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           ALOAD (1)
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (0)
           ALOAD (1)
           ILOAD (2)

plugins/parcelize/parcelize-compiler/testData/codegen/customSimple.txt

@@ -40,7 +40,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato
           ALOAD (1)
           LDC (in)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (1)
           INVOKEVIRTUAL (User$Companion, create, (Landroid/os/Parcel;)LUser;)
           ARETURN
@@ -102,7 +102,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           ALOAD (1)
           LDC (parcel)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ALOAD (0)
           ALOAD (1)
           ILOAD (2)

plugins/parcelize/parcelize-compiler/testData/codegen/customSimpleWithNewArray.txt

@@ -39,7 +39,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato
 
     public final User[] newArray(int size) {
         LABEL (L0)
-          GETSTATIC (Companion, LUser$Companion;)
+          GETSTATIC (User, Companion, LUser$Companion;)
           ILOAD (1)
           INVOKEVIRTUAL (User$Companion, newArray, (I)[LUser;)
           ARETURN

plugins/parcelize/parcelize-compiler/testData/codegen/duplicatingClinit.ir.txt

@@ -32,18 +32,18 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
         LABEL (L0)
         LINENUMBER (12)
           NEW
           DUP
           INVOKESPECIAL (java/lang/StringBuilder, <init>, ()V)
-          PUTSTATIC (test, Ljava/lang/StringBuilder;)
+          PUTSTATIC (User, test, Ljava/lang/StringBuilder;)
           RETURN
     }
 

plugins/parcelize/parcelize-compiler/testData/codegen/duplicatingClinit.txt

@@ -32,17 +32,17 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           ACONST_NULL
           INVOKESPECIAL (User$Companion, <init>, (Lkotlin/jvm/internal/DefaultConstructorMarker;)V)
-          PUTSTATIC (Companion, LUser$Companion;)
+          PUTSTATIC (User, Companion, LUser$Companion;)
         LABEL (L0)
         LINENUMBER (12)
           NEW
           DUP
           INVOKESPECIAL (java/lang/StringBuilder, <init>, ()V)
-          PUTSTATIC (test, Ljava/lang/StringBuilder;)
+          PUTSTATIC (User, test, Ljava/lang/StringBuilder;)
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 

plugins/parcelize/parcelize-compiler/testData/codegen/efficientParcelable.ir.txt

@@ -15,7 +15,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr
           ACONST_NULL
           GOTO (L3)
         LABEL (L2)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           ALOAD (1)
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
         LABEL (L3)
@@ -49,7 +49,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Bar$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -65,7 +65,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (foo, Ltest/Foo;)
+          GETFIELD (test/Bar, foo, Ltest/Foo;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)
@@ -97,7 +97,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           NEW
           DUP
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           ALOAD (1)
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -130,7 +130,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -146,7 +146,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (bar, Ltest/Bar;)
+          GETFIELD (test/Foo, bar, Ltest/Bar;)
           ALOAD (1)
           ILOAD (2)
           INVOKEVIRTUAL (test/Bar, writeToParcel, (Landroid/os/Parcel;I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/efficientParcelable.txt

@@ -13,7 +13,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr
           INVOKEVIRTUAL (android/os/Parcel, readInt, ()I)
           IFEQ (L2)
           ALOAD (1)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           SWAP
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -49,7 +49,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Bar$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -66,7 +66,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (foo, Ltest/Foo;)
+          GETFIELD (test/Bar, foo, Ltest/Foo;)
           DUP
           IFNULL (L1)
           ALOAD (1)
@@ -97,7 +97,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr
           NEW
           DUP
           ALOAD (1)
-          GETSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;)
           SWAP
           INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;)
           CHECKCAST
@@ -129,7 +129,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -146,7 +146,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (bar, Ltest/Bar;)
+          GETFIELD (test/Foo, bar, Ltest/Bar;)
           SWAP
           LDC (0)
           INVOKEINTERFACE (android/os/Parcelable, writeToParcel, (Landroid/os/Parcel;I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/generics.ir.txt

@@ -88,10 +88,10 @@ public final class Box : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (box, Landroid/os/Parcelable;)
+          GETFIELD (Box, box, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN
         LABEL (L1)
     }
-}
+}

plugins/parcelize/parcelize-compiler/testData/codegen/generics.txt

@@ -87,10 +87,10 @@ public final class Box : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (box, Landroid/os/Parcelable;)
+          GETFIELD (Box, box, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN
         LABEL (L1)
     }
-}
+}

plugins/parcelize/parcelize-compiler/testData/codegen/listInsideList.ir.txt

@@ -29,7 +29,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           ASTORE (3)
           ALOAD (1)
           ALOAD (3)

plugins/parcelize/parcelize-compiler/testData/codegen/listInsideList.txt

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           DUP_X1
           INVOKEINTERFACE (java/util/Collection, size, ()I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)

plugins/parcelize/parcelize-compiler/testData/codegen/nullableNotNullSize.ir.txt

@@ -30,7 +30,7 @@ public final class TestNotNull : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNotNull, a, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           RETURN
         LABEL (L1)
@@ -68,7 +68,7 @@ public final class TestNullable : java/lang/Object, android/os/Parcelable {
           LDC (out)
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNullable, a, Landroid/util/Size;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/nullableNotNullSize.txt

@@ -30,7 +30,7 @@ public final class TestNotNull : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNotNull, a, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           RETURN
         LABEL (L1)
@@ -69,7 +69,7 @@ public final class TestNullable : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (a, Landroid/util/Size;)
+          GETFIELD (TestNullable, a, Landroid/util/Size;)
           DUP
           IFNULL (L1)
           ALOAD (1)

plugins/parcelize/parcelize-compiler/testData/codegen/parcelable.ir.txt

@@ -41,7 +41,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -58,7 +58,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (parcelable, Landroid/os/Parcelable;)
+          GETFIELD (test/Foo, parcelable, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/parcelable.txt

@@ -40,7 +40,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (test/Foo$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -57,7 +57,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (parcelable, Landroid/os/Parcelable;)
+          GETFIELD (test/Foo, parcelable, Landroid/os/Parcelable;)
           ILOAD (2)
           INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/serializable.ir.txt

@@ -57,7 +57,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -76,12 +76,12 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (notNull, LSerializableSimple;)
+          GETFIELD (User, notNull, LSerializableSimple;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, LSerializableSimple;)
+          GETFIELD (User, nullable, LSerializableSimple;)
           CHECKCAST
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           RETURN

plugins/parcelize/parcelize-compiler/testData/codegen/serializable.txt

@@ -56,7 +56,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -75,11 +75,11 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (notNull, LSerializableSimple;)
+          GETFIELD (User, notNull, LSerializableSimple;)
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, LSerializableSimple;)
+          GETFIELD (User, nullable, LSerializableSimple;)
           INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/serializeValue.ir.txt

@@ -42,7 +42,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (Test$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -64,7 +64,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (value, LValue;)
+          GETFIELD (Test, value, LValue;)
           INVOKEVIRTUAL (android/os/Parcel, writeValue, (Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/serializeValue.txt

@@ -41,7 +41,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (Test$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -63,7 +63,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (value, LValue;)
+          GETFIELD (Test, value, LValue;)
           INVOKEVIRTUAL (android/os/Parcel, writeValue, (Ljava/lang/Object;)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/simple.ir.txt

@@ -77,7 +77,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
           CHECKCAST
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -132,19 +132,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (age, I)
+          GETFIELD (User, age, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (isProUser, Z)
+          GETFIELD (User, isProUser, Z)
           IFEQ (L1)
           ICONST_1
           GOTO (L2)

plugins/parcelize/parcelize-compiler/testData/codegen/simple.txt

@@ -68,7 +68,7 @@ public final class User : java/lang/Object, android/os/Parcelable {
           NEW
           DUP
           INVOKESPECIAL (User$Creator, <init>, ()V)
-          PUTSTATIC (CREATOR, Landroid/os/Parcelable$Creator;)
+          PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;)
           RETURN
     }
 
@@ -123,19 +123,19 @@ public final class User : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (firstName, Ljava/lang/String;)
+          GETFIELD (User, firstName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (lastName, Ljava/lang/String;)
+          GETFIELD (User, lastName, Ljava/lang/String;)
           INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (age, I)
+          GETFIELD (User, age, I)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (isProUser, Z)
+          GETFIELD (User, isProUser, Z)
           INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/simpleList.ir.txt

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeStringList, (Ljava/util/List;)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/simpleList.txt

@@ -30,7 +30,7 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (names, Ljava/util/List;)
+          GETFIELD (Test, names, Ljava/util/List;)
           INVOKEVIRTUAL (android/os/Parcel, writeStringList, (Ljava/util/List;)V)
           RETURN
         LABEL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/size.ir.txt

@@ -77,10 +77,10 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/Size;)
+          GETFIELD (Test, size, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/Size;)
+          GETFIELD (Test, nullable, Landroid/util/Size;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)
@@ -180,10 +180,10 @@ public final class TestF : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/SizeF;)
+          GETFIELD (TestF, size, Landroid/util/SizeF;)
           INVOKEVIRTUAL (android/os/Parcel, writeSizeF, (Landroid/util/SizeF;)V)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/SizeF;)
+          GETFIELD (TestF, nullable, Landroid/util/SizeF;)
           ASTORE (3)
           ALOAD (3)
           IFNONNULL (L1)

plugins/parcelize/parcelize-compiler/testData/codegen/size.txt

@@ -77,11 +77,11 @@ public final class Test : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/Size;)
+          GETFIELD (Test, size, Landroid/util/Size;)
           INVOKEVIRTUAL (android/os/Parcel, writeSize, (Landroid/util/Size;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/Size;)
+          GETFIELD (Test, nullable, Landroid/util/Size;)
           DUP
           IFNULL (L1)
           ALOAD (1)
@@ -178,11 +178,11 @@ public final class TestF : java/lang/Object, android/os/Parcelable {
           INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (size, Landroid/util/SizeF;)
+          GETFIELD (TestF, size, Landroid/util/SizeF;)
           INVOKEVIRTUAL (android/os/Parcel, writeSizeF, (Landroid/util/SizeF;)V)
           ALOAD (1)
           ALOAD (0)
-          GETFIELD (nullable, Landroid/util/SizeF;)
+          GETFIELD (TestF, nullable, Landroid/util/SizeF;)
           DUP
           IFNULL (L1)
           ALOAD (1)