From ec2dd58165ef143f5f49984038299d3bf0698539 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 17 Dec 2018 17:35:08 +0100 Subject: [PATCH] Remove LANGUAGE_VERSION from codegen tests on coroutines Use `// !LANGUAGE: -ReleaseCoroutines` instead in tests which require old (1.2) coroutines, and nothing in tests which require new coroutines because master is already 1.3. Also remove superfluous API_VERSION and other directives which have no effect anymore. Do not include runtime automatically with `WITH_COROUTINES`/`COMMON_COROUTINES_TEST` in box tests; require `WITH_RUNTIME` for that (majority of tests already had it anyway), but remove it from bytecode text tests where runtime is always added automatically. Fix the coroutine package selection code in KotlinTestUtils and update the bunch files correspondingly. Disable tests in `box/coroutines/noStdLib` on JVM: despite the name, these tests were launched with stdlib because of the code in CodegenTestCase, and they do not work without it because at least CoroutineUtil.kt requires stdlib to compile correctly --- .../coroutines/asyncIteratorNullMerge_1_3.kt | 1 - .../box/coroutines/asyncIteratorToList_1_3.kt | 1 - .../box/coroutines/asyncIterator_1_3.kt | 1 - .../box/coroutines/controlFlow/kt22694_1_2.kt | 5 +- .../box/coroutines/controlFlow/kt22694_1_3.kt | 4 +- .../box/coroutines/coroutineToString.kt | 2 +- .../box/coroutines/coroutineToString_1_2.kt | 4 +- .../createCoroutinesOnManualInstances.kt | 1 - .../createCoroutinesOnManualInstances_1_2.kt | 3 +- .../box/coroutines/debug/debuggerMetadata.kt | 2 - .../coroutines/debug/firstSuspensionPoint.kt | 10 +- .../codegen/box/coroutines/debug/fqName.kt | 2 - .../coroutines/debug/runtimeDebugMetadata.kt | 10 +- .../box/coroutines/delegatedSuspendMember.kt | 1 + .../callableReference/bigArity.kt | 1 - .../callableReference/bound/emptyLHS.kt | 3 - .../callableReference/fromJava.kt | 4 +- .../genericCallableReferenceArguments.kt | 4 - ...ericCallableReferencesWithNullableTypes.kt | 4 - .../function/getArityViaFunctionImpl.kt | 6 +- .../function/local/equalsHashCode.kt | 8 +- .../callableReference/longArgs.kt | 3 +- .../featureIntersection/suspendFunction12.kt | 4 +- .../suspendFunctionIsAs.kt | 3 +- .../codegen/box/coroutines/illegalState.kt | 1 - .../box/coroutines/illegalState_1_2.kt | 3 +- .../bridgeGenerationCrossinline.kt | 1 + .../bridgeGenerationNonInline.kt | 1 + .../box/coroutines/localCallableRef.kt | 2 +- .../coroutines/localFunctions/named/rec.kt | 1 - .../coroutines/multiModule/inlineWithJava.kt | 2 +- .../multiModule/inlineWithJava_1_2.kt | 3 +- .../box/coroutines/noStdLib/breakFinally.kt | 5 +- .../box/coroutines/noStdLib/breakStatement.kt | 4 +- .../box/coroutines/noStdLib/crossinline.kt | 5 +- .../box/coroutines/noStdLib/ifStatement.kt | 4 +- .../box/coroutines/noStdLib/stateMachine.kt | 2 +- .../box/coroutines/noStdLib/switchLikeWhen.kt | 4 +- .../box/coroutines/reflect/callSuspend.kt | 7 +- .../box/coroutines/reflect/callSuspendBy.kt | 7 +- .../box/coroutines/reflect/isSuspend12.kt | 2 +- .../suspendCovariantJavaOverrides.kt | 1 - .../suspendCovariantJavaOverrides_1_2.kt | 2 +- .../ifExpressionInsideCoroutine_1_2.kt | 3 +- .../ifExpressionInsideCoroutine_1_3.kt | 2 +- .../openFunWithJava.kt | 1 - .../openFunWithJava_1_2.kt | 5 +- .../box/coroutines/suspendJavaOverrides.kt | 1 - .../coroutines/suspendJavaOverrides_1_2.kt | 2 +- .../inlineUsedAsNoinline/inlineOnly.kt | 3 +- .../inlineUsedAsNoinline/simpleNamed.kt | 3 +- .../tailcall/tailSuspendUnitFun.kt | 2 + .../tailcall/tryCatchTailCall.kt | 2 + .../bytecodeListing/tailcall/unreachable.kt | 2 + .../codegen/bytecodeText/constCoroutine.kt | 6 +- .../crossinlineSuspendContinuation_1_2.kt | 7 +- .../crossinlineSuspendContinuation_1_3.kt | 5 +- .../coroutines/debug/continuationInLvt.kt | 2 - .../debug/localVariableCorrectLabel.kt | 4 +- .../debug/probeCoroutineSuspended.kt | 4 +- .../coroutines/debug/thisAndResultInLvt.kt | 4 +- .../coroutines/doNotReassignContinuation.kt | 3 +- .../doNotReassignContinuation_1_2.kt | 4 +- .../coroutines/varValueConflictsWithTable.kt | 3 +- .../varValueConflictsWithTableSameSort.kt | 3 +- .../varValueConflictsWithTableSameSort_1_2.kt | 4 +- .../varValueConflictsWithTable_1_2.kt | 4 +- .../kotlin/codegen/CodegenTestCase.java | 11 +- .../kotlin/test/KotlinTestUtils.java | 8 +- .../kotlin/test/KotlinTestUtils.java.173 | 35 +---- .../kotlin/test/KotlinTestUtils.java.as31 | 35 +---- .../kotlin/test/KotlinTestUtils.java.as32 | 35 +---- .../LightAnalysisModeTestGenerated.java | 120 +++++++++--------- .../IrJsCodegenBoxTestGenerated.java | 15 --- .../semantics/JsCodegenBoxTestGenerated.java | 15 --- 75 files changed, 173 insertions(+), 324 deletions(-) diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt index 8d28e36856d..417dbcd018f 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge_1_3.kt @@ -1,4 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines +ExperimentalBuilderInference // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt index d79cb482811..c8d06a5f72c 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIteratorToList_1_3.kt @@ -1,4 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines +ExperimentalBuilderInference // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt b/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt index 104fd298122..52d699d4269 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt @@ -1,4 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines +ExperimentalBuilderInference // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt index 4ac60d3f709..162cd02369c 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_2.kt @@ -1,8 +1,9 @@ +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.2 + import helpers.* import kotlin.coroutines.experimental.* @@ -45,4 +46,4 @@ fun getSequence(a: Foo) = } } yield("end") - } \ No newline at end of file + } diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_3.kt b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_3.kt index 2ca751e7e49..7445fd9c959 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_3.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/kt22694_1_3.kt @@ -1,7 +1,7 @@ // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.3 + import helpers.* import kotlin.coroutines.* @@ -44,4 +44,4 @@ fun getSequence(a: Foo) = } } yield("end") - } \ No newline at end of file + } diff --git a/compiler/testData/codegen/box/coroutines/coroutineToString.kt b/compiler/testData/codegen/box/coroutines/coroutineToString.kt index 3f5861cd46d..64096f20b3d 100644 --- a/compiler/testData/codegen/box/coroutines/coroutineToString.kt +++ b/compiler/testData/codegen/box/coroutines/coroutineToString.kt @@ -1,9 +1,9 @@ -// LANGUAGE_VERSION: 1.3 // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_REFLECT // WITH_COROUTINES + import helpers.* import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* diff --git a/compiler/testData/codegen/box/coroutines/coroutineToString_1_2.kt b/compiler/testData/codegen/box/coroutines/coroutineToString_1_2.kt index 0440ec49677..c91bd4d9c3e 100644 --- a/compiler/testData/codegen/box/coroutines/coroutineToString_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/coroutineToString_1_2.kt @@ -1,9 +1,9 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR // TARGET_BACKEND: JVM // WITH_REFLECT // WITH_COROUTINES + import helpers.* import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.* diff --git a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt index 53493edf68f..232c322dd04 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt index df96cb6e0cf..a2f540ba537 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances_1_2.kt @@ -1,9 +1,10 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES // IGNORE_BACKEND: JS + import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED diff --git a/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt b/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt index 9c57a5325ce..86cfd50ef8b 100644 --- a/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt +++ b/compiler/testData/codegen/box/coroutines/debug/debuggerMetadata.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines - // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/debug/firstSuspensionPoint.kt b/compiler/testData/codegen/box/coroutines/debug/firstSuspensionPoint.kt index 46971d6a98b..6a58e7a5bac 100644 --- a/compiler/testData/codegen/box/coroutines/debug/firstSuspensionPoint.kt +++ b/compiler/testData/codegen/box/coroutines/debug/firstSuspensionPoint.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines - // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME @@ -49,14 +47,14 @@ fun box(): String { builder { foo() } - if (!"$continuation".contains("21")) return "$continuation" + if (!"$continuation".contains("19")) return "$continuation" continuation!!.resumeWith(Result.success(Unit)) - if (!"$continuation".contains("22")) return "$continuation" + if (!"$continuation".contains("20")) return "$continuation" builder { lambda() } - if (!"$continuation".contains("33")) return "$continuation" + if (!"$continuation".contains("31")) return "$continuation" continuation!!.resumeWith(Result.success(Unit)) - if (!"$continuation".contains("34")) return "$continuation" + if (!"$continuation".contains("32")) return "$continuation" return "OK" } diff --git a/compiler/testData/codegen/box/coroutines/debug/fqName.kt b/compiler/testData/codegen/box/coroutines/debug/fqName.kt index e5235f85926..1be1e33972a 100644 --- a/compiler/testData/codegen/box/coroutines/debug/fqName.kt +++ b/compiler/testData/codegen/box/coroutines/debug/fqName.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines - // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/debug/runtimeDebugMetadata.kt b/compiler/testData/codegen/box/coroutines/debug/runtimeDebugMetadata.kt index 150cb759e8d..835ba8778e1 100644 --- a/compiler/testData/codegen/box/coroutines/debug/runtimeDebugMetadata.kt +++ b/compiler/testData/codegen/box/coroutines/debug/runtimeDebugMetadata.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines - // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME @@ -49,14 +47,14 @@ fun box(): String { builder { res = named() } - if (res != Pair("runtimeDebugMetadata.kt", 35)) { + if (res != Pair("runtimeDebugMetadata.kt", 33)) { return "" + res } builder { dummy() res = getSourceFileAndLineNumberFromContinuation() } - if (res != Pair("runtimeDebugMetadata.kt", 57)) { + if (res != Pair("runtimeDebugMetadata.kt", 55)) { return "" + res } @@ -64,8 +62,8 @@ fun box(): String { suspended() } res = (continuation!! as BaseContinuationImpl).getSourceFileAndLineNumber() - if (res != Pair("runtimeDebugMetadata.kt", 40)) { + if (res != Pair("runtimeDebugMetadata.kt", 38)) { return "" + res } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt b/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt index 1e267b5d04e..ffb472ab7bf 100644 --- a/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt +++ b/compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt @@ -1,4 +1,5 @@ // IGNORE_BACKEND: JVM_IR +// WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt index 95a017da1ee..a7a314a2944 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt @@ -1,4 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines // IGNORE_BACKEND: JS_IR, JS, NATIVE, JVM_IR // WITH_REFLECT // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt index dd7794f1212..f125a65a40c 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bound/emptyLHS.kt @@ -1,9 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 // IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: JS // IGNORE_BACKEND: JVM_IR - // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/fromJava.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/fromJava.kt index f12f40b336c..7365e318424 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/fromJava.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/fromJava.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 // IGNORE_BACKEND: JS, JS_IR, NATIVE // IGNORE_BACKEND: JVM_IR // WITH_COROUTINES @@ -33,4 +31,4 @@ class Checker { } // FILE: box.kt -fun box() = Checker.check() \ No newline at end of file +fun box() = Checker.check() diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferenceArguments.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferenceArguments.kt index 0cdb6afa147..83361344a7d 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferenceArguments.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferenceArguments.kt @@ -1,10 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 // IGNORE_BACKEND: JS, NATIVE, JS_IR // IGNORE_BACKEND: JVM_IR - // WITH_REFLECT -// WITH_RUNTIME // WITH_COROUTINES import kotlin.test.assertEquals diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt index 9586eaa2d94..f68812dc4a5 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt @@ -1,10 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 // IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JVM_IR - // WITH_REFLECT -// WITH_RUNTIME // WITH_COROUTINES import kotlin.test.assertEquals diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt index 100d6ab25c9..b62c1d867b8 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt @@ -1,10 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 -// TODO: muted automatically, investigate should it be ran for JS or not +// TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS, NATIVE, JS_IR // IGNORE_LIGHT_ANALYSIS - // WITH_RUNTIME // WITH_COROUTINES diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local/equalsHashCode.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local/equalsHashCode.kt index c6e299e355c..c837babed3d 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local/equalsHashCode.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local/equalsHashCode.kt @@ -1,9 +1,5 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 -// IGNORE_BACKEND: JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: NATIVE +// IGNORE_BACKEND: JS, JS_IR, JVM_IR, NATIVE +// WITH_RUNTIME fun box(): String { suspend fun bar() {} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt index 9b5c9d349f2..12531114a8e 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/longArgs.kt @@ -1,9 +1,8 @@ -// !LANGUAGE: +ReleaseCoroutines -// !API_VERSION: 1.3 // IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: JS // IGNORE_BACKEND: JVM_IR // WITH_COROUTINES +// WITH_RUNTIME import helpers.* import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunction12.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunction12.kt index 917ecf9b4f0..46649994e80 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunction12.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunction12.kt @@ -1,8 +1,8 @@ +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JS_IR, JS // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.2 import helpers.* import kotlin.coroutines.* @@ -16,4 +16,4 @@ fun box(): String { assert(suspendLambda0 is SuspendFunction0<*>) { "Failed: suspendLambda0 is SuspendFunction0<*>" } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionIsAs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionIsAs.kt index c1b021caa0c..6e7df3c8c3c 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionIsAs.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendFunctionIsAs.kt @@ -3,7 +3,6 @@ // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.3 import helpers.* import kotlin.coroutines.* @@ -65,4 +64,4 @@ fun box(): String { checkReified Unit> {} return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/illegalState.kt b/compiler/testData/codegen/box/coroutines/illegalState.kt index 875ce5bbb0b..c033f54a5bc 100644 --- a/compiler/testData/codegen/box/coroutines/illegalState.kt +++ b/compiler/testData/codegen/box/coroutines/illegalState.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/illegalState_1_2.kt b/compiler/testData/codegen/box/coroutines/illegalState_1_2.kt index 29eb33748c1..af7fd3583df 100644 --- a/compiler/testData/codegen/box/coroutines/illegalState_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/illegalState_1_2.kt @@ -1,8 +1,9 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JS_IR // WITH_RUNTIME // WITH_COROUTINES + import helpers.* // TARGET_BACKEND: JVM import kotlin.coroutines.experimental.* diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationCrossinline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationCrossinline.kt index 4c3c5750863..fda7a7d9eec 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationCrossinline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationCrossinline.kt @@ -1,4 +1,5 @@ // IGNORE_BACKEND: JVM_IR +// WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationNonInline.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationNonInline.kt index 070c4da52e6..04776cee904 100644 --- a/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/inlineClasses/bridgeGenerationNonInline.kt @@ -1,4 +1,5 @@ // IGNORE_BACKEND: JVM_IR +// WITH_RUNTIME // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/localCallableRef.kt b/compiler/testData/codegen/box/coroutines/localCallableRef.kt index a743c9b6b07..209e6eb2d20 100644 --- a/compiler/testData/codegen/box/coroutines/localCallableRef.kt +++ b/compiler/testData/codegen/box/coroutines/localCallableRef.kt @@ -1,7 +1,7 @@ // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.3 + import helpers.* import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt index 8af10df2a6d..b87068e1c47 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // WITH_RUNTIME // WITH_COROUTINES // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt index d2d3cb9b49a..03da5c4673c 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt @@ -1,6 +1,6 @@ -// LANGUAGE_VERSION: 1.3 // IGNORE_BACKEND: NATIVE, JS, JS_IR, JVM_IR // WITH_COROUTINES +// WITH_RUNTIME // MODULE: lib // FILE: lib.kt interface I {} diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava_1_2.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava_1_2.kt index 3d0308a25bb..65997366ee8 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava_1_2.kt @@ -1,10 +1,11 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: NATIVE, JS, JS_IR // WITH_COROUTINES // WITH_RUNTIME // MODULE: lib // FILE: lib.kt + interface I {} suspend inline fun foo() = object : I {} diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt b/compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt index 8f86707cc79..aab8778218a 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt @@ -1,12 +1,11 @@ -// IGNORE_BACKEND: JS -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JS, JVM, JVM_IR // WITH_COROUTINES // COMMON_COROUTINES_TEST + import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* - class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt b/compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt index aeea2cda87b..9f1e61556a4 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt @@ -1,11 +1,11 @@ -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM, JVM_IR // WITH_COROUTINES // COMMON_COROUTINES_TEST + import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* - class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt b/compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt index dcf26d05529..f4a88f5c8ac 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt @@ -1,7 +1,8 @@ -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM, JVM_IR // COMMON_COROUTINES_TEST // WITH_COROUTINES // CHECK_BYTECODE_LISTING + import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* @@ -73,4 +74,4 @@ fun box(): String { } if (res != 12) return "FAIL" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt b/compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt index 9b5a7a7c67a..b94dd967ed3 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt @@ -1,11 +1,11 @@ -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM, JVM_IR // WITH_COROUTINES // COMMON_COROUTINES_TEST + import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* - class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt b/compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt index d16cb755cf6..41ec7ab5aa0 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM, JVM_IR // WITH_COROUTINES // COMMON_COROUTINES_TEST diff --git a/compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt b/compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt index 627c3fcc474..5293a237ad8 100644 --- a/compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt +++ b/compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt @@ -1,11 +1,11 @@ -// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND: JVM, JVM_IR // WITH_COROUTINES // COMMON_COROUTINES_TEST + import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* - class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt b/compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt index 17e79a54170..37415664a44 100644 --- a/compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt @@ -1,9 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines // WITH_COROUTINES // WITH_REFLECT -// IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS +// TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR import helpers.* @@ -66,4 +63,4 @@ fun box(): String { proceed() if (log != "before;suspended;after;") return log return res ?: "FAIL 4" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt b/compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt index 82633ce1fc3..e27af2f2155 100644 --- a/compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt +++ b/compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt @@ -1,9 +1,6 @@ -// !LANGUAGE: +ReleaseCoroutines // WITH_COROUTINES // WITH_REFLECT -// IGNORE_BACKEND: NATIVE -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS +// TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR import helpers.* @@ -74,4 +71,4 @@ fun box(): String { proceed() if (log != "before;suspended;after;") return log return res ?: "FAIL 5" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt b/compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt index c7a56d8c488..78ab5dc229d 100644 --- a/compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt +++ b/compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // WITH_COROUTINES // WITH_REFLECT diff --git a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt index b55c6b6944b..a694edb4eed 100644 --- a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt +++ b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides_1_2.kt b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides_1_2.kt index a6db3afc96e..87290886230 100644 --- a/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/suspendCovariantJavaOverrides_1_2.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt index f4e8a8dfe83..f998ac98aa3 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_2.kt @@ -1,8 +1,9 @@ +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.2 + import helpers.* import kotlin.coroutines.experimental.* diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt index cdeb3b07e7d..56afb3718ed 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt @@ -1,7 +1,7 @@ // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME // WITH_COROUTINES -// LANGUAGE_VERSION: 1.3 + import helpers.* import kotlin.coroutines.* diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt index 12500d0f0c3..1ac79cb4c7a 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava_1_2.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava_1_2.kt index bd95a0f28df..553a54d4ab4 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava_1_2.kt @@ -1,16 +1,15 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JS_IR // WITH_RUNTIME // WITH_COROUTINES // FILE: main.kt // TARGET_BACKEND: JVM + import helpers.* import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.* - - open class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineUninterceptedOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendJavaOverrides.kt b/compiler/testData/codegen/box/coroutines/suspendJavaOverrides.kt index eef39b90bdd..e34b18733ad 100644 --- a/compiler/testData/codegen/box/coroutines/suspendJavaOverrides.kt +++ b/compiler/testData/codegen/box/coroutines/suspendJavaOverrides.kt @@ -1,4 +1,3 @@ -// LANGUAGE_VERSION: 1.3 // TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/coroutines/suspendJavaOverrides_1_2.kt b/compiler/testData/codegen/box/coroutines/suspendJavaOverrides_1_2.kt index 5e0d23533c0..163158a1e89 100644 --- a/compiler/testData/codegen/box/coroutines/suspendJavaOverrides_1_2.kt +++ b/compiler/testData/codegen/box/coroutines/suspendJavaOverrides_1_2.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // IGNORE_BACKEND: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt index 1360d535a5c..02149b587bc 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/inlineOnly.kt @@ -1,9 +1,8 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// FILE: inlined.kt // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING +// FILE: inlined.kt import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* diff --git a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt index d2444a6a77f..69ab158c5b3 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineUsedAsNoinline/simpleNamed.kt @@ -1,9 +1,8 @@ // IGNORE_BACKEND: JVM_IR -// IGNORE_BACKEND: JS_IR -// FILE: inlined.kt // WITH_RUNTIME // WITH_COROUTINES // NO_CHECK_LAMBDA_INLINING +// FILE: inlined.kt import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt index 02d72204efb..1b64812a82d 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt @@ -1,4 +1,6 @@ // COMMON_COROUTINES_TEST +// WITH_RUNTIME + suspend fun empty() {} suspend fun withoutReturn() { empty() } suspend fun withReturn() { return empty() } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt index 6e5dc7702b5..efd115b4a48 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt @@ -1,4 +1,6 @@ // COMMON_COROUTINES_TEST +// WITH_RUNTIME + suspend fun catchException(): String { try { return suspendWithException() diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt index bc00e7891b4..ead19c61e64 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt @@ -1,4 +1,6 @@ // COMMON_COROUTINES_TEST +// WITH_RUNTIME + suspend fun empty() {} suspend fun withoutReturn() { empty() diff --git a/compiler/testData/codegen/bytecodeText/constCoroutine.kt b/compiler/testData/codegen/bytecodeText/constCoroutine.kt index d4073c465f4..8b7f11f6730 100644 --- a/compiler/testData/codegen/bytecodeText/constCoroutine.kt +++ b/compiler/testData/codegen/bytecodeText/constCoroutine.kt @@ -1,10 +1,12 @@ -// LANGUAGE_VERSION: 1.2 +// !LANGUAGE: -ReleaseCoroutines // WITH_RUNTIME // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.* + suspend fun suspendHere() = "" fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_2.kt b/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_2.kt index 7258fc876f2..011d81b5966 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_2.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_2.kt @@ -1,7 +1,6 @@ -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.2 -// IGNORE_BACKEND: JVM +// !LANGUAGE: -ReleaseCoroutines // WITH_COROUTINES + import helpers.* import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.* @@ -29,4 +28,4 @@ fun box(): String { // Test for continuation of 'run' transformation. // Since continuation is not suspend lambda, it should not have state-machine. // @CrossinlineSuspendContinuation_1_2Kt$box$1$doResume$$inlined$inlineMe$1$1.class: -// 0 TABLESWITCH \ No newline at end of file +// 0 TABLESWITCH diff --git a/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_3.kt b/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_3.kt index c3c555ca259..609948bdd4e 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_3.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/crossinlineSuspendContinuation_1_3.kt @@ -1,6 +1,5 @@ -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.3 // WITH_COROUTINES + import helpers.* import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* @@ -28,4 +27,4 @@ fun box(): String { // Test for continuation of 'run' transformation. // Since continuation is not suspend lambda, it should not have state-machine // @CrossinlineSuspendContinuation_1_3Kt$box$1$invokeSuspend$$inlined$inlineMe$1$1.class: -// 0 TABLESWITCH \ No newline at end of file +// 0 TABLESWITCH diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/continuationInLvt.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/continuationInLvt.kt index 05bf57da4e1..c9903eb6d20 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/continuationInLvt.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/continuationInLvt.kt @@ -1,5 +1,3 @@ -// LANGUAGE_VERSION: 1.3 - suspend fun dummy() {} suspend fun tailCall() { diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt index 07125e5871c..d9e0f4d81b7 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt @@ -1,5 +1,3 @@ -// LANGUAGE_VERSION: 1.3 - import kotlin.sequences.* import kotlin.experimental.* @@ -17,4 +15,4 @@ fun main(args: Array) { suspend fun SequenceScope.awaitSeq(): Int = 42 // 1 LOCALVARIABLE a I L19 L23 3 -// 1 LINENUMBER 10 L19 +// 1 LINENUMBER 8 L19 diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/probeCoroutineSuspended.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/probeCoroutineSuspended.kt index dc10fc7c511..4c7301af90e 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/probeCoroutineSuspended.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/probeCoroutineSuspended.kt @@ -1,5 +1,3 @@ -// LANGUAGE_VERSION: 1.3 -// WITH_RUNTIME // TREAT_AS_ONE_FILE import kotlin.coroutines.intrinsics.* @@ -14,4 +12,4 @@ suspend fun simpleReturn() = suspendCoroutineUninterceptedOrReturn { cont - cont.resume(0) } -// 2 INVOKESTATIC kotlin/coroutines/jvm/internal/DebugProbesKt.probeCoroutineSuspended \ No newline at end of file +// 2 INVOKESTATIC kotlin/coroutines/jvm/internal/DebugProbesKt.probeCoroutineSuspended diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt index b3d2c4929ad..15d7a99af53 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/thisAndResultInLvt.kt @@ -1,5 +1,3 @@ -// LANGUAGE_VERSION: 1.3 - suspend fun dummy() {} val c: suspend () -> Unit = { @@ -21,4 +19,4 @@ class A { // 1 LOCALVARIABLE a LA; L0 L21 1 // 1 LOCALVARIABLE s Ljava/lang/String; L0 L21 2 // 1 LOCALVARIABLE block Lkotlin/jvm/functions/Function2; L0 L21 3 -// 1 LOCALVARIABLE \$continuation Lkotlin/coroutines/Continuation; L2 L7 6 \ No newline at end of file +// 1 LOCALVARIABLE \$continuation Lkotlin/coroutines/Continuation; L2 L7 6 diff --git a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt index 89836858a15..239a7bf0f76 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt @@ -1,6 +1,5 @@ -// LANGUAGE_VERSION: 1.3 -// WITH_RUNTIME // TREAT_AS_ONE_FILE + import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation_1_2.kt b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation_1_2.kt index fac597b53bb..afcc9b35e2e 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation_1_2.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation_1_2.kt @@ -1,6 +1,6 @@ -// LANGUAGE_VERSION: 1.2 -// WITH_RUNTIME +// !LANGUAGE: -ReleaseCoroutines // WITH_COROUTINES + import helpers.* // TREAT_AS_ONE_FILE import kotlin.coroutines.experimental.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt index fda71d77db7..f1de1536e56 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt @@ -1,6 +1,5 @@ -// LANGUAGE_VERSION: 1.3 -// WITH_RUNTIME // WITH_COROUTINES + import helpers.* // TREAT_AS_ONE_FILE import kotlin.coroutines.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt index c900fd580b4..9727fd4a538 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt @@ -1,6 +1,5 @@ -// LANGUAGE_VERSION: 1.3 -// WITH_RUNTIME // WITH_COROUTINES + import helpers.* // TREAT_AS_ONE_FILE import kotlin.coroutines.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt index 968c5447434..cfda97990b2 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt @@ -1,6 +1,6 @@ -// LANGUAGE_VERSION: 1.2 -// WITH_RUNTIME +// !LANGUAGE: -ReleaseCoroutines // WITH_COROUTINES + import helpers.* // TREAT_AS_ONE_FILE import kotlin.coroutines.experimental.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable_1_2.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable_1_2.kt index d114b2bd9ae..6dc6992d473 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable_1_2.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable_1_2.kt @@ -1,6 +1,6 @@ -// LANGUAGE_VERSION: 1.2 -// WITH_RUNTIME +// !LANGUAGE: -ReleaseCoroutines // WITH_COROUTINES + import helpers.* // TREAT_AS_ONE_FILE import kotlin.coroutines.experimental.* diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 0421ab72daa..96a274e6aab 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -18,8 +18,8 @@ import kotlin.script.experimental.dependencies.ScriptDependencies; import kotlin.text.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.TestsCompiletimeError; import org.jetbrains.kotlin.TestsCompilerError; +import org.jetbrains.kotlin.TestsCompiletimeError; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.SimpleOutputFileCollection; import org.jetbrains.kotlin.checkers.CheckerTestUtil; @@ -70,7 +70,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettingsKt.API_VERSION_DIRECTIVE; import static org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettingsKt.parseLanguageVersionSettings; import static org.jetbrains.kotlin.cli.common.output.OutputUtilsKt.writeAllTo; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; @@ -724,13 +723,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected ConfigurationKind extractConfigurationKind(@NotNull List files) { boolean addRuntime = false; boolean addReflect = false; - boolean addCoroutines = false; for (TestFile file : files) { - if (InTextDirectivesUtils.isDirectiveDefined(file.content, "COMMON_COROUTINES_TEST") || - InTextDirectivesUtils.isDirectiveDefined(file.content, "!LANGUAGE: +ReleaseCoroutines") || - InTextDirectivesUtils.isDirectiveDefined(file.content, "LANGUAGE_VERSION: 1.3")) { - addCoroutines = true; - } if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) { addRuntime = true; } @@ -740,7 +733,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { } return addReflect ? ConfigurationKind.ALL : - (addRuntime || addCoroutines) ? ConfigurationKind.NO_KOTLIN_REFLECT : + addRuntime ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.JDK_ONLY; } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 10454b96087..1e2625a5419 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -798,14 +798,10 @@ public class KotlinTestUtils { if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { M supportModule = hasModules ? factory.createModule("support", Collections.emptyList(), Collections.emptyList()) : null; - if (coroutinesPackage.isEmpty()) { - coroutinesPackage = "kotlin.coroutines.experimental"; - } boolean isReleaseCoroutines = - !coroutinesPackage.contains("experimental") || - isDirectiveDefined(expectedText, "LANGUAGE_VERSION: 1.3") || - isDirectiveDefined(expectedText, "!LANGUAGE: +ReleaseCoroutines"); + !coroutinesPackage.contains("experimental") && + !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 index 2784341e34f..dac306d7ae6 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 @@ -36,6 +36,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.CoroutineTestUtilKt; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.builtins.DefaultBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -793,36 +794,14 @@ public class KotlinTestUtils { if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { M supportModule = hasModules ? factory.createModule("support", Collections.emptyList(), Collections.emptyList()) : null; - if (coroutinesPackage.isEmpty()) { - coroutinesPackage = "kotlin.coroutines.experimental"; - } + + boolean isReleaseCoroutines = + !coroutinesPackage.contains("experimental") && + !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); + testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", - "package helpers\n" + - "import " + coroutinesPackage + ".*\n" + - "fun handleResultContinuation(x: (T) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " throw exception\n" + - " }\n" + - "\n" + - " override fun resume(data: T) = x(data)\n" + - "}\n" + - "\n" + - "fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " x(exception)\n" + - " }\n" + - "\n" + - " override fun resume(data: Any?) { }\n" + - "}\n" + - "\n" + - "open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation {\n" + - " companion object : EmptyContinuation()\n" + - " override fun resume(data: Any?) {}\n" + - " override fun resumeWithException(exception: Throwable) { throw exception }\n" + - "}", + CoroutineTestUtilKt.createTextForHelpers(isReleaseCoroutines), directives )); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 index 2f85a9eb28e..9f1cb5e92ba 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 @@ -35,6 +35,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.CoroutineTestUtilKt; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.builtins.DefaultBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -793,36 +794,14 @@ public class KotlinTestUtils { if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { M supportModule = hasModules ? factory.createModule("support", Collections.emptyList(), Collections.emptyList()) : null; - if (coroutinesPackage.isEmpty()) { - coroutinesPackage = "kotlin.coroutines.experimental"; - } + + boolean isReleaseCoroutines = + !coroutinesPackage.contains("experimental") && + !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); + testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", - "package helpers\n" + - "import " + coroutinesPackage + ".*\n" + - "fun handleResultContinuation(x: (T) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " throw exception\n" + - " }\n" + - "\n" + - " override fun resume(data: T) = x(data)\n" + - "}\n" + - "\n" + - "fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " x(exception)\n" + - " }\n" + - "\n" + - " override fun resume(data: Any?) { }\n" + - "}\n" + - "\n" + - "open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation {\n" + - " companion object : EmptyContinuation()\n" + - " override fun resume(data: Any?) {}\n" + - " override fun resumeWithException(exception: Throwable) { throw exception }\n" + - "}", + CoroutineTestUtilKt.createTextForHelpers(isReleaseCoroutines), directives )); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 index f64ab09cb87..b9c84a88579 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 @@ -35,6 +35,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.CoroutineTestUtilKt; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.builtins.DefaultBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -793,36 +794,14 @@ public class KotlinTestUtils { if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { M supportModule = hasModules ? factory.createModule("support", Collections.emptyList(), Collections.emptyList()) : null; - if (coroutinesPackage.isEmpty()) { - coroutinesPackage = "kotlin.coroutines.experimental"; - } + + boolean isReleaseCoroutines = + !coroutinesPackage.contains("experimental") && + !isDirectiveDefined(expectedText, "!LANGUAGE: -ReleaseCoroutines"); + testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", - "package helpers\n" + - "import " + coroutinesPackage + ".*\n" + - "fun handleResultContinuation(x: (T) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " throw exception\n" + - " }\n" + - "\n" + - " override fun resume(data: T) = x(data)\n" + - "}\n" + - "\n" + - "fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation = object: Continuation {\n" + - " override val context = EmptyCoroutineContext\n" + - " override fun resumeWithException(exception: Throwable) {\n" + - " x(exception)\n" + - " }\n" + - "\n" + - " override fun resume(data: Any?) { }\n" + - "}\n" + - "\n" + - "open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation {\n" + - " companion object : EmptyContinuation()\n" + - " override fun resume(data: Any?) {}\n" + - " override fun resumeWithException(exception: Throwable) { throw exception }\n" + - "}", + CoroutineTestUtilKt.createTextForHelpers(isReleaseCoroutines), directives )); } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index e8ab7b6ab80..476c9f814dc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -7489,6 +7489,66 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class NoStdLib extends AbstractLightAnalysisModeTest { + @TestMetadata("breakFinally.kt") + public void ignoreBreakFinally_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakFinally.kt") + public void ignoreBreakFinally_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt", "kotlin.coroutines"); + } + + @TestMetadata("breakStatement.kt") + public void ignoreBreakStatement_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakStatement.kt") + public void ignoreBreakStatement_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt", "kotlin.coroutines"); + } + + @TestMetadata("crossinline.kt") + public void ignoreCrossinline_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinline.kt") + public void ignoreCrossinline_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt", "kotlin.coroutines"); + } + + @TestMetadata("ifStatement.kt") + public void ignoreIfStatement_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("ifStatement.kt") + public void ignoreIfStatement_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt", "kotlin.coroutines"); + } + + @TestMetadata("stateMachine.kt") + public void ignoreStateMachine_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("stateMachine.kt") + public void ignoreStateMachine_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt", "kotlin.coroutines"); + } + + @TestMetadata("switchLikeWhen.kt") + public void ignoreSwitchLikeWhen_1_2() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt", "kotlin.coroutines.experimental"); + } + + @TestMetadata("switchLikeWhen.kt") + public void ignoreSwitchLikeWhen_1_3() throws Exception { + runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt", "kotlin.coroutines"); + } + private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } @@ -7500,66 +7560,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes public void testAllFilesPresentInNoStdLib() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/noStdLib"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } - - @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/breakStatement.kt", "kotlin.coroutines"); - } - - @TestMetadata("crossinline.kt") - public void testCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/crossinline.kt", "kotlin.coroutines"); - } - - @TestMetadata("ifStatement.kt") - public void testIfStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/ifStatement.kt", "kotlin.coroutines"); - } - - @TestMetadata("stateMachine.kt") - public void testStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/stateMachine.kt", "kotlin.coroutines"); - } - - @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noStdLib/switchLikeWhen.kt", "kotlin.coroutines"); - } } @TestMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java index 7d762687cab..1d88049f222 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java @@ -5846,11 +5846,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt"); } - @TestMetadata("getArityViaFunctionImpl.kt") - public void testGetArityViaFunctionImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt"); - } - @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -6341,16 +6336,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS_IR, true); } - @TestMetadata("callSuspend.kt") - public void testCallSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt"); - } - - @TestMetadata("callSuspendBy.kt") - public void testCallSuspendBy() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt"); - } - @TestMetadata("isSuspend12.kt") public void testIsSuspend12() throws Exception { runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 3d4db9a7aad..1cd71006220 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -6411,11 +6411,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/genericCallableReferencesWithNullableTypes.kt"); } - @TestMetadata("getArityViaFunctionImpl.kt") - public void testGetArityViaFunctionImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/getArityViaFunctionImpl.kt"); - } - @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/function/local") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -7186,16 +7181,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines/reflect"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); } - @TestMetadata("callSuspend.kt") - public void testCallSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspend.kt"); - } - - @TestMetadata("callSuspendBy.kt") - public void testCallSuspendBy() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/reflect/callSuspendBy.kt"); - } - @TestMetadata("isSuspend12.kt") public void testIsSuspend12() throws Exception { runTest("compiler/testData/codegen/box/coroutines/reflect/isSuspend12.kt");