From f4bbcdc0139b50b425c698e6da16022f68de16be Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 7 Sep 2021 21:17:45 +0300 Subject: [PATCH] [TESTS] Move global directives outside file scope --- .../boxInline/argumentOrder/defaultParametersAndLastVararg.kt | 2 +- .../defaultParametersAndLastVarargWithCorrectOrder.kt | 2 +- .../boxInline/argumentOrder/varargAndDefaultParameters.kt | 2 +- .../argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt | 2 +- .../testData/codegen/boxInline/callableReference/kt15751_2.kt | 2 +- compiler/testData/codegen/boxInline/complexStack/asCheck.kt | 2 +- compiler/testData/codegen/boxInline/enum/values.kt | 2 +- compiler/testData/codegen/boxInline/enum/valuesAsArray.kt | 2 +- compiler/testData/codegen/boxInline/enum/valuesCapturedType.kt | 2 +- compiler/testData/codegen/boxInline/enum/valuesChain.kt | 2 +- .../testData/codegen/boxInline/enum/valuesChainCapturedType.kt | 2 +- compiler/testData/codegen/boxInline/enum/valuesNonReified.kt | 2 +- compiler/testData/codegen/boxInline/simple/vararg.kt | 2 +- compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt | 2 +- .../suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt | 2 +- .../suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt | 2 +- .../suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt | 2 +- .../suspend/receiver/inlineSuspendOfNoinlineSuspend.kt | 2 +- .../codegen/boxInline/varargs/varargAndDefaultParameters2.kt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt index 71d393c6b70..1c0107734ad 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt @@ -3,8 +3,8 @@ // IGNORE_BACKEND: JS // IGNORE_BACKEND_FIR: JVM_IR // NO_CHECK_LAMBDA_INLINING -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt index d9103906060..d1c18dfdb04 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt @@ -1,8 +1,8 @@ // WITH_RUNTIME // !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments // NO_CHECK_LAMBDA_INLINING -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt index 65186240ef6..6b4d8009ab0 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt @@ -7,8 +7,8 @@ // IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD // IGNORE_BACKEND_FIR: JVM_IR // NO_CHECK_LAMBDA_INLINING -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test open class A(val value: String) diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt index edaf2dcef51..52714fe714f 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt +++ b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt @@ -1,8 +1,8 @@ // WITH_RUNTIME // !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments // NO_CHECK_LAMBDA_INLINING -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test open class A(val value: String) diff --git a/compiler/testData/codegen/boxInline/callableReference/kt15751_2.kt b/compiler/testData/codegen/boxInline/callableReference/kt15751_2.kt index c418555e93e..0fcd4d66321 100644 --- a/compiler/testData/codegen/boxInline/callableReference/kt15751_2.kt +++ b/compiler/testData/codegen/boxInline/callableReference/kt15751_2.kt @@ -1,8 +1,8 @@ // IGNORE_BACKEND: JS // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test public inline fun T.myalso(block: (T) -> Unit): T { diff --git a/compiler/testData/codegen/boxInline/complexStack/asCheck.kt b/compiler/testData/codegen/boxInline/complexStack/asCheck.kt index 4999f9438d7..aa94cb84ef9 100644 --- a/compiler/testData/codegen/boxInline/complexStack/asCheck.kt +++ b/compiler/testData/codegen/boxInline/complexStack/asCheck.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test object ContentTypeByExtension { diff --git a/compiler/testData/codegen/boxInline/enum/values.kt b/compiler/testData/codegen/boxInline/enum/values.kt index 7cd9aa6966e..38526f38e88 100644 --- a/compiler/testData/codegen/boxInline/enum/values.kt +++ b/compiler/testData/codegen/boxInline/enum/values.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun > myValues(): String { diff --git a/compiler/testData/codegen/boxInline/enum/valuesAsArray.kt b/compiler/testData/codegen/boxInline/enum/valuesAsArray.kt index 65e31b37664..7e9999e074c 100644 --- a/compiler/testData/codegen/boxInline/enum/valuesAsArray.kt +++ b/compiler/testData/codegen/boxInline/enum/valuesAsArray.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun > myValues(): Array { diff --git a/compiler/testData/codegen/boxInline/enum/valuesCapturedType.kt b/compiler/testData/codegen/boxInline/enum/valuesCapturedType.kt index a336b0c641a..549ecdb55fd 100644 --- a/compiler/testData/codegen/boxInline/enum/valuesCapturedType.kt +++ b/compiler/testData/codegen/boxInline/enum/valuesCapturedType.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun > myValues(): String { diff --git a/compiler/testData/codegen/boxInline/enum/valuesChain.kt b/compiler/testData/codegen/boxInline/enum/valuesChain.kt index 6d3da298793..adaeb098ba8 100644 --- a/compiler/testData/codegen/boxInline/enum/valuesChain.kt +++ b/compiler/testData/codegen/boxInline/enum/valuesChain.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun > myValues2(): String { diff --git a/compiler/testData/codegen/boxInline/enum/valuesChainCapturedType.kt b/compiler/testData/codegen/boxInline/enum/valuesChainCapturedType.kt index a04127ad7da..831b72161a9 100644 --- a/compiler/testData/codegen/boxInline/enum/valuesChainCapturedType.kt +++ b/compiler/testData/codegen/boxInline/enum/valuesChainCapturedType.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun > myValues2(): String { diff --git a/compiler/testData/codegen/boxInline/enum/valuesNonReified.kt b/compiler/testData/codegen/boxInline/enum/valuesNonReified.kt index 696b058943e..f4eabb45507 100644 --- a/compiler/testData/codegen/boxInline/enum/valuesNonReified.kt +++ b/compiler/testData/codegen/boxInline/enum/valuesNonReified.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun myValues(): String { diff --git a/compiler/testData/codegen/boxInline/simple/vararg.kt b/compiler/testData/codegen/boxInline/simple/vararg.kt index 76b278d8ad7..27bc855bccf 100644 --- a/compiler/testData/codegen/boxInline/simple/vararg.kt +++ b/compiler/testData/codegen/boxInline/simple/vararg.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun doSmth(vararg a: String) : String { diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt index 0eb0b514c47..9e2a82c6541 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun stub() { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt index 57c08ce085c..8f238fdab90 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,7 +1,7 @@ // WITH_COROUTINES // WITH_RUNTIME -// FILE: test.kt // SKIP_SOURCEMAP_REMAPPING +// FILE: test.kt import kotlin.coroutines.* import helpers.* diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt index 27983c09463..df7dce06870 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,7 +1,7 @@ // WITH_COROUTINES // WITH_RUNTIME -// FILE: test.kt // SKIP_SOURCEMAP_REMAPPING +// FILE: test.kt import kotlin.coroutines.* import helpers.* diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt index c97a816e144..a895c2c8a6d 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt @@ -1,7 +1,7 @@ // WITH_COROUTINES // WITH_RUNTIME -// FILE: test.kt // SKIP_SOURCEMAP_REMAPPING +// FILE: test.kt import kotlin.coroutines.* import helpers.* diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt index d5e10a525f7..f7dcf091079 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt @@ -1,7 +1,7 @@ // WITH_COROUTINES // WITH_RUNTIME -// FILE: test.kt // SKIP_SOURCEMAP_REMAPPING +// FILE: test.kt import kotlin.coroutines.* import helpers.* diff --git a/compiler/testData/codegen/boxInline/varargs/varargAndDefaultParameters2.kt b/compiler/testData/codegen/boxInline/varargs/varargAndDefaultParameters2.kt index 59de2f06ff8..b64e823f776 100644 --- a/compiler/testData/codegen/boxInline/varargs/varargAndDefaultParameters2.kt +++ b/compiler/testData/codegen/boxInline/varargs/varargAndDefaultParameters2.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME -// FILE: 1.kt // KJS_WITH_FULL_RUNTIME +// FILE: 1.kt package test inline fun inlineFun(vararg constraints: String, receiver: String = "K", init: String.() -> String): String {