From 34bf32866b68af79d51a0d66c78872fd018311b5 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 12 Dec 2023 16:22:05 +0200 Subject: [PATCH] [Test] Remove redundant K1 ignore directives from K2 MPP box tests Corresponding tests for K1 are no longer generated, so there is no need to ignore them anymore --- .../k2/actualInnerClassesFirMemberMapping.kt | 2 -- .../annotationsViaActualTypeAliasFromBinary.kt | 3 +-- .../deprecatedAnnotationOnlyOnActual_useInCommon.kt | 5 ++--- .../k2/annotations/expectAnnotationCallInLibrary.kt | 5 ++--- .../k2/annotations/expectClassInJvmMultifileFacade.kt | 3 +-- .../multiplatform/k2/annotations/optionalExpectation.kt | 5 ++--- ...mousObjectAndSpecificImplementationInDeserializedIr.kt | 3 --- .../k2/basic/accessToLocalClassFromBackend.kt | 6 ++---- .../k2/basic/actualFunctionWithArgumentOfExpectType.kt | 4 ++-- .../box/multiplatform/k2/basic/anyMethodInExpect.kt | 4 +--- .../k2/basic/correctParentForTypeParameter.kt | 6 ++---- .../box/multiplatform/k2/basic/enumEntryNameCall.kt | 6 ++---- .../k2/basic/expectActualCallableReference.kt | 6 ++---- .../expectActualDifferentExtensionReceiversOnOverloads.kt | 6 ++---- .../k2/basic/expectActualDifferentPackages.kt | 6 ++---- .../multiplatform/k2/basic/expectActualFakeOverrides.kt | 6 ++---- .../multiplatform/k2/basic/expectActualFakeOverrides2.kt | 6 ++---- .../multiplatform/k2/basic/expectActualFakeOverrides3.kt | 5 ++--- .../basic/expectActualFakeOverridesWithTypeParameters.kt | 6 ++---- .../basic/expectActualFakeOverridesWithTypeParameters2.kt | 4 +--- .../k2/basic/expectActualIntersectionOverride.kt | 6 ++---- .../k2/basic/expectActualIntersectionOverride2.kt | 6 ++---- .../box/multiplatform/k2/basic/expectActualMultiCommon.kt | 6 ++---- .../k2/basic/expectActualNullabilityBasedOverloads.kt | 6 ++---- .../box/multiplatform/k2/basic/expectActualOverloads.kt | 4 +--- .../box/multiplatform/k2/basic/expectActualSimple.kt | 6 ++---- .../multiplatform/k2/basic/expectActualTypeParameters.kt | 6 ++---- .../box/multiplatform/k2/basic/expectActualTypealias.kt | 6 ++---- .../k2/basic/expectActualTypealiasCoercion.kt | 3 +-- .../k2/basic/expectAndCommonFunctionOverloads.kt | 4 +--- .../multiplatform/k2/basic/expectInterfaceInSupertypes.kt | 4 +--- .../k2/basic/expectInterfaceInSupertypes2.kt | 4 +--- .../codegen/box/multiplatform/k2/basic/expectProperty.kt | 4 +--- .../k2/basic/fakeOverridesInPlatformModule.kt | 4 +--- .../k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt | 4 ++-- .../k2/basic/independentCommonSourceModules.kt | 6 ++---- ...odFromSuperTypeIsImplementedInOtherExpectSuperClass.kt | 6 ++---- .../k2/basic/intersectionOverrideInCommonModule.kt | 2 -- ...ersectionOverrideWithDefaultParameterInCommonModule.kt | 2 -- .../codegen/box/multiplatform/k2/basic/kt-51753-1.kt | 4 ++-- .../codegen/box/multiplatform/k2/basic/kt-51753-2.kt | 4 ++-- .../codegen/box/multiplatform/k2/basic/kt-56329.kt | 6 ++---- .../k2/basic/localIntersectionOverrideInCommonModule.kt | 2 -- ...ersectionOverrideWithDefaultParameterInCommonModule.kt | 2 -- .../k2/basic/localSubstitutionOverrideInCommonModule.kt | 2 -- .../box/multiplatform/k2/basic/noArgActualConstructor.kt | 3 +-- .../box/multiplatform/k2/basic/nonExternalEquals.kt | 4 +--- .../multiplatform/k2/basic/overridesOfExpectMembers.kt | 6 ++---- .../k2/basic/removeExpectDeclarationsFromMetadata.kt | 7 +++---- .../k2/basic/substitutionOverrideInCommonModule.kt | 2 -- .../k2/basic/transitiveSuperclassActualization.kt | 2 -- .../k2/basic/transitiveSuperclassActualization_java.kt | 2 -- .../codegen/box/multiplatform/k2/basic/valueClasses.kt | 4 ++-- .../k2/basic/widerVisibilityInActualClassifier.kt | 2 -- .../complexMatchings/expectCtorlessFinalToActualObject.kt | 2 -- .../expectCtorlessFinalToActualPromiseOfUnit.kt | 1 - .../complexMatchings/expectCtorlessFinalToActualUnit.kt | 2 -- .../box/multiplatform/k2/dataClassInCommonAndPlatform.kt | 3 +-- .../box/multiplatform/k2/defaultArguments/annotations.kt | 3 +-- .../k2/defaultArguments/bothInExpectAndActual.kt | 3 +-- .../k2/defaultArguments/bothInExpectAndActual2.kt | 3 +-- .../box/multiplatform/k2/defaultArguments/constructor.kt | 4 +--- .../defaultArgumentInDelegatedFunction.kt | 2 -- .../k2/defaultArguments/delegatedExpectedInterface.kt | 6 ++---- .../k2/defaultArguments/dispatchReceiverValue.kt | 8 ++------ .../defaultArguments/expectPropertyAsDefaultArgument.kt | 6 ++---- .../k2/defaultArguments/extensionReceiverValue.kt | 4 +--- .../box/multiplatform/k2/defaultArguments/function.kt | 4 +--- .../k2/defaultArguments/functionFromOtherModule.kt | 5 ++--- .../k2/defaultArguments/inheritedFromCommonClass.kt | 4 +--- .../k2/defaultArguments/inheritedFromExpectedClass.kt | 4 +--- .../k2/defaultArguments/inheritedFromExpectedInterface.kt | 4 +--- .../k2/defaultArguments/inheritedFromExpectedMethod.kt | 6 ++---- .../defaultArguments/inheritedInExpectedDeclarations.kt | 6 ++---- .../inheritedViaAnotherInterfaceIndirectly.kt | 6 ++---- .../defaultArguments/inlineFunctionWithDefaultLambda.kt | 4 +--- .../box/multiplatform/k2/defaultArguments/jvmOverloads.kt | 3 +-- .../box/multiplatform/k2/defaultArguments/kt23239.kt | 6 ++---- .../box/multiplatform/k2/defaultArguments/kt23739.kt | 4 +--- .../k2/defaultArguments/nestedEnumEntryValue.kt | 5 +---- .../k2/defaultArguments/parametersInArgumentValues.kt | 4 +--- .../box/multiplatform/k2/defaultArguments/superCall.kt | 5 ++--- .../box/multiplatform/k2/defaultArguments/suspend.kt | 4 +--- .../box/multiplatform/k2/defaultArguments/typeAlias.kt | 6 ++---- .../k2/defaultArguments/withTypeParameter.kt | 3 +-- .../box/multiplatform/k2/expectValInInlineClass.kt | 3 +-- .../box/multiplatform/k2/expectValInInlineClassJVM.kt | 3 +-- .../box/multiplatform/k2/extensionPropertiesOverloads.kt | 2 -- .../codegen/box/multiplatform/k2/internalOverride.kt | 5 +---- .../codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt | 4 +--- .../codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt | 4 +--- .../multiplatform/k2/migratedOldTests/mpp_default_args.kt | 4 +--- .../k2/migratedOldTests/remap_expect_property_ref.kt | 6 ++---- 93 files changed, 119 insertions(+), 280 deletions(-) diff --git a/compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt b/compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt index 2ad761b68ac..82a27f35267 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt expect class A { diff --git a/compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt b/compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt index 6c96f540bed..6bd7099cb96 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/annotations/annotationsViaActualTypeAliasFromBinary.kt @@ -1,6 +1,5 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K1: JVM, JVM_IR -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // WITH_REFLECT // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt b/compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt index 6cff6169e11..3fce71116af 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/annotations/deprecatedAnnotationOnlyOnActual_useInCommon.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-60523 // MODULE: common @@ -39,4 +38,4 @@ actual fun hidden(): String = "OK" fun box(): String { return common() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt b/compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt index 47550f21ecb..bbbd4139abf 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-57963 // MODULE: common @@ -79,4 +78,4 @@ fun box(): String { if (E.OK.name != "OK") return "FAIL 4" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt b/compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt index f41f3cbe2c5..244d88f5581 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/annotations/expectClassInJvmMultifileFacade.kt @@ -1,6 +1,5 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K1: JVM, JVM_IR // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt b/compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt index f6a51da33b6..92e9ede48b3 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/annotations/optionalExpectation.kt @@ -1,6 +1,5 @@ -// !LANGUAGE: +MultiPlatformProjects -// !OPT_IN: kotlin.ExperimentalMultiplatform -// IGNORE_BACKEND_K1: WASM, JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE +// LANGUAGE: +MultiPlatformProjects +// OPT_IN: kotlin.ExperimentalMultiplatform // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt b/compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt index 57d3aa3a74f..bfe209581e9 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt @@ -1,8 +1,5 @@ // LANGUAGE: +MultiPlatformProjects // WITH_STDLIB -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// JS tests don't support MPP modules compilation -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-58252 // MODULE: lib-common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt index 04dc720e977..92c5e9551e7 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -14,4 +12,4 @@ fun ok() = LocalClass.toString() // MODULE: platform()()(common) // FILE: platform.kt -fun box() = ok() \ No newline at end of file +fun box() = ok() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt index 8274cb6aec9..3f2135b9301 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/actualFunctionWithArgumentOfExpectType.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common0 // TARGET_PLATFORM: Common @@ -21,4 +21,4 @@ actual fun f0(s: S): S = s actual typealias S = String -fun box() = f0("OK") \ No newline at end of file +fun box() = f0("OK") diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt index 57abab66598..0121ef8bea6 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt index 0b4398ac922..135b544db09 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: lib // FILE: lib.kt @@ -18,4 +16,4 @@ package bar import foo.* -fun box() = transform("") { "O" } \ No newline at end of file +fun box() = transform("") { "O" } diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt index 4091a37b9bf..201ae46bb58 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -17,4 +15,4 @@ fun k() = Base2.K.name actual enum class Base2 { K } -fun box() = Base1.O.name + k() \ No newline at end of file +fun box() = Base1.O.name + k() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt index 28482d7a2c6..730740c75f4 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -19,4 +17,4 @@ actual fun ret(): R = "OK" actual typealias R = String -fun box() = foo().invoke() \ No newline at end of file +fun box() = foo().invoke() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt index d0e426e5260..fd7935a2bfb 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -19,4 +17,4 @@ actual fun Array.getChecked(index: Int) = get(index) actual fun BooleanArray.getChecked(index: Int) = get(index) -fun box() = ok() \ No newline at end of file +fun box() = ok() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt index 61577856329..a1b1507c2a8 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -51,4 +49,4 @@ actual class A { // FILE: main.kt -fun box() = if (p1.A().g()) p1.f() + p2.f() else "fail" \ No newline at end of file +fun box() = if (p1.A().g()) p1.f() + p2.f() else "fail" diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt index 7710dcad1fc..84ad68c335d 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -28,4 +26,4 @@ open class B { actual class A : B() -fun box() = test("O") \ No newline at end of file +fun box() = test("O") diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt index 401d13ee985..d62f1b790c5 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58003 // MODULE: common @@ -27,4 +25,4 @@ actual open class C1 { actual val k = "K" } -fun box() = foo(C3()) \ No newline at end of file +fun box() = foo(C3()) diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt index e9cbca8bb87..a570449f04c 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt @@ -1,5 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-57984 // MODULE: common @@ -26,4 +25,4 @@ class C : I2 { override fun ok(): String = "OK" } -fun box() = ok(C()) \ No newline at end of file +fun box() = ok(C()) diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt index 04148b5bf0a..703e34477b4 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58004 // MODULE: common @@ -29,4 +27,4 @@ actual open class A { actual val S.p: S get() = this } -fun box() = foo(B()) \ No newline at end of file +fun box() = foo(B()) diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt index dfbe9dc2eb9..cd358418391 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt index 2735e29dfa6..b7b3a4c13fd 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58124 // MODULE: common @@ -27,4 +25,4 @@ actual class C : I1, I2 { actual override fun f() = "OK" } -fun box() = test() \ No newline at end of file +fun box() = test() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt index d44bcd06173..e89737db82e 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -37,4 +35,4 @@ actual interface I1 { actual val k: String } -fun box() = f1(C()) + f2(C()) \ No newline at end of file +fun box() = f1(C()) + f2(C()) diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt index 87d3b218edd..5958caa9f80 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common0 // TARGET_PLATFORM: Common @@ -33,4 +31,4 @@ actual fun f0(): Boolean = true actual fun f1(): String = "O" actual fun f2(): String = "K" -fun box() = if (g0()) g1() + g2() else "fail" \ No newline at end of file +fun box() = if (g0()) g1() + g2() else "fail" diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt index 38136476d8f..09071e0e249 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt @@ -1,7 +1,5 @@ // IGNORE_BACKEND: JVM, JVM_IR -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -18,4 +16,4 @@ fun o(x: String) = "" actual fun o(x: String?): String? = "O" actual fun k(x: String?): String? = "K" -fun k(x: String) = "" \ No newline at end of file +fun k(x: String) = "" diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt index 8d2759224db..78138e277d1 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt index 0931f946e57..b7270977be7 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -22,4 +20,4 @@ actual fun func(): String = "O" actual var prop: String = "!" -fun box() = test() \ No newline at end of file +fun box() = test() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt index 52a18a95fb0..a362f343b76 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -25,4 +23,4 @@ actual class A { actual val D.k: D get() = this as D -fun box() = A().o(42) + k() \ No newline at end of file +fun box() = A().o(42) + k() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt index c1bad159234..a62c177f472 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -21,4 +19,4 @@ actual typealias S = String actual fun foo(): S = "OK" -fun box() = test() \ No newline at end of file +fun box() = test() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt index 7ad294a2d33..91083001623 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt @@ -1,8 +1,7 @@ // TARGET_BACKEND: JVM_IR // TARGET_BACKEND: NATIVE -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +ImplicitSignedToUnsignedIntegerConversion +// LANGUAGE: +MultiPlatformProjects +ImplicitSignedToUnsignedIntegerConversion // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt index 0e26aa539a5..4a8d42ca9af 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58896 // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt index b5e7e36ae24..04b1457ecfe 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt @@ -1,7 +1,5 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // WITH_STDLIB -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535 // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt index 6507a795058..e5f8168d5a6 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt @@ -1,8 +1,6 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // WITH_STDLIB // IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535 -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt index dd2258c19f2..2307c95f93f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt index 468637a9f81..265602a8552 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt index 4a974b2e191..520673ea8f9 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/getRidOfDoubleBindingInFir2IrLazyProperty.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // WITH_REFLECT // MODULE: common @@ -22,4 +22,4 @@ import kotlin.reflect.KType fun getAnnotations(kType: KType) = kType.annotations -fun box() = ok() \ No newline at end of file +fun box() = ok() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt index 544f0b3c377..9685eb21b9a 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common1 // TARGET_PLATFORM: Common @@ -17,4 +15,4 @@ fun k() = "K" // MODULE: platform()()(common1, common2) // FILE: platform.kt -fun box() = o() + k() \ No newline at end of file +fun box() = o() + k() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt index f0f7cdbbae1..427e2819070 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -15,4 +13,4 @@ fun box() = Base().ok() // MODULE: platform()()(common) // FILE: platform.kt -actual open class Base { actual fun ok() = "OK" } \ No newline at end of file +actual open class Base { actual fun ok() = "OK" } diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt index 6de44b7bee8..773067ed97f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-58229 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt index a426c1b867f..d4076f3297f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-60850 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt index 2f97fb6ac88..28c54c0bc66 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt @@ -1,5 +1,5 @@ // ISSUE: KT-51753 -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM_IR // WITH_STDLIB // WITH_REFLECT @@ -53,4 +53,4 @@ actual fun atomic(initial: Boolean): AtomicBoolean = AtomicBoolean(initial) // FILE: jvm/box.kt -fun box(): String = if (!topLevelDelegatedPropertyBoolean) "OK" else "FAIL (true)" \ No newline at end of file +fun box(): String = if (!topLevelDelegatedPropertyBoolean) "OK" else "FAIL (true)" diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt index c5d7336a63a..30ce8d50c3b 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-2.kt @@ -1,5 +1,5 @@ // ISSUE: KT-51753 -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM_IR // WITH_STDLIB // WITH_REFLECT @@ -49,4 +49,4 @@ actual fun atomic(initial: T): AtomicRef = AtomicRef(initial) fun box(): String { val s = topLevelDelegatedPropertyRef return if (s == "A") "OK" else "FAIL($s)" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt index 708800b0229..9baaf2d4a7a 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-56329 // MODULE: common @@ -24,4 +22,4 @@ actual fun foo(y: T) = "O" actual fun foo(y: T, x: S) = x -fun box() = ok() \ No newline at end of file +fun box() = ok() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt index fbbf4d8d125..de702fb0599 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-58229 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt index fdd75c6f884..1a96b544691 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-60850 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt index 5b4a8f5163b..b7f5e134b9f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-58229 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt index 78a7bbb2761..f79e1d9fb61 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt @@ -1,6 +1,5 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K1: JVM, JVM_IR // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt index a92268added..43bdaeea867 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt index 89ebef4081f..dee4a5a23e9 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -28,4 +26,4 @@ actual open class C1 { actual open val k = "K" } -fun box() = foo(C2()) \ No newline at end of file +fun box() = foo(C2()) diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt index 85a1d3b20bf..ccc02cd54a7 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt @@ -1,8 +1,7 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM // ISSUE: KT-57250 // WITH_STDLIB -// !OPT_IN: kotlin.ExperimentalMultiplatform -// !LANGUAGE: +MultiPlatformProjects +// OPT_IN: kotlin.ExperimentalMultiplatform +// LANGUAGE: +MultiPlatformProjects // MODULE: common // TARGET_PLATFORM: Common @@ -40,4 +39,4 @@ fun ok() = C().o() + k() // FILE: main.kt @WithActual(42) -fun box() = ok() \ No newline at end of file +fun box() = ok() diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt index e9ab364ab8b..2b0e3de6710 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-58229 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt index b1e9534ccc4..d5b77a48b47 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K1: ANY -// IGNORE_REASON: new rules for supertypes matching are implemented only in K2 // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-59356 diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt index f7e9691086e..d806bcdd2a9 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization_java.kt @@ -1,6 +1,4 @@ // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: ANY -// IGNORE_REASON: new rules for supertypes matching are implemented only in K2 // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-59356 diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt index 80af27398df..86d9a4a95cb 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/valueClasses.kt @@ -1,5 +1,5 @@ // ISSUE: KT-51969 -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM_IR // WITH_STDLIB @@ -16,4 +16,4 @@ expect value class ExpectValue(val x: String) @JvmInline actual value class ExpectValue actual constructor(actual val x: String) -fun box() = ExpectValue("OK").x \ No newline at end of file +fun box() = ExpectValue("OK").x diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt index 3dff8aa9f2f..c539a7b3fa0 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/basic/widerVisibilityInActualClassifier.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K1: ANY -// IGNORE_REASON: KT-59355 is fixed only in K2 // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-59355 diff --git a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt index 5b4d63de046..930ce404baf 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualPromiseOfUnit.kt b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualPromiseOfUnit.kt index 2eca1e42dc1..99b7e5a792b 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualPromiseOfUnit.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualPromiseOfUnit.kt @@ -1,5 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: ANY // TARGET_BACKEND: JS, JS_IR, JS_IR_ES6 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt index 976627904e7..574dcf261a9 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt b/compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt index 198df0054c9..36806faeb20 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt @@ -1,7 +1,6 @@ // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-61972 -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE + // MODULE: common // FILE: common.kt data class CommonData(val value: String) diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt index 7b1e6399500..305476eaee7 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/annotations.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: ANY +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt index a9f04876f16..c3961aa0076 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt index 127a13480d6..e9b32bb1a6f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/bothInExpectAndActual2.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt index 6ab2a24c864..7154e75d41d 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt index 509ec06691f..cb2449b27b6 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-62671 diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt index 348577876fe..69bd18246a3 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -69,4 +67,4 @@ fun box(): String { if (log != "C.foo(2);C.foo(1);[2] object:C.foo(2);[2] object:C.foo(1);") return "fail2: $log" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt index 970b41f2ee8..ca20c203221 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// ISSUE: KT-57181 -// WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS -// !LANGUAGE: +MultiPlatformProjects -// ISSUE: KT-41901 +// LANGUAGE: +MultiPlatformProjects +// ISSUE: KT-41901, KT-57181 // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt index 9f6f300cde0..3416c0de5ea 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-57263 // MODULE: common @@ -16,4 +14,4 @@ expect fun Trace(format: String = traceFormatDefault): String actual val traceFormatDefault: String = "" actual fun Trace(format: String) = format -fun box() = Trace("OK") \ No newline at end of file +fun box() = Trace("OK") diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt index 3e5dce5a2f3..8f1257d6829 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt index 1a270ec671e..5e65d7612a8 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt index 35eaf7716c4..1d50d36a5ef 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/functionFromOtherModule.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common @@ -17,4 +16,4 @@ actual fun foo(a: String, b: String) = a + b fun box(): String { return foo("") + foo("K", "") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt index e6929dc7711..03e27fbd8fd 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt index 9733aba8426..3280e96d066 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt index c1573a70aaf..9aa3b4dc163 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt index 04ad5d5b79c..f575a27eef2 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common @@ -31,4 +29,4 @@ fun box(): String { assertEquals("D5", D().f(5)) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt index 79bc2888a1a..8b2238856fa 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common @@ -35,4 +33,4 @@ fun box(): String { assertEquals("B5", B().f(5)) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt index f5771c58afd..aedb583f705 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt @@ -49,4 +47,4 @@ fun box(): String { if (r != "K.foo(W)") return "fail B.foo(W): $r" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt index 69cdaa05b11..f3f69940bac 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt index 0207c9a5f9e..0aa3262b635 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/jvmOverloads.kt @@ -1,6 +1,5 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K1: JVM, JVM_IR // WITH_STDLIB // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt index 5a879266758..8e992feec31 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common @@ -36,4 +34,4 @@ fun box(): String { assertEquals("fffx345", C().fffx(3)) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt index f170866d8f5..96ed760dc56 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt index 7bc7e76d089..42a24124adc 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/nestedEnumEntryValue.kt @@ -1,8 +1,5 @@ // WITH_STDLIB -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// KT-57181 -// JS IR & Wasm: https://youtrack.jetbrains.com/issue/KT-51225 -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-51156 // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt index 064d1bbb339..2976134174f 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt index 5a1a3161832..f910300a897 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt @@ -1,9 +1,8 @@ // IGNORE_BACKEND: WASM // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // K2/NATIVE fail: KT-59608 // IGNORE_BACKEND: NATIVE, JVM, JVM_IR -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6 // MODULE: common // FILE: common.kt @@ -42,4 +41,4 @@ fun box(): String { if (v3 != 24) return "fail3: $v3" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt index 71f7ddc27b4..f41711b12ca 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt index 95ab77271fd..6922865a971 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt @@ -1,6 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE +// LANGUAGE: +MultiPlatformProjects // WITH_STDLIB // MODULE: common @@ -22,4 +20,4 @@ fun box(): String { test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt index 6d550980584..72f32ccd42b 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/withTypeParameter.kt @@ -1,5 +1,4 @@ -// !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM +// LANGUAGE: +MultiPlatformProjects // ISSUE: KT-57181 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt b/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt index bcd83bec13c..d141e82ebaa 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClass.kt @@ -1,5 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: ANY // IGNORE_LIGHT_TREE // IGNORE_LIGHT_ANALYSIS // IGNORE_BACKEND_K2: JVM_IR @@ -18,4 +17,4 @@ actual value class Wrapper(val obj: Any) { get() = "OK" } -fun box(): String = Wrapper("").prop \ No newline at end of file +fun box(): String = Wrapper("").prop diff --git a/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt b/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt index c9ed6aaeaf8..28eaaf42312 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/expectValInInlineClassJVM.kt @@ -1,5 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: ANY // IGNORE_LIGHT_TREE // TARGET_BACKEND: JVM // WITH_STDLIB @@ -19,4 +18,4 @@ actual value class Wrapper(val obj: Any) { get() = "OK" } -fun box(): String = Wrapper("").prop \ No newline at end of file +fun box(): String = Wrapper("").prop diff --git a/compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt b/compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt index a77209b206a..c0b05211918 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/extensionPropertiesOverloads.kt @@ -1,6 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // ISSUE: KT-62926 // MODULE: common diff --git a/compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt b/compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt index 32ab13899d6..c11de5712f5 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt @@ -1,7 +1,4 @@ // LANGUAGE: +MultiPlatformProjects -// It accidentially passes K1 JVM while not intended to do so. -// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt @@ -45,4 +42,4 @@ fun box() : String { if (b.foo() != "BChild") return "Fail 2" if (c.foo() != "CChild") return "Fail 3" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt index 210716f569f..812d4cea12b 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt @@ -1,11 +1,9 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JS_IR // TARGET_BACKEND: NATIVE // TARGET_BACKEND: WASM // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt index b9124b4de58..14efdd568e0 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt @@ -1,11 +1,9 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JS_IR // TARGET_BACKEND: NATIVE // TARGET_BACKEND: WASM // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt diff --git a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt index 19380047593..0a80025362a 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt @@ -1,11 +1,9 @@ -// !LANGUAGE: +MultiPlatformProjects +// LANGUAGE: +MultiPlatformProjects // TARGET_BACKEND: JS_IR // TARGET_BACKEND: NATIVE // TARGET_BACKEND: WASM // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // IllegalArgumentException: arg wrongly != this@Test5: arg=null, this@Test5=[object Object] // IGNORE_BACKEND_K2: JS_IR, JS_IR_ES6 diff --git a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt index 789f3e4231d..fdf6b187bd4 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt @@ -1,12 +1,10 @@ -// !LANGUAGE: +MultiPlatformProjects -// !OPT_IN: kotlin.ExperimentalMultiplatform +// LANGUAGE: +MultiPlatformProjects +// OPT_IN: kotlin.ExperimentalMultiplatform // TARGET_BACKEND: JS_IR // TARGET_BACKEND: NATIVE // TARGET_BACKEND: WASM // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM -// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE // MODULE: common // FILE: common.kt