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 f22ffc03ea0..48a3345f324 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 @@ -1,7 +1,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final User createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -44,7 +44,18 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato LABEL (L4) } - 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 (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;) + ARETURN + } + + public final User[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class User : java/lang/Object, android/os/Parcelable { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt index c6be0381b5e..c573057e5c2 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/customDescribeContents.txt @@ -1,9 +1,13 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final User createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final User[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class User : java/lang/Object, android/os/Parcelable { 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 7a11f891695..cc7848632cd 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 @@ -1,7 +1,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final test.Foo createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -18,7 +18,18 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr LABEL (L1) } - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) { + LABEL (L0) + LINENUMBER (11) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (test/Foo$Creator, createFromParcel, (Landroid/os/Parcel;)Ltest/Foo;) + ARETURN + } + + public final test.Foo[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class test/Foo : java/lang/Object, android/os/Parcelable { 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 128b16c653e..570272720c9 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 @@ -104,7 +104,7 @@ public final class k/KotlinParcelable : java/lang/Object, android/os/Parcelable public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final test.Foo createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -121,7 +121,18 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr LABEL (L1) } - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) { + LABEL (L0) + LINENUMBER (9) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (test/Foo$Creator, createFromParcel, (Landroid/os/Parcel;)Ltest/Foo;) + ARETURN + } + + public final test.Foo[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class test/Foo : java/lang/Object, android/os/Parcelable { 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 782611c82ec..fe50e70e252 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 @@ -35,7 +35,7 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler { public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final User createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -47,13 +47,31 @@ public final class User$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 (9) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;) + ARETURN + } + + public final User[] newArray(int size) { LABEL (L0) ILOAD (1) ANEWARRAY ARETURN LABEL (L1) } + + public java.lang.Object[] newArray(int p0) { + LABEL (L0) + LINENUMBER (9) + ALOAD (0) + ILOAD (1) + INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;) + ARETURN + } } public final class User : java/lang/Object, android/os/Parcelable { 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 9acf544cc53..75c44dd081c 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 @@ -33,9 +33,11 @@ final class User$Companion : java/lang/Object, kotlinx/android/parcel/Parceler { public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final User createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) { + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final User[] newArray(int size) { LABEL (L0) GETSTATIC (Companion, LUser$Companion;) ILOAD (1) @@ -43,6 +45,15 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato ARETURN LABEL (L1) } + + public java.lang.Object[] newArray(int p0) { + LABEL (L0) + LINENUMBER (9) + ALOAD (0) + ILOAD (1) + INVOKEVIRTUAL (User$Creator, newArray, (I)[LUser;) + ARETURN + } } public final class User : java/lang/Object, android/os/Parcelable { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt index c327c526c49..0e5151bcce1 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/describeContentsFromSuperType.txt @@ -13,9 +13,13 @@ public abstract class AbstractUser : java/lang/Object, android/os/Parcelable { public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final User createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final User[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class User : AbstractUser { 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 da23b47c022..b354c9441d9 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 @@ -9,9 +9,13 @@ public final class User$Companion : java/lang/Object { public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final User createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final User[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class User : java/lang/Object, android/os/Parcelable { 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 1ed171e1d14..03772187fe8 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 @@ -1,7 +1,7 @@ public final class test/SomeClass$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final test.SomeClass createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -23,7 +23,18 @@ public final class test/SomeClass$Creator : java/lang/Object, android/os/Parcela LABEL (L4) } - 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/SomeClass$Creator, createFromParcel, (Landroid/os/Parcel;)Ltest/SomeClass;) + ARETURN + } + + public final test.SomeClass[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class test/SomeClass : java/lang/Object, android/os/Parcelable { 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 2034b4a8b57..c7beee8c920 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 @@ -1,9 +1,13 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final Test createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final Test[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class Test : java/lang/Object { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt index a39cab99be0..055a613755f 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/nullableNotNullSize.txt @@ -1,9 +1,13 @@ public final class TestNotNull$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final TestNotNull createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final TestNotNull[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class TestNotNull : java/lang/Object { @@ -36,9 +40,13 @@ public final class TestNotNull : java/lang/Object { public final class TestNullable$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final TestNullable createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final TestNullable[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class TestNullable : java/lang/Object { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.kt index ca06ed32acd..8e858720166 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.kt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/parcelable.kt @@ -11,11 +11,19 @@ class JavaClass { } } +//FILE: android/os/Parcel.java +package android.os; + +public class Parcel {} + //FILE: android/os/Parcelable.java package android.os; public interface Parcelable { - public static interface Creator {} + public static interface Creator { + T createFromParcel(Parcel source); + T[] newArray(int size); + } } 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 2430f24c8cc..abdb27c3c04 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 @@ -1,7 +1,7 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final test.Foo createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -17,7 +17,18 @@ public final class test/Foo$Creator : java/lang/Object, android/os/Parcelable$Cr LABEL (L1) } - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) { + LABEL (L0) + LINENUMBER (8) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (test/Foo$Creator, createFromParcel, (Landroid/os/Parcel;)Ltest/Foo;) + ARETURN + } + + public final test.Foo[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class test/Foo : java/lang/Object, android/os/Parcelable { 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 49dc1c3a27b..45e882dcb87 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 @@ -13,7 +13,7 @@ public final class SerializableSimple : java/lang/Object, java/io/Serializable { public final class User$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final User createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -31,7 +31,18 @@ public final class User$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 (11) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;) + ARETURN + } + + public final User[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class User : java/lang/Object, android/os/Parcelable { 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 fb68c752131..04621e76733 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 @@ -4,7 +4,7 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato 0 this: LUser$Creator; } - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final User createFromParcel(android.os.Parcel in) { Local variables: 0 this: LUser$Creator; 1 in: Landroid/os/Parcel; @@ -35,11 +35,22 @@ public final class User$Creator : java/lang/Object, android/os/Parcelable$Creato LABEL (L4) } - public final java.lang.Object[] newArray(int size) { + public java.lang.Object createFromParcel(android.os.Parcel p0) { + LABEL (L0) + LINENUMBER (9) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (User$Creator, createFromParcel, (Landroid/os/Parcel;)LUser;) + ARETURN + } + + public final User[] newArray(int size) { Local variables: 0 this: LUser$Creator; 1 size: I } + + public java.lang.Object[] newArray(int p0) } public final class User : java/lang/Object, android/os/Parcelable { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt index 6055779c293..8f13546f1c8 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/codegen/simpleList.txt @@ -1,9 +1,13 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) + public final Test createFromParcel(android.os.Parcel in) - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) + + public final Test[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class Test : java/lang/Object { 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 63ef9d7d4d9..46e54a909f7 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 @@ -1,7 +1,7 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final Test createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -25,7 +25,18 @@ public final class Test$Creator : java/lang/Object, android/os/Parcelable$Creato LABEL (L4) } - 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 { @@ -91,7 +102,7 @@ public final class Test : java/lang/Object, android/os/Parcelable { public final class TestF$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final TestF createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -115,7 +126,18 @@ public final class TestF$Creator : java/lang/Object, android/os/Parcelable$Creat LABEL (L4) } - public final java.lang.Object[] newArray(int size) + public java.lang.Object createFromParcel(android.os.Parcel p0) { + LABEL (L0) + LINENUMBER (13) + ALOAD (0) + ALOAD (1) + INVOKEVIRTUAL (TestF$Creator, createFromParcel, (Landroid/os/Parcel;)LTestF;) + ARETURN + } + + public final TestF[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class TestF : java/lang/Object, android/os/Parcelable {