From 2a4681b91db2e04c68333194ce1d63c1f5c7696c Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Thu, 24 Aug 2023 17:47:21 +0200 Subject: [PATCH] Adjust diagnostic tests for proper K1/N stdlib ^KT-58240 --- .../diagnostics/nativeTests/identifiers.txt | 1 - .../diagnostics/nativeTests/objCName.txt | 2 +- .../nativeTests/objCRefinement.txt | 2 - .../diagnostics/nativeTests/throws.txt | 50 +++++++++++++++++++ .../nativeTests/topLevelSingleton.txt | 5 -- 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/compiler/testData/diagnostics/nativeTests/identifiers.txt b/compiler/testData/diagnostics/nativeTests/identifiers.txt index 4f096ac6cc4..523ba0c9c51 100644 --- a/compiler/testData/diagnostics/nativeTests/identifiers.txt +++ b/compiler/testData/diagnostics/nativeTests/identifiers.txt @@ -43,7 +43,6 @@ package totally { private constructor `Check>Enum>Entry`() @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: totally.normal.pkg.`Check>Enum>Entry`): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/nativeTests/objCName.txt b/compiler/testData/diagnostics/nativeTests/objCName.txt index 0a6eb4da527..d722426b5dc 100644 --- a/compiler/testData/diagnostics/nativeTests/objCName.txt +++ b/compiler/testData/diagnostics/nativeTests/objCName.txt @@ -49,7 +49,6 @@ public open class Derived2 : Derived { private constructor EnumExactChecks() @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumExactChecks): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -169,3 +168,4 @@ package kotlin { } } } + diff --git a/compiler/testData/diagnostics/nativeTests/objCRefinement.txt b/compiler/testData/diagnostics/nativeTests/objCRefinement.txt index 7aa6e7995f0..7be019167f3 100644 --- a/compiler/testData/diagnostics/nativeTests/objCRefinement.txt +++ b/compiler/testData/diagnostics/nativeTests/objCRefinement.txt @@ -133,7 +133,6 @@ internal final class InternalInheritsFromNested : OuterHidden.Nested.Nested { private constructor MyHiddenEnum() @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyHiddenEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -155,7 +154,6 @@ internal final class InternalInheritsFromNested : OuterHidden.Nested.Nested { private constructor MyHiddenNonTrivialEnum() @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyHiddenNonTrivialEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/nativeTests/throws.txt b/compiler/testData/diagnostics/nativeTests/throws.txt index c3679369f3b..41b0bf13e26 100644 --- a/compiler/testData/diagnostics/nativeTests/throws.txt +++ b/compiler/testData/diagnostics/nativeTests/throws.txt @@ -106,8 +106,15 @@ public final class Exception1 : kotlin.Throwable { public constructor Exception1() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -115,8 +122,15 @@ public final class Exception2 : kotlin.Throwable { public constructor Exception2() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -124,8 +138,15 @@ public final class Exception3 : kotlin.Throwable { public constructor Exception3() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -441,8 +462,15 @@ package kotlin { public constructor Exception() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -450,8 +478,15 @@ package kotlin { public constructor IllegalStateException() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -459,8 +494,15 @@ package kotlin { public constructor RuntimeException() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -480,8 +522,15 @@ package kotlin { public constructor CancellationException() public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable? public open override /*1*/ /*fake_override*/ val message: kotlin.String? + @get:kotlin.native.internal.ExportForCppRuntime(name = "Kotlin_Throwable_getStackTrace") invisible_fake final override /*1*/ /*fake_override*/ val stackTrace: kotlin.native.internal.NativePtrArray + invisible_fake final override /*1*/ /*fake_override*/ val stackTraceStrings: kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ var suppressedExceptionsList: kotlin.collections.MutableList? + invisible_fake final override /*1*/ /*fake_override*/ fun dumpStackTrace(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + @kotlin.experimental.ExperimentalNativeApi public final override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array + invisible_fake final override /*1*/ /*fake_override*/ fun getStackTraceAddressesInternal(): kotlin.collections.List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public final override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } @@ -491,3 +540,4 @@ package kotlin { @kotlin.Deprecated(message = "") public typealias Throws = kotlin.Throws } } + diff --git a/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt b/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt index f153c91b88e..b4d8b6c1cdf 100644 --- a/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt +++ b/compiler/testData/diagnostics/nativeTests/topLevelSingleton.txt @@ -47,7 +47,6 @@ public final class Bar2 { @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final var rgb: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -70,7 +69,6 @@ public final enum class Color1 : kotlin.Enum { @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final var rgb: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color1): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -93,7 +91,6 @@ public final enum class Color2 : kotlin.Enum { @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int public final var rgb: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color2): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -116,7 +113,6 @@ public final enum class Color3 : kotlin.Enum { public final var field1: kotlin.Int @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color3): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -138,7 +134,6 @@ public final enum class Color4 : kotlin.Enum { private constructor Color4() @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int - protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color4): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(): kotlin.Unit