Parcelize, JVM IR: Fix types in nested containers

This commit is contained in:
Steven Schäfer
2020-05-28 20:01:33 +02:00
committed by Yan Zhulanow
parent eaa5d08736
commit 8ab6411b93
12 changed files with 206 additions and 33 deletions
@@ -112,8 +112,6 @@ 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 (Companion, Lk/KotlinParcelable$Companion;)
POP
GETSTATIC (CREATOR, Lk/KotlinParcelable$Creator;)
ALOAD (1)
INVOKEVIRTUAL (k/KotlinParcelable$Creator, createFromParcel, (Landroid/os/Parcel;)Lk/KotlinParcelable;)
@@ -44,14 +44,13 @@ public final class Test : java/lang/Object, android/os/Parcelable {
IFEQ (L2)
ALOAD (4)
INVOKEINTERFACE (java/util/Iterator, next, ()Ljava/lang/Object;)
CHECKCAST
ASTORE (5)
ALOAD (1)
ALOAD (5)
CHECKCAST
INVOKEINTERFACE (java/util/List, size, ()I)
INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
ALOAD (5)
CHECKCAST
INVOKEINTERFACE (java/util/List, iterator, ()Ljava/util/Iterator;)
ASTORE (6)
LABEL (L3)
@@ -1,7 +1,7 @@
public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creator {
public void <init>()
public final java.lang.Object createFromParcel(android.os.Parcel in) {
public final Test createFromParcel(android.os.Parcel in) {
LABEL (L0)
ALOAD (1)
LDC (in)
@@ -18,7 +18,18 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creato
LABEL (L1)
}
public final java.lang.Object[] newArray(int size)
public java.lang.Object createFromParcel(android.os.Parcel p0) {
LABEL (L0)
LINENUMBER (10)
ALOAD (0)
ALOAD (1)
INVOKEVIRTUAL (Test$Creator, createFromParcel, (Landroid/os/Parcel;)LTest;)
ARETURN
}
public final Test[] newArray(int size)
public java.lang.Object[] newArray(int p0)
}
public final class Test : java/lang/Object, android/os/Parcelable {
@@ -145,8 +145,14 @@ public final class User : java/lang/Object, android/os/Parcelable {
ALOAD (1)
ALOAD (0)
GETFIELD (isProUser, Z)
IFEQ (L1)
ICONST_1
GOTO (L2)
LABEL (L1)
ICONST_0
LABEL (L2)
INVOKEVIRTUAL (android/os/Parcel, writeInt, (I)V)
RETURN
LABEL (L1)
LABEL (L3)
}
}