From b39a65305dab7deaed27b9ca3aa1c9bb4d0060f5 Mon Sep 17 00:00:00 2001 From: rbares Date: Fri, 8 May 2020 17:41:06 +0100 Subject: [PATCH] Fix Parcelize codegen tests following rebase --- .../testData/parcel/box/javaInterop.kt | 1 - .../parcel/codegen/efficientParcelable.txt | 30 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt index a15422fc186..2993b4223f3 100644 --- a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/javaInterop.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM // This issue affects AIDL generated files, as reported in KT-25807 // WITH_RUNTIME // FILE: J.java 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 3d62bb1a91f..df3235c5e31 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 @@ -1,7 +1,7 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Creator { public void () - public final java.lang.Object createFromParcel(android.os.Parcel in) { + public final test.Bar createFromParcel(android.os.Parcel in) { LABEL (L0) ALOAD (1) LDC (in) @@ -26,7 +26,18 @@ public final class test/Bar$Creator : java/lang/Object, android/os/Parcelable$Cr 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 (test/Bar$Creator, createFromParcel, (Landroid/os/Parcel;)Ltest/Bar;) + ARETURN + } + + public final test.Bar[] newArray(int size) + + public java.lang.Object[] newArray(int p0) } public final class test/Bar : java/lang/Object, android/os/Parcelable { @@ -78,7 +89,7 @@ public final class test/Bar : 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) @@ -95,7 +106,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 (10) + 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 {