From 17c15cfe0a4a77bc9089769efa75f3e7d52911d0 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 2 Jul 2020 15:23:27 +0300 Subject: [PATCH] JVM, JVM_IR: update bytecode listing testData for inline classes --- .../annotationsOnHiddenConstructor.txt | 4 +- .../annotationsOnHiddenConstructor_ir.txt | 69 ---------------- .../companionObjectInsideInlineClass.kt | 1 - .../companionObjectInsideInlineClass.txt | 4 +- .../computablePropertiesInsideInlineClass.kt | 1 - .../computablePropertiesInsideInlineClass.txt | 4 +- .../constructorsWithDefaultParameterValues.kt | 1 - ...constructorsWithDefaultParameterValues.txt | 4 +- .../inlineClassMembersVisibility.kt | 1 - .../inlineClassMembersVisibility.txt | 4 +- .../inlineClassTypeParametersInConstructor.kt | 1 - ...inlineClassTypeParametersInConstructor.txt | 4 +- ...nlineClassWithInlineClassUnderlyingType.kt | 1 - ...lineClassWithInlineClassUnderlyingType.txt | 8 +- .../inlineClassWithManyKindsOfMembers.kt | 1 - .../inlineClassWithManyKindsOfMembers.txt | 2 +- .../noBridgesForErasedInlineClass.kt | 1 - .../noBridgesForErasedInlineClass.txt | 4 +- .../inlineClasses/nullabilityInExpansion.kt | 1 - .../inlineClasses/nullabilityInExpansion.txt | 80 +++++++++---------- .../primaryValsWithDifferentVisibilities.kt | 1 - .../primaryValsWithDifferentVisibilities.txt | 16 ++-- ...edApiAnnotationOnInlineClassConstructor.kt | 2 +- ...dApiAnnotationOnInlineClassConstructor.txt | 4 +- .../shapeOfInlineClassWithPrimitive.kt | 1 - .../shapeOfInlineClassWithPrimitive.txt | 4 +- 26 files changed, 72 insertions(+), 152 deletions(-) delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt index 0ec01888d27..aa671a93a55 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt @@ -58,12 +58,12 @@ public final class Z { public synthetic final static method box-impl(p0: int): Z public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt deleted file mode 100644 index ca4bb71a2a3..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt +++ /dev/null @@ -1,69 +0,0 @@ -@java.lang.annotation.Retention -@kotlin.Metadata -public annotation class Ann - -@kotlin.Metadata -public final class Sealed$Derived { - inner class Sealed$Derived - private method (p0: int): void - public synthetic @Ann method (p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void -} - -@kotlin.Metadata -public final class Sealed$Inner { - synthetic final field this$0: Sealed - private final field z2: int - inner class Sealed$Inner - public synthetic @Ann method (p0: Sealed, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void - private method (p0: Sealed, p1: int, p2: int, p3: java.lang.String): void - public final method getZ2-a_XrcN0(): int -} - -@kotlin.Metadata -public abstract class Sealed { - private final field z: int - inner class Sealed$Derived - inner class Sealed$Inner - private @Ann method (@Ann p0: int): void - public synthetic method (p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void - public final method getZ-a_XrcN0(): int -} - -@kotlin.Metadata -public final class Test$Inner { - synthetic final field this$0: Test - private final field z2: int - inner class Test$Inner - public synthetic @Ann method (p0: Test, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void - private method (p0: Test, p1: int, p2: int, p3: java.lang.String): void - public final method getZ2-a_XrcN0(): int -} - -@kotlin.Metadata -public final class Test { - private final field z: int - inner class Test$Inner - public synthetic @Ann method (@Ann p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void - private method (p0: int): void - public synthetic @Ann method (p0: int, @Ann p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - private @Ann method (p0: int, @Ann p1: java.lang.String): void - private method (p0: int, p1: int): void - public final method getZ-a_XrcN0(): int -} - -@kotlin.Metadata -public final class Z { - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): Z - public static method constructor-impl(p0: int): int - public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public @org.jetbrains.annotations.NotNull method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.kt index f3494aa2063..5f482095528 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Foo(val x: Int) { companion object { diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt index 4910bcc251b..b32dad7436b 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt @@ -17,13 +17,13 @@ public final class Foo { public synthetic final static method box-impl(p0: int): Foo public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public final static method inInlineClass-impl(p0: int): void public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt index b7eea9a594f..dafa4616f9a 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Foo(val x: Int) { val prop: Int get() = 1 diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt index 2cb7cddaa26..85e1922c3eb 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt @@ -5,7 +5,7 @@ public final class Foo { public synthetic final static method box-impl(p0: int): Foo public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final static method getAsThis-qUNOhfQ(p0: int): int public final static method getProp-impl(p0: int): int @@ -13,6 +13,6 @@ public final class Foo { public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt index 79266470154..13de329d234 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Test(val x: Int = 0) { constructor(a: Int, b: Int, c: Int = 42) : this(a + b + c) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.txt index 772aa0ebd5b..63d79469c72 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.txt @@ -8,12 +8,12 @@ public final class Test { public static method constructor-impl(p0: int): int public static method constructor-impl(p0: int, p1: int, p2: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.kt index 5598c90c661..8e29c2d58cc 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Z(val x: Int) { constructor(x: Long) : this(x.toInt()) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.txt index bc1d9c18565..6ad5a308bf7 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.txt @@ -8,7 +8,7 @@ public final class Z { public static method constructor-impl(p0: long): int private static method constructor-impl(p0: short): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final static method getInternalExtensionVal-impl$test_module(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): int public final static method getInternalExtensionVar-impl$test_module(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String): int @@ -38,6 +38,6 @@ public final class Z { public final static method setPublicExtensionVar-impl(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String, p2: int): void public final static method setPublicVar-impl(p0: int, p1: int): void public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt index e52a50b03c5..c8f0b7ffcba 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Z(val x: Int) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt index 39c761f09b8..3ee71774316 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt @@ -71,12 +71,12 @@ public final class Z { public synthetic final static method box-impl(p0: int): Z public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.kt index 215da088483..ac8d12e9f93 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Z1(val x: Int) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.txt index 0f733d221b0..60051360e83 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.txt @@ -5,13 +5,13 @@ public final class Z1 { public synthetic final static method box-impl(p0: int): Z1 public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -24,7 +24,7 @@ public final class Z2 { public synthetic final static method box-impl(p0: int): Z2 public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final static method foo-E2ud15U(p0: int, p1: int): void public final static method foo-cYvoCnY(p0: int, p1: int): void @@ -33,6 +33,6 @@ public final class Z2 { public static method hashCode-impl(p0: int): int public final static method qux-dqwzy2Y(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt index b7aff75a4d5..4122d2f2a58 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses +UseGetterNameForPropertyAnnotationsMethodOnJvm -// IGNORE_BACKEND: JVM_IR interface IFoo { fun overridingFun() diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.txt index c4ac55d422d..5e44162d255 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.txt @@ -53,7 +53,7 @@ public final class Z { public static method constructor-impl(p0: int): int public static method constructor-impl(p0: long): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public synthetic deprecated static @A method getNonOverridingExtVal$annotations(p0: java.lang.String): void public final static @AGet method getNonOverridingExtVal-impl(p0: int, @AReceiver @org.jetbrains.annotations.NotNull p1: java.lang.String): int diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt index 4965c36f0b4..7d665432f24 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR interface A { fun foo(a: T) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt index 49a59b481e8..c2449df7be1 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt @@ -10,7 +10,7 @@ public final class Foo { public synthetic final static method box-impl(p0: long): Foo public static method constructor-impl(p0: long): long public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: long, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: long, p1: java.lang.Object): boolean public final static method equals-impl0(p0: long, p1: long): boolean public synthetic bridge method foo(p0: java.lang.Object): void public method foo-GWb7d6U(p0: long): void @@ -19,6 +19,6 @@ public final class Foo { public method hashCode(): int public static method hashCode-impl(p0: long): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: long): java.lang.String + public static method toString-impl(p0: long): java.lang.String public synthetic final method unbox-impl(): long } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt index 1956c578aca..0b8676305fe 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Z1(val x: Int) inline class Z2(val z: Z1) diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt index c221547aab0..5b4b5866caf 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt @@ -25,13 +25,13 @@ public final class Q1 { public synthetic final static method box-impl(p0: java.lang.Integer): Q1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): java.lang.Integer public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.Integer, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: java.lang.Integer, @org.jetbrains.annotations.Nullable p1: java.lang.Integer): boolean + public static method equals-impl(p0: java.lang.Integer, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Integer, p1: java.lang.Integer): boolean public final @org.jetbrains.annotations.Nullable method getX(): java.lang.Integer public method hashCode(): int public static method hashCode-impl(p0: java.lang.Integer): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.Integer): java.lang.String + public static method toString-impl(p0: java.lang.Integer): java.lang.String public synthetic final method unbox-impl(): java.lang.Integer } @@ -42,13 +42,13 @@ public final class Q2 { public synthetic final static method box-impl(p0: java.lang.Integer): Q2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Integer): java.lang.Integer public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.Integer, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.Integer, @org.jetbrains.annotations.NotNull p1: java.lang.Integer): boolean + public static method equals-impl(p0: java.lang.Integer, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Integer, p1: java.lang.Integer): boolean public final @org.jetbrains.annotations.NotNull method getZ-uJ4aT08(): java.lang.Integer public method hashCode(): int public static method hashCode-impl(p0: java.lang.Integer): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.Integer): java.lang.String + public static method toString-impl(p0: java.lang.Integer): java.lang.String public synthetic final method unbox-impl(): java.lang.Integer } @@ -59,13 +59,13 @@ public final class QN { public synthetic final static method box-impl(p0: Q1): QN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: Q1): Q1 public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: Q1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: Q1, @org.jetbrains.annotations.Nullable p1: Q1): boolean + public static method equals-impl(p0: Q1, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: Q1, p1: Q1): boolean public final @org.jetbrains.annotations.Nullable method getZ-IdL00bE(): Q1 public method hashCode(): int public static method hashCode-impl(p0: Q1): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: Q1): java.lang.String + public static method toString-impl(p0: Q1): java.lang.String public synthetic final method unbox-impl(): Q1 } @@ -76,13 +76,13 @@ public final class S1 { public synthetic final static method box-impl(p0: java.lang.String): S1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -93,13 +93,13 @@ public final class S2 { public synthetic final static method box-impl(p0: java.lang.String): S2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.NotNull method getZ-wzxQ6yE(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -110,13 +110,13 @@ public final class SN { public synthetic final static method box-impl(p0: java.lang.String): SN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.Nullable method getZ-SV6Y4Kg(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -127,13 +127,13 @@ public final class SN2 { public synthetic final static method box-impl(p0: java.lang.String): SN2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.NotNull method getZ-Pxht5ho(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -144,13 +144,13 @@ public final class W1 { public synthetic final static method box-impl(p0: java.lang.String): W1 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.Nullable method getX(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -161,13 +161,13 @@ public final class W2 { public synthetic final static method box-impl(p0: java.lang.String): W2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean + public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean public final @org.jetbrains.annotations.NotNull method getZ--xsS6hc(): java.lang.String public method hashCode(): int public static method hashCode-impl(p0: java.lang.String): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: java.lang.String): java.lang.String + public static method toString-impl(p0: java.lang.String): java.lang.String public synthetic final method unbox-impl(): java.lang.String } @@ -178,13 +178,13 @@ public final class WN { public synthetic final static method box-impl(p0: W1): WN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: W1): W1 public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: W1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: W1, @org.jetbrains.annotations.Nullable p1: W1): boolean + public static method equals-impl(p0: W1, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: W1, p1: W1): boolean public final @org.jetbrains.annotations.Nullable method getZ-cmZamLk(): W1 public method hashCode(): int public static method hashCode-impl(p0: W1): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: W1): java.lang.String + public static method toString-impl(p0: W1): java.lang.String public synthetic final method unbox-impl(): W1 } @@ -195,13 +195,13 @@ public final class Z1 { public synthetic final static method box-impl(p0: int): Z1 public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getX(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -212,13 +212,13 @@ public final class Z2 { public synthetic final static method box-impl(p0: int): Z2 public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getZ-dqwzy2Y(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -229,13 +229,13 @@ public final class ZN { public synthetic final static method box-impl(p0: Z1): ZN public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: Z1): Z1 public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: Z1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.Nullable p0: Z1, @org.jetbrains.annotations.Nullable p1: Z1): boolean + public static method equals-impl(p0: Z1, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: Z1, p1: Z1): boolean public final @org.jetbrains.annotations.Nullable method getZ-YA4JQTA(): Z1 public method hashCode(): int public static method hashCode-impl(p0: Z1): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: Z1): java.lang.String + public static method toString-impl(p0: Z1): java.lang.String public synthetic final method unbox-impl(): Z1 } @@ -246,12 +246,12 @@ public final class ZN2 { public synthetic final static method box-impl(p0: Z1): ZN2 public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: Z1): Z1 public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: Z1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: Z1, @org.jetbrains.annotations.NotNull p1: Z1): boolean + public static method equals-impl(p0: Z1, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: Z1, p1: Z1): boolean public final @org.jetbrains.annotations.NotNull method getZ-2cpqqSA(): Z1 public method hashCode(): int public static method hashCode-impl(p0: Z1): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: Z1): java.lang.String + public static method toString-impl(p0: Z1): java.lang.String public synthetic final method unbox-impl(): Z1 } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.kt index 90200c312b3..0f39b5e41fa 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR interface IValue { val value: Int diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.txt index dd727741f07..87c2323a8bb 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.txt @@ -10,12 +10,12 @@ public final class TestInternal { public synthetic final static method box-impl(p0: int): TestInternal public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -26,13 +26,13 @@ public final class TestOverriding { public synthetic final static method box-impl(p0: int): TestOverriding public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public method getValue(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -43,12 +43,12 @@ public final class TestPrivate { public synthetic final static method box-impl(p0: int): TestPrivate public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } @@ -59,12 +59,12 @@ public final class TestPublic { public synthetic final static method box-impl(p0: int): TestPublic public static method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getValue(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.kt index c4b954eb558..8b0e82d5156 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM @Suppress("NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS") inline class Z @PublishedApi internal constructor(val value: Int) \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.txt index 925dfab2454..a0d3b1d1b43 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.txt @@ -5,12 +5,12 @@ public final class Z { public synthetic final static method box-impl(p0: int): Z public static @kotlin.PublishedApi method constructor-impl(p0: int): int public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: int, p1: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int): boolean public final method getValue(): int public method hashCode(): int public static method hashCode-impl(p0: int): int public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int): java.lang.String + public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.kt index d899ad355d6..815b0cec570 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.kt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Foo(val l: Long) { fun empty() {} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt index 1cab5213655..bfdbf152c15 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt @@ -6,7 +6,7 @@ public final class Foo { public static method constructor-impl(p0: long): long public final static method empty-impl(p0: long): void public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: long, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean + public static method equals-impl(p0: long, p1: java.lang.Object): boolean public final static method equals-impl0(p0: long, p1: long): boolean public final static method extension-impl(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public final method getL(): long @@ -14,6 +14,6 @@ public final class Foo { public static method hashCode-impl(p0: long): int public final static method param-impl(p0: long, p1: double): void public method toString(): java.lang.String - public static @org.jetbrains.annotations.NotNull method toString-impl(p0: long): java.lang.String + public static method toString-impl(p0: long): java.lang.String public synthetic final method unbox-impl(): long }