From 294395f4cca092182364bc6e32c2ea3e142376fb Mon Sep 17 00:00:00 2001 From: Mads Ager Date: Wed, 14 Sep 2022 14:08:21 +0200 Subject: [PATCH] Rebase bytecode text expectations for parcel part of android-extensions. --- .../parcel/codegen/IBinderIInterface.ir.txt | 6 +++--- .../parcel/codegen/IBinderIInterface.txt | 8 ++++---- .../customParcelablesDifferentModule.ir.txt | 10 +++++----- .../codegen/customParcelablesDifferentModule.txt | 6 +++--- .../codegen/customParcelablesSameModule.ir.txt | 12 ++++++------ .../codegen/customParcelablesSameModule.txt | 12 ++++++------ .../testData/parcel/codegen/customSimple.ir.txt | 5 ++--- .../testData/parcel/codegen/customSimple.txt | 4 ++-- .../codegen/customSimpleWithNewArray.ir.txt | 2 +- .../parcel/codegen/customSimpleWithNewArray.txt | 2 +- .../parcel/codegen/duplicatingClinit.ir.txt | 8 ++++---- .../parcel/codegen/duplicatingClinit.txt | 6 +++--- .../parcel/codegen/efficientParcelable.ir.txt | 16 ++++++++-------- .../parcel/codegen/efficientParcelable.txt | 12 ++++++------ .../testData/parcel/codegen/kt25839.ir.txt | 2 +- .../testData/parcel/codegen/kt25839.txt | 4 ++-- .../parcel/codegen/listInsideList.ir.txt | 4 ++-- .../testData/parcel/codegen/listInsideList.txt | 6 +++--- .../testData/parcel/codegen/parcelable.ir.txt | 6 +++--- .../testData/parcel/codegen/parcelable.txt | 4 ++-- .../testData/parcel/codegen/serializable.ir.txt | 14 +++++++------- .../testData/parcel/codegen/serializable.txt | 8 ++++---- .../parcel/codegen/serializeValue.ir.txt | 8 ++++---- .../testData/parcel/codegen/serializeValue.txt | 6 +++--- .../testData/parcel/codegen/simple.ir.txt | 6 +++--- .../testData/parcel/codegen/simple.txt | 4 ++-- .../testData/parcel/codegen/size.ir.txt | 4 ++-- .../testData/parcel/codegen/size.txt | 4 ++-- 28 files changed, 94 insertions(+), 95 deletions(-) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.ir.txt index a5b3fb47354..343a53f5e6f 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.ir.txt @@ -6,7 +6,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readStrongBinder, ()Landroid/os/IBinder;) @@ -14,7 +14,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato INVOKEVIRTUAL (android/os/Parcel, createBinderArray, ()[Landroid/os/IBinder;) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, createBinderArrayList, ()Ljava/util/ArrayList;) - CHECKCAST + CHECKCAST (java/util/List) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, createBinderArrayList, ()Ljava/util/ArrayList;) INVOKESPECIAL (User, , (Landroid/os/IBinder;[Landroid/os/IBinder;Ljava/util/List;Ljava/util/ArrayList;)V) @@ -81,7 +81,7 @@ public final class User : java/lang/Object, android/os/Parcelable { ALOAD (1) ALOAD (0) GETFIELD (User, binderArrayList, Ljava/util/ArrayList;) - CHECKCAST + CHECKCAST (java/util/List) INVOKEVIRTUAL (android/os/Parcel, writeBinderList, (Ljava/util/List;)V) RETURN LABEL (L1) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt index 262e81a7a2e..a7837480d73 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/IBinderIInterface.txt @@ -7,7 +7,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readStrongBinder, ()Landroid/os/IBinder;) @@ -15,11 +15,11 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato INVOKEVIRTUAL (android/os/Parcel, createBinderArray, ()[Landroid/os/IBinder;) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, createBinderArrayList, ()Ljava/util/ArrayList;) - CHECKCAST + CHECKCAST (java/util/List) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readInt, ()I) ISTORE (2) - NEW + NEW (java/util/ArrayList) DUP ILOAD (2) INVOKESPECIAL (java/util/ArrayList, , (I)V) @@ -115,7 +115,7 @@ public final class User : java/lang/Object, android/os/Parcelable { ALOAD (1) SWAP INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (android/os/IBinder) INVOKEVIRTUAL (android/os/Parcel, writeStrongBinder, (Landroid/os/IBinder;)V) GOTO (L1) LABEL (L2) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.ir.txt index fe0515e1bdf..432677bc0b8 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.ir.txt @@ -6,13 +6,13 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) LDC (Ltest/Foo;) INVOKEVIRTUAL (java/lang/Class, getClassLoader, ()Ljava/lang/ClassLoader;) INVOKEVIRTUAL (android/os/Parcel, readParcelable, (Ljava/lang/ClassLoader;)Landroid/os/Parcelable;) - CHECKCAST + CHECKCAST (android/accounts/Account) INVOKESPECIAL (test/Foo, , (Landroid/accounts/Account;)V) ARETURN LABEL (L1) @@ -38,10 +38,10 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final android.accounts.Account kp static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } @@ -60,7 +60,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { ALOAD (1) ALOAD (0) GETFIELD (test/Foo, kp, Landroid/accounts/Account;) - CHECKCAST + CHECKCAST (android/os/Parcelable) ILOAD (2) INVOKEVIRTUAL (android/os/Parcel, writeParcelable, (Landroid/os/Parcelable;I)V) RETURN diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt index 45b7bae8721..edb213f63cd 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesDifferentModule.txt @@ -6,13 +6,13 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) LDC (Ltest/Foo;) INVOKEVIRTUAL (java/lang/Class, getClassLoader, ()Ljava/lang/ClassLoader;) INVOKEVIRTUAL (android/os/Parcel, readParcelable, (Ljava/lang/ClassLoader;)Landroid/os/Parcelable;) - CHECKCAST + CHECKCAST (android/accounts/Account) INVOKESPECIAL (test/Foo, , (Landroid/accounts/Account;)V) ARETURN LABEL (L1) @@ -38,7 +38,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final android.accounts.Account kp static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.ir.txt index 13a6bd3e0ee..37f518eb8ba 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.ir.txt @@ -19,7 +19,7 @@ public final class k/KotlinParcelable$Creator : java/lang/Object, android/os/Par ISTORE (2) LABEL (L2) LINENUMBER (24) - NEW + NEW (k/KotlinParcelable) DUP ILOAD (2) INVOKESPECIAL (k/KotlinParcelable, , (I)V) @@ -50,14 +50,14 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable private int data static void () { - NEW + NEW (k/KotlinParcelable$Companion) DUP ACONST_NULL INVOKESPECIAL (k/KotlinParcelable$Companion, , (Lkotlin/jvm/internal/DefaultConstructorMarker;)V) PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;) LABEL (L0) LINENUMBER (18) - NEW + NEW (k/KotlinParcelable$Creator) DUP INVOKESPECIAL (k/KotlinParcelable$Creator, , ()V) PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;) @@ -110,7 +110,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP GETSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;) ALOAD (1) @@ -140,10 +140,10 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final k.KotlinParcelable kp static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt index fef2d07b995..9e8cae54e34 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customParcelablesSameModule.txt @@ -19,7 +19,7 @@ public final class k/KotlinParcelable$Creator : java/lang/Object, android/os/Par ISTORE (2) LABEL (L2) LINENUMBER (24) - NEW + NEW (k/KotlinParcelable) DUP ILOAD (2) INVOKESPECIAL (k/KotlinParcelable, , (I)V) @@ -49,14 +49,14 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable private int data static void () { - NEW + NEW (k/KotlinParcelable$Companion) DUP ACONST_NULL INVOKESPECIAL (k/KotlinParcelable$Companion, , (Lkotlin/jvm/internal/DefaultConstructorMarker;)V) PUTSTATIC (k/KotlinParcelable, Companion, Lk/KotlinParcelable$Companion;) LABEL (L0) LINENUMBER (18) - NEW + NEW (k/KotlinParcelable$Creator) DUP INVOKESPECIAL (k/KotlinParcelable$Creator, , ()V) PUTSTATIC (k/KotlinParcelable, CREATOR, Lk/KotlinParcelable$Creator;) @@ -109,13 +109,13 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) LDC (Ltest/Foo;) INVOKEVIRTUAL (java/lang/Class, getClassLoader, ()Ljava/lang/ClassLoader;) INVOKEVIRTUAL (android/os/Parcel, readParcelable, (Ljava/lang/ClassLoader;)Landroid/os/Parcelable;) - CHECKCAST + CHECKCAST (k/KotlinParcelable) INVOKESPECIAL (test/Foo, , (Lk/KotlinParcelable;)V) ARETURN LABEL (L1) @@ -141,7 +141,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final k.KotlinParcelable kp static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.ir.txt index 4a844821610..c3aa12ddf2a 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.ir.txt @@ -11,10 +11,9 @@ 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 + CHECKCAST ([LUser;) ARETURN LABEL (L1) } @@ -61,7 +60,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato public final User[] newArray(int size) { LABEL (L0) ILOAD (1) - ANEWARRAY + ANEWARRAY (User) ARETURN LABEL (L1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt index d616cd233d7..56ab899122e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimple.txt @@ -13,7 +13,7 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler { ALOAD (0) ILOAD (1) INVOKESTATIC (kotlinx/android/parcel/Parceler$DefaultImpls, newArray, (Lkotlinx/android/parcel/Parceler;I)[Ljava/lang/Object;) - CHECKCAST + CHECKCAST ([LUser;) ARETURN LABEL (L1) } @@ -59,7 +59,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato public final User[] newArray(int size) { LABEL (L0) ILOAD (1) - ANEWARRAY + ANEWARRAY (User) ARETURN LABEL (L1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.ir.txt index 76da451e970..cd81ac675b7 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.ir.txt @@ -11,7 +11,7 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler { LABEL (L0) LINENUMBER (19) ILOAD (1) - ANEWARRAY + ANEWARRAY (User) ARETURN LABEL (L1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt index 6f84e5978eb..e948de680b2 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customSimpleWithNewArray.txt @@ -11,7 +11,7 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler { LABEL (L0) LINENUMBER (19) ILOAD (1) - ANEWARRAY + ANEWARRAY (User) ARETURN LABEL (L1) } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.ir.txt index 7a6482d06d7..3e0240ae8f4 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.ir.txt @@ -28,19 +28,19 @@ public final class User : java/lang/Object, android/os/Parcelable { private final static java.lang.StringBuilder test static void () { - NEW + NEW (User$Companion) DUP ACONST_NULL INVOKESPECIAL (User$Companion, , (Lkotlin/jvm/internal/DefaultConstructorMarker;)V) PUTSTATIC (User, Companion, LUser$Companion;) - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) LABEL (L0) LINENUMBER (12) - NEW + NEW (java/lang/StringBuilder) DUP INVOKESPECIAL (java/lang/StringBuilder, , ()V) PUTSTATIC (User, test, Ljava/lang/StringBuilder;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt index 1dae5514a01..8c274288a4f 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/duplicatingClinit.txt @@ -28,18 +28,18 @@ public final class User : java/lang/Object, android/os/Parcelable { private final static java.lang.StringBuilder test static void () { - NEW + NEW (User$Companion) DUP ACONST_NULL INVOKESPECIAL (User$Companion, , (Lkotlin/jvm/internal/DefaultConstructorMarker;)V) PUTSTATIC (User, Companion, LUser$Companion;) LABEL (L0) LINENUMBER (12) - NEW + NEW (java/lang/StringBuilder) DUP INVOKESPECIAL (java/lang/StringBuilder, , ()V) PUTSTATIC (User, test, Ljava/lang/StringBuilder;) - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.ir.txt index 52bea1a4943..83b3dbb616e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.ir.txt @@ -7,7 +7,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (test/Bar) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readInt, ()I) @@ -19,7 +19,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;) LABEL (L3) - CHECKCAST + CHECKCAST (test/Foo) INVOKESPECIAL (test/Bar, , (Ltest/Foo;)V) ARETURN LABEL (L4) @@ -45,10 +45,10 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable { private final test.Foo foo static void () { - NEW + NEW (test/Bar$Creator) DUP INVOKESPECIAL (test/Bar$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } @@ -95,12 +95,12 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;) ALOAD (1) INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;) - CHECKCAST + CHECKCAST (test/Bar) INVOKESPECIAL (test/Foo, , (Ltest/Bar;)V) ARETURN LABEL (L1) @@ -126,10 +126,10 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final test.Bar bar static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.txt index d9d10ab1bd4..460d9598a44 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/efficientParcelable.txt @@ -7,7 +7,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (test/Bar) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readInt, ()I) @@ -16,7 +16,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr GETSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) SWAP INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;) - CHECKCAST + CHECKCAST (test/Foo) GOTO (L3) LABEL (L2) ACONST_NULL @@ -46,7 +46,7 @@ public final class test/Bar : java/lang/Object, android/os/Parcelable { private final test.Foo foo static void () { - NEW + NEW (test/Bar$Creator) DUP INVOKESPECIAL (test/Bar$Creator, , ()V) PUTSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;) @@ -94,13 +94,13 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) GETSTATIC (test/Bar, CREATOR, Landroid/os/Parcelable$Creator;) SWAP INVOKEINTERFACE (android/os/Parcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Ljava/lang/Object;) - CHECKCAST + CHECKCAST (test/Bar) INVOKESPECIAL (test/Foo, , (Ltest/Bar;)V) ARETURN LABEL (L1) @@ -126,7 +126,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final test.Bar bar static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.ir.txt index 5daa1c2f1e7..a45799dd12c 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.ir.txt @@ -9,7 +9,7 @@ public final class test/SomeClass$Creator : java/lang/Object, android/os/Parcela ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readInt, ()I) POP - NEW + NEW (test/SomeClass) DUP INVOKESPECIAL (test/SomeClass, , ()V) ARETURN diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.txt index 7b083f5e410..99a8ebf15db 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/kt25839.txt @@ -7,12 +7,12 @@ public final class test/SomeClass$Creator : java/lang/Object, android/os/Parcela LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (test/SomeClass) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readInt, ()I) IFEQ (L2) - NEW + NEW (test/SomeClass) DUP INVOKESPECIAL (test/SomeClass, , ()V) GOTO (L3) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.ir.txt index 7534d2cdbaf..5adee75c5ad 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.ir.txt @@ -44,7 +44,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { IFEQ (L2) ALOAD (4) INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (java/util/List) ASTORE (5) ALOAD (1) ALOAD (5) @@ -60,7 +60,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { ALOAD (1) ALOAD (6) INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (java/util/List) INVOKEVIRTUAL (android/os/Parcel, writeStringList, (Ljava/util/List;)V) GOTO (L3) LABEL (L2) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt index 92a2dfa135f..fec676d315b 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/listInsideList.txt @@ -43,7 +43,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { ALOAD (1) SWAP INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (java/util/List) DUP_X1 INVOKEINTERFACE (java/util/Collection, size, ()I) INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V) @@ -56,7 +56,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { ALOAD (1) SWAP INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (java/util/ArrayList) DUP_X1 INVOKEINTERFACE (java/util/Collection, size, ()I) INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V) @@ -69,7 +69,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { ALOAD (1) SWAP INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;) - CHECKCAST + CHECKCAST (java/lang/String) INVOKEVIRTUAL (android/os/Parcel, writeString, (Ljava/lang/String;)V) GOTO (L5) LABEL (L6) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.ir.txt index f7ee3efa060..c5690906479 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.ir.txt @@ -6,7 +6,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) LDC (Ltest/Foo;) @@ -37,10 +37,10 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final android.os.Parcelable parcelable static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt index f42478e381e..1cc808fa8f7 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.txt @@ -6,7 +6,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr ALOAD (1) LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (test/Foo) DUP ALOAD (1) LDC (Ltest/Foo;) @@ -37,7 +37,7 @@ public final class test/Foo : java/lang/Object, android/os/Parcelable { private final android.os.Parcelable parcelable static void () { - NEW + NEW (test/Foo$Creator) DUP INVOKESPECIAL (test/Foo$Creator, , ()V) PUTSTATIC (test/Foo, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.ir.txt index 0b6a671e363..d602f765f5e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.ir.txt @@ -18,14 +18,14 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSerializable, ()Ljava/io/Serializable;) - CHECKCAST + CHECKCAST (SerializableSimple) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSerializable, ()Ljava/io/Serializable;) - CHECKCAST + CHECKCAST (SerializableSimple) INVOKESPECIAL (User, , (LSerializableSimple;LSerializableSimple;)V) ARETURN LABEL (L1) @@ -53,10 +53,10 @@ public final class User : java/lang/Object, android/os/Parcelable { private final SerializableSimple nullable static void () { - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } @@ -77,12 +77,12 @@ public final class User : java/lang/Object, android/os/Parcelable { ALOAD (1) ALOAD (0) GETFIELD (User, notNull, LSerializableSimple;) - CHECKCAST + CHECKCAST (java/io/Serializable) INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V) ALOAD (1) ALOAD (0) GETFIELD (User, nullable, LSerializableSimple;) - CHECKCAST + CHECKCAST (java/io/Serializable) INVOKEVIRTUAL (android/os/Parcel, writeSerializable, (Ljava/io/Serializable;)V) RETURN LABEL (L1) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt index b35006ff2c2..3a727c7da17 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializable.txt @@ -18,14 +18,14 @@ 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) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSerializable, ()Ljava/io/Serializable;) - CHECKCAST + CHECKCAST (SerializableSimple) ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSerializable, ()Ljava/io/Serializable;) - CHECKCAST + CHECKCAST (SerializableSimple) INVOKESPECIAL (User, , (LSerializableSimple;LSerializableSimple;)V) ARETURN LABEL (L1) @@ -53,7 +53,7 @@ public final class User : java/lang/Object, android/os/Parcelable { private final SerializableSimple nullable static void () { - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.ir.txt index c56626be379..8614433aad0 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.ir.txt @@ -6,13 +6,13 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creato ALOAD (1) LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - NEW + NEW (Test) DUP ALOAD (1) LDC (LTest;) INVOKEVIRTUAL (java/lang/Class, getClassLoader, ()Ljava/lang/ClassLoader;) INVOKEVIRTUAL (android/os/Parcel, readValue, (Ljava/lang/ClassLoader;)Ljava/lang/Object;) - CHECKCAST + CHECKCAST (Value) INVOKESPECIAL (Test, , (LValue;)V) ARETURN LABEL (L1) @@ -38,10 +38,10 @@ public final class Test : java/lang/Object, android/os/Parcelable { private final Value value static void () { - NEW + NEW (Test$Creator) DUP INVOKESPECIAL (Test$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.txt index 5da50a88041..086c8853473 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/serializeValue.txt @@ -6,13 +6,13 @@ public final class Test$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) - NEW + NEW (Test) DUP ALOAD (1) LDC (LValue;) INVOKEVIRTUAL (java/lang/Class, getClassLoader, ()Ljava/lang/ClassLoader;) INVOKEVIRTUAL (android/os/Parcel, readValue, (Ljava/lang/ClassLoader;)Ljava/lang/Object;) - CHECKCAST + CHECKCAST (Value) INVOKESPECIAL (Test, , (LValue;)V) ARETURN LABEL (L1) @@ -38,7 +38,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { private final Value value static void () { - NEW + NEW (Test$Creator) DUP INVOKESPECIAL (Test$Creator, , ()V) PUTSTATIC (Test, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.ir.txt index 0baf4294127..af95772a89e 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.ir.txt @@ -14,7 +14,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readString, ()Ljava/lang/String;) @@ -73,10 +73,10 @@ public final class User : java/lang/Object, android/os/Parcelable { private final java.lang.String lastName static void () { - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) - CHECKCAST + CHECKCAST (android/os/Parcelable$Creator) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) RETURN } diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt index a9e8df6bf62..f10017c806b 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simple.txt @@ -14,7 +14,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (User) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readString, ()Ljava/lang/String;) @@ -65,7 +65,7 @@ public final class User : java/lang/Object, android/os/Parcelable { private final java.lang.String lastName static void () { - NEW + NEW (User$Creator) DUP INVOKESPECIAL (User$Creator, , ()V) PUTSTATIC (User, CREATOR, Landroid/os/Parcelable$Creator;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.ir.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.ir.txt index 98631d99b22..4ac2fef545c 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.ir.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.ir.txt @@ -7,7 +7,7 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creato LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (Test) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSize, ()Landroid/util/Size;) @@ -110,7 +110,7 @@ public final class TestF$Creator : java/lang/Object, android/os/Parcelable$Creat LDC (parcel) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (TestF) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSizeF, ()Landroid/util/SizeF;) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt index ebe060a42f8..f3e20f47cd5 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/size.txt @@ -7,7 +7,7 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creato LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (Test) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSize, ()Landroid/util/Size;) @@ -108,7 +108,7 @@ public final class TestF$Creator : java/lang/Object, android/os/Parcelable$Creat LDC (in) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) - NEW + NEW (TestF) DUP ALOAD (1) INVOKEVIRTUAL (android/os/Parcel, readSizeF, ()Landroid/util/SizeF;)