diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 4535f923af3..88f9430cf22 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -23022,7 +23022,7 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @Test diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index f2bfa4c8159..b9c3f22101a 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -23022,7 +23022,7 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @Test diff --git a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt index 9cc0422a7fe..15bbba24232 100644 --- a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt +++ b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS, JS_IR, NATIVE, WASM +// IGNORE_BACKEND: JS, JS_IR, WASM // IGNORE_BACKEND: JS_IR_ES6 // IGNORE_BACKEND_K2: JVM_IR // WASM_MUTE_REASON: IGNORED_IN_JS diff --git a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast1.kt b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast1.kt index 454e6d239c5..5e9909d39a3 100644 --- a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast1.kt +++ b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast1.kt @@ -1,8 +1,6 @@ -// IGNORE_BACKEND: WASM -// IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// IGNORE_BACKEND: JS +// See the end of KT-8135 description: The same problem appears when using delegating properties with unchecked casts inside +// Test fail reason: ClassCastException is not thrown when using delegating properties with unchecked casts inside +// IGNORE_BACKEND: NATIVE, JS, JS_IR, JS_IR_ES6, WASM import kotlin.reflect.KProperty diff --git a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt index 640cd2be504..719bff1f7ed 100644 --- a/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt +++ b/compiler/testData/codegen/box/delegatedProperty/genericDelegateUncheckedCast2.kt @@ -1,3 +1,5 @@ +// See the end of KT-8135 description: The same problem appears when using delegating properties with unchecked casts inside +// Test fail reason: ClassCastException is not thrown when using delegating properties with unchecked casts inside // IGNORE_BACKEND: WASM // IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: JVM_IR @@ -38,7 +40,7 @@ fun box(): String { val c = A().B() (del as Delegate).inner = null - asFailsWithCCE { c.prop } // does not fail in JVM, JS due KT-8135. + asFailsWithCCE { c.prop } // throws AssertionError due to KT-8135. return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt b/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt index b43e03f8169..5c4e7eb39e4 100644 --- a/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt +++ b/compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt @@ -1,8 +1,5 @@ -// IGNORE_BACKEND: WASM -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// IGNORE_BACKEND: JS -// IGNORE_BACKEND: NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // No kotlin-reflect.jar in this test // WITH_STDLIB diff --git a/compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt b/compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt index e55a91a2524..3b07b4cd0eb 100644 --- a/compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt +++ b/compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt @@ -1,8 +1,5 @@ -// IGNORE_BACKEND: WASM -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // WITH_REFLECT diff --git a/compiler/testData/codegen/box/functions/functionNtoString.kt b/compiler/testData/codegen/box/functions/functionNtoString.kt index af71ec32ba7..957c942fa18 100644 --- a/compiler/testData/codegen/box/functions/functionNtoString.kt +++ b/compiler/testData/codegen/box/functions/functionNtoString.kt @@ -1,10 +1,6 @@ // LAMBDAS: CLASS -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // WITH_REFLECT diff --git a/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt b/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt index 8105b7ed1b5..778ddf1ef81 100644 --- a/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt +++ b/compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt @@ -1,10 +1,6 @@ // LAMBDAS: CLASS -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // WITH_REFLECT diff --git a/compiler/testData/codegen/box/functions/kt1739.kt b/compiler/testData/codegen/box/functions/kt1739.kt index d17c6932402..8e43f285ceb 100644 --- a/compiler/testData/codegen/box/functions/kt1739.kt +++ b/compiler/testData/codegen/box/functions/kt1739.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR public class RunnableFunctionWrapper(val f : () -> Unit) : Runnable { public override fun run() { diff --git a/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt b/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt index 1331093e0b6..e8e6f79ca13 100644 --- a/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt +++ b/compiler/testData/codegen/box/functions/localFunctions/kt4777.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR var result = "Fail" diff --git a/compiler/testData/codegen/box/inference/overrideDefaultMethod.kt b/compiler/testData/codegen/box/inference/overrideDefaultMethod.kt index 5ad2fab8c60..0a32472b49f 100644 --- a/compiler/testData/codegen/box/inference/overrideDefaultMethod.kt +++ b/compiler/testData/codegen/box/inference/overrideDefaultMethod.kt @@ -1,7 +1,6 @@ // TARGET_BACKEND: JS -// Ignore these backangd because they don't support overriding and calling interface methods with default arguments -// IGNORE_BACKEND: JVM, WASM, NATIVE +// Don't test other backends because they don't support overriding and calling interface methods with default arguments // MODULE: InterfaceModule // FILE: MyInterface.kt diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt index f9db79a4bd7..de923c905cc 100644 --- a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt +++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToString.kt @@ -1,6 +1,3 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6, NATIVE // WITH_REFLECT // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS @@ -16,14 +13,14 @@ fun box(): String { val b = Z("b") val equals = Z::equals - assertTrue(equals.call(a, a)) - assertFalse(equals.call(a, b)) + assertTrue(equals.invoke(a, a)) + assertFalse(equals.invoke(a, b)) val hashCode = Z::hashCode - assertEquals(a.s.hashCode(), hashCode.call(a)) + assertEquals(a.s.hashCode(), hashCode.invoke(a)) val toString = Z::toString - assertEquals("Z(s=${a.s})", toString.call(a)) + assertEquals("Z(s=${a.s})", toString.invoke(a)) return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToStringGeneric.kt b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToStringGeneric.kt index f36317e6d66..ea4e82681e9 100644 --- a/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToStringGeneric.kt +++ b/compiler/testData/codegen/box/inlineClasses/callableReferences/equalsHashCodeToStringGeneric.kt @@ -1,6 +1,3 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6, NATIVE // WITH_REFLECT // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS @@ -16,14 +13,14 @@ fun box(): String { val b = Z("b") val equals = Z::equals - assertTrue(equals.call(a, a)) - assertFalse(equals.call(a, b)) + assertTrue(equals.invoke(a, a)) + assertFalse(equals.invoke(a, b)) val hashCode = Z::hashCode - assertEquals(a.s.hashCode(), hashCode.call(a)) + assertEquals(a.s.hashCode(), hashCode.invoke(a)) val toString = Z::toString - assertEquals("Z(s=${a.s})", toString.call(a)) + assertEquals("Z(s=${a.s})", toString.invoke(a)) return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/inlineClasses/kt27113.kt b/compiler/testData/codegen/box/inlineClasses/kt27113.kt index 7f7e9b4a734..5e69b0a5b4e 100644 --- a/compiler/testData/codegen/box/inlineClasses/kt27113.kt +++ b/compiler/testData/codegen/box/inlineClasses/kt27113.kt @@ -1,7 +1,3 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS, JS_IR, NATIVE -// IGNORE_BACKEND: JS_IR_ES6 // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS // LANGUAGE: +ValueClasses @@ -11,14 +7,16 @@ class CharacterLiteral(private val prefix: NamelessString, private val s: Namele } OPTIONAL_JVM_INLINE_ANNOTATION -value class NamelessString(val b: ByteArray) { - override fun toString(): String = String(b) +value class NamelessString(val b: CharArray) { + override fun toString(): String = b.concatToString() } fun box(): String { - val ns1 = NamelessString("abc".toByteArray()) - val ns2 = NamelessString("def".toByteArray()) + val abcCharArray = "abc".toCharArray() + if (abcCharArray.toString() == "abc") return "Prerequisite failed: value of abcCharArray.toString() is intended to be not equal to 'abc'" + val ns1 = NamelessString(abcCharArray) + val ns2 = NamelessString("def".toCharArray()) val cl = CharacterLiteral(ns1, ns2) - if (cl.toString() != "abc'def'") return throw AssertionError(cl.toString()) + if (cl.toString() != "abc'def'") return cl.toString() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt b/compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt index fbd72413e41..bda6b891d8a 100644 --- a/compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt +++ b/compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt @@ -1,8 +1,8 @@ // WITH_STDLIB -// IGNORE_BACKEND: JS, JS_IR, JS_IR_ES6, WASM, NATIVE // TODO: Fir2Ir generates overrides as finals. +// WORKS_WHEN_VALUE_CLASS -@JvmInline +OPTIONAL_JVM_INLINE_ANNOTATION value class Inlined(val value: Int) sealed interface A { diff --git a/compiler/testData/codegen/box/inlineClasses/result.kt b/compiler/testData/codegen/box/inlineClasses/result.kt index cb19d2da147..6c6b1433726 100644 --- a/compiler/testData/codegen/box/inlineClasses/result.kt +++ b/compiler/testData/codegen/box/inlineClasses/result.kt @@ -1,6 +1,20 @@ +// In this test, stdlib class `public value class Result` within `kotlin` package is replaced with a custom non-generic class + +// NATIVE exception: java.util.NoSuchElementException: Collection contains no element matching the predicate +// during `KonanSymbols.kotlinResultGetOrThrow`, since function `Result.getOrThrow()` within `kotlin` package cannot be found during builtins construction, +// since unbound class `Result` is expected, but deserialized one found. +// DONT_TARGET_EXACT_BACKEND: NATIVE + +// WASM exception: +// There are still 4 unbound symbols after generation of IR module
: +// Unbound public symbol IrClassPublicSymbolImpl: kotlin/Result.Companion|null[0] +// Unbound public symbol IrClassPublicSymbolImpl: kotlin/Result.Failure|null[0] +// Unbound public symbol IrSimpleFunctionPublicSymbolImpl: kotlin/Result.Companion.success|8035950532576827725[0] +// Unbound public symbol IrSimpleFunctionPublicSymbolImpl: kotlin/Result.Failure.exception.|-7777496992132965566[0] +// This could happen if there are two libraries, where one library was compiled against the different version of the other library than the one currently used in the project. Please check that the project configuration is correct and has consistent versions of dependencies. // IGNORE_BACKEND: WASM // IGNORE_BACKEND: ANDROID -// IGNORE_BACKEND: NATIVE + // ALLOW_KOTLIN_PACKAGE // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS diff --git a/compiler/testData/codegen/box/inlineClasses/resultGeneric.kt b/compiler/testData/codegen/box/inlineClasses/resultGeneric.kt index 673b358bfbb..6ead33d643a 100644 --- a/compiler/testData/codegen/box/inlineClasses/resultGeneric.kt +++ b/compiler/testData/codegen/box/inlineClasses/resultGeneric.kt @@ -1,6 +1,9 @@ +// NATIVE and WASM failure reasons see in `result.kt` +// JS_IR error:
@ /box.kt:24:12: Constructor 'Result.' can not be called: No constructor found for symbol 'kotlin/Result.|-8731461708390519279[0]' +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: WASM, JS_IR, JS_IR_ES6 // IGNORE_BACKEND: ANDROID -// IGNORE_BACKEND: NATIVE + // ALLOW_KOTLIN_PACKAGE // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS diff --git a/compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt b/compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt index 9de08b02a3f..49e3dd4531d 100644 --- a/compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt +++ b/compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt @@ -1,6 +1,8 @@ +// NATIVE, WASM, JS_IR errors are same as for `resultGeneric.kt` +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: WASM, JS_IR, JS_IR_ES6 // IGNORE_BACKEND: ANDROID -// IGNORE_BACKEND: NATIVE + // ALLOW_KOTLIN_PACKAGE // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS diff --git a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt index 5ee1e8c4843..e924e1e9ea0 100644 --- a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt +++ b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt @@ -1,7 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS, JS_IR, NATIVE, JVM -// IGNORE_BACKEND: JS_IR_ES6 +// JVM runtime exception: java.lang.ClassCastException: kotlin.Unit cannot be cast to Foo +// IGNORE_BACKEND: JVM // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS // LANGUAGE: +ValueClasses, +ValueClassesSecondaryConstructorWithBody @@ -9,7 +7,7 @@ OPTIONAL_JVM_INLINE_ANNOTATION value class Foo(val x: String) { constructor(y: Int) : this("OK") { - if (y == 0) return throw java.lang.IllegalArgumentException() + if (y == 0) throw IllegalArgumentException() if (y == 1) return return Unit } diff --git a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructorGeneric.kt b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructorGeneric.kt index 1001b4449c4..9e33174dc33 100644 --- a/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructorGeneric.kt +++ b/compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructorGeneric.kt @@ -1,7 +1,6 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS, JS_IR, NATIVE, JVM -// IGNORE_BACKEND: JS_IR_ES6 +// JVM backend throws runtime exception: java.lang.ClassCastException: kotlin.Unit cannot be cast to Foo +// IGNORE_BACKEND: JVM +// IGNORE_LIGHT_ANALYSIS // WITH_STDLIB // WORKS_WHEN_VALUE_CLASS // LANGUAGE: +ValueClasses, +GenericInlineClassParameter, +ValueClassesSecondaryConstructorWithBody @@ -9,7 +8,7 @@ OPTIONAL_JVM_INLINE_ANNOTATION value class Foo(val x: T) { constructor(y: Int) : this("OK" as T) { - if (y == 0) return throw java.lang.IllegalArgumentException() + if (y == 0) throw IllegalArgumentException() if (y == 1) return return Unit } diff --git a/compiler/testData/codegen/box/intrinsics/throwable.kt b/compiler/testData/codegen/box/intrinsics/throwable.kt index 8f6a931030f..dbbaef67f5a 100644 --- a/compiler/testData/codegen/box/intrinsics/throwable.kt +++ b/compiler/testData/codegen/box/intrinsics/throwable.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR fun box(): String { val s: String? = "OK" diff --git a/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt b/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt index dde94a75842..e922c658ee7 100644 --- a/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt +++ b/compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR import kotlin.reflect.KFunction2 import kotlin.reflect.KFunction1 diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt index 131b358b617..7b2054a39d6 100644 --- a/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt +++ b/compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt @@ -1,11 +1,14 @@ +// https://youtrack.jetbrains.com/issue/KT-42020/Psi2ir-IllegalStateException-IrSimpleFunctionPublicSymbolImpl-for-public-...-is-already-bound-on-generic-function-whose // IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: SERIALIZATION_REGRESSION -// IGNORE_BACKEND: JS -// IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR_ES6 -// IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND_K2: JVM_IR +// IGNORE_BACKEND_K1: NATIVE, JS_IR + +// https://youtrack.jetbrains.com/issue/KT-59279/Psi2Ir-FIR2IR-Signature-clash-leads-to-wrong-method-resolve +// IGNORE_BACKEND: JS +// IGNORE_BACKEND_K2: NATIVE, JS_IR + // FIR status: validation failed. TODO decide if we want to fix KT-42020 for FIR as well +// IGNORE_BACKEND_K2: JVM_IR // MODULE: lib // FILE: lib.kt @@ -22,8 +25,10 @@ class Derived : Base() fun box(): String { val d = Derived() - if (d.foo(p1 = "42") != "p1:42") return "FAIL1" - if (d.foo(p2 = "24") != "p2:24") return "FAIL2" + val foo42 = d.foo(p1 = "42") + if (foo42 != "p1:42") return "FAIL1: foo42=$foo42" + val foo24 = d.foo(p2 = "24") + if (foo24 != "p2:24") return "FAIL2: foo24=$foo24" return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt index e0eee266046..9f7bec89704 100644 --- a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt +++ b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt @@ -1,11 +1,13 @@ // IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: SERIALIZATION_REGRESSION +// WASM_MUTE_REASON: SERIALIZATION_REGRESSION: Conflicting overloads: public fun foo(): String defined in pkg in file lib1.kt, public fun foo(): String defined in pkg in file main.kt (6,1) // EXPECTED_REACHABLE_NODES: 1304 +// JS_IR error: Cross module dependency resolution failed due to signature 'pkg/foo|-1041209573719867811[0]' redefinition // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR_ES6 -// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: ANDROID -// IGNORE_LIGHT_ANALYSIS +// NATIVE error caused by `foo()` clash: kotlin.AssertionError: Test failed with: 42K. Expected , actual <42K>. +// DONT_TARGET_EXACT_BACKEND: NATIVE + // MODULE: lib1 // FILE: lib1.kt package pkg diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 1a63d8be04c..85801d7343a 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -21960,7 +21960,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @Test diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 3ec6e8a4c01..3750bd332f6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -23022,7 +23022,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @Test diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index fba32f881b0..55e0f477fb7 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -23022,7 +23022,7 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @Test diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 934d4fd2649..2b2c04de0ad 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -19199,7 +19199,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } @TestMetadata("overridingFunCallingPrivateFun.kt") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index e0084754732..0ef35fa51c2 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -11079,12 +11079,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -11211,12 +11205,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -14063,18 +14051,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -14111,12 +14087,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -14564,12 +14534,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17208,7 +17172,7 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } @Test @@ -20949,18 +20913,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 99ebe61c35a..cb70179671f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -11079,12 +11079,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -11211,12 +11205,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -14063,18 +14051,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -14111,12 +14087,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -14564,12 +14534,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17208,7 +17172,7 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } @Test @@ -20949,18 +20913,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 4f93a95b6b6..ae2b666f0fb 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -11079,12 +11079,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -11211,12 +11205,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -14063,18 +14051,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -14111,12 +14087,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -14564,12 +14534,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17208,7 +17172,7 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } @Test @@ -20949,18 +20913,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index b97a4d3f99b..94fcbc91e3b 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -12104,12 +12104,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -12236,12 +12230,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -15211,18 +15199,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -15259,12 +15235,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -15724,12 +15694,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17068,6 +17032,7 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFunGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/passInlineClassAsVararg.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -17085,9 +17050,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClass.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClassGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/result.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBound.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBoundGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19046,6 +19008,7 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); } @@ -19168,27 +19131,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt"); } - @Test - @TestMetadata("result.kt") - public void testResult() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/result.kt"); - } - - @Test - @TestMetadata("resultGeneric.kt") - public void testResultGeneric() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt"); - } - - @Test - @TestMetadata("resultGeneric2.kt") - public void testResultGeneric2() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt"); - } - @Test @TestMetadata("resultInlining.kt") public void testResultInlining() throws Exception { @@ -23766,18 +23708,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { @@ -24432,12 +24362,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt"); } - @Test - @TestMetadata("transitiveClash.kt") - public void testTransitiveClash() throws Exception { - runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); - } - @Test @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 36a50dcb661..ee870583b7f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -12382,12 +12382,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -12514,12 +12508,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -15571,18 +15559,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -15619,12 +15595,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -16092,12 +16062,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17448,6 +17412,7 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFunGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/passInlineClassAsVararg.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -17465,9 +17430,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClass.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClassGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/result.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBound.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBoundGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19426,6 +19388,7 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); } @@ -19548,27 +19511,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt"); } - @Test - @TestMetadata("result.kt") - public void testResult() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/result.kt"); - } - - @Test - @TestMetadata("resultGeneric.kt") - public void testResultGeneric() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt"); - } - - @Test - @TestMetadata("resultGeneric2.kt") - public void testResultGeneric2() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt"); - } - @Test @TestMetadata("resultInlining.kt") public void testResultInlining() throws Exception { @@ -24206,18 +24148,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { @@ -24910,12 +24840,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt"); } - @Test - @TestMetadata("transitiveClash.kt") - public void testTransitiveClash() throws Exception { - runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); - } - @Test @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index 40db4669f2f..83a15838406 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -11966,12 +11966,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -12098,12 +12092,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -15032,18 +15020,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -15080,12 +15056,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -15541,12 +15511,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -16879,6 +16843,7 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFunGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/passInlineClassAsVararg.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -16896,9 +16861,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClass.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClassGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/result.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBound.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBoundGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -18857,6 +18819,7 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); } @@ -18979,27 +18942,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt"); } - @Test - @TestMetadata("result.kt") - public void testResult() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/result.kt"); - } - - @Test - @TestMetadata("resultGeneric.kt") - public void testResultGeneric() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt"); - } - - @Test - @TestMetadata("resultGeneric2.kt") - public void testResultGeneric2() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt"); - } - @Test @TestMetadata("resultInlining.kt") public void testResultInlining() throws Exception { @@ -23547,18 +23489,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { @@ -24194,12 +24124,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt"); } - @Test - @TestMetadata("transitiveClash.kt") - public void testTransitiveClash() throws Exception { - runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); - } - @Test @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index 90493ecfb4f..37a7738c82f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -12105,12 +12105,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @Test - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @Test @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { @@ -12237,12 +12231,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @Test - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @Test @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { @@ -15212,18 +15200,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @Test - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @Test - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { @@ -15260,12 +15236,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @Test - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @Test @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { @@ -15725,12 +15695,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @Test - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @Test @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { @@ -17069,6 +17033,7 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/nullableWrapperEqualityGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFunGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/passInlineClassAsVararg.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -17086,9 +17051,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClass.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/referToUnderlyingPropertyOfInlineClassGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/result.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); - register("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/resultRunCatchingOrElse.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBound.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/safeAsOfTypeParameterWithInlineClassBoundGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19047,6 +19009,7 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT @Test @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); } @@ -19169,27 +19132,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/inlineClasses/removeInInlineCollectionOfInlineClassAsInt.kt"); } - @Test - @TestMetadata("result.kt") - public void testResult() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/result.kt"); - } - - @Test - @TestMetadata("resultGeneric.kt") - public void testResultGeneric() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric.kt"); - } - - @Test - @TestMetadata("resultGeneric2.kt") - public void testResultGeneric2() throws Exception { - // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() - runTest("compiler/testData/codegen/box/inlineClasses/resultGeneric2.kt"); - } - @Test @TestMetadata("resultInlining.kt") public void testResultInlining() throws Exception { @@ -23767,18 +23709,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @Test - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @Test - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @Test @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { @@ -24433,12 +24363,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/ir/serializationRegressions/signatureClash.kt"); } - @Test - @TestMetadata("transitiveClash.kt") - public void testTransitiveClash() throws Exception { - runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); - } - @Test @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt index 8a827718f9a..ace260f96da 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt @@ -538,6 +538,7 @@ private class ExtTestDataFile( "-ProhibitAssigningSingleElementsToVarargsInNamedForm", // Prohibit these assignments "-ProhibitDataClassesOverridingCopy", // Prohibit as no longer supported "-ProhibitOperatorMod", // Prohibit as no longer supported + "-ProhibitIllegalValueParameterUsageInDefaultArguments", // Allow only legal values "-UseBuilderInferenceOnlyIfNeeded", // Run only default one "-UseCorrectExecutionOrderForVarargArguments" // Run only correct one ) diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java index 2920ec94a9a..132d3538c9b 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java @@ -9805,11 +9805,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); } - @TestMetadata("getDelegateWithoutReflection.kt") - public void testGetDelegateWithoutReflection() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/getDelegateWithoutReflection.kt"); - } - @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { runTest("compiler/testData/codegen/box/delegatedProperty/inClassVal.kt"); @@ -9915,11 +9910,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt"); } - @TestMetadata("useReflectionOnKProperty.kt") - public void testUseReflectionOnKProperty() throws Exception { - runTest("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); - } - @TestMetadata("valByMapDelegatedProperty.kt") public void testValByMapDelegatedProperty() throws Exception { runTest("compiler/testData/codegen/box/delegatedProperty/valByMapDelegatedProperty.kt"); @@ -12483,16 +12473,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); } - @TestMetadata("functionNtoString.kt") - public void testFunctionNtoString() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoString.kt"); - } - - @TestMetadata("functionNtoStringGeneric.kt") - public void testFunctionNtoStringGeneric() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); - } - @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { runTest("compiler/testData/codegen/box/functions/infixRecursiveCall.kt"); @@ -12523,11 +12503,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/functions/kt1649_2.kt"); } - @TestMetadata("kt1739.kt") - public void testKt1739() throws Exception { - runTest("compiler/testData/codegen/box/functions/kt1739.kt"); - } - @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { runTest("compiler/testData/codegen/box/functions/kt2270.kt"); @@ -12919,11 +12894,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); } - @TestMetadata("kt4777.kt") - public void testKt4777() throws Exception { - runTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); - } - @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { runTest("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt"); @@ -15199,7 +15169,7 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest @TestMetadata("overrideReturnNothing.kt") public void testOverrideReturnNothing() throws Exception { - runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt"); + runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } @TestMetadata("overridingFunCallingPrivateFun.kt") @@ -18516,16 +18486,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); } - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwable.kt"); - } - - @TestMetadata("throwableCallableReference.kt") - public void testThrowableCallableReference() throws Exception { - runTest("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt"); - } - @TestMetadata("throwableParamOrder.kt") public void testThrowableParamOrder() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/throwableParamOrder.kt");