From f5ff3d2fa94454c287c3839c6579b8db2807b284 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 18 Dec 2018 17:35:14 +0100 Subject: [PATCH] Remove directives that have no effect from bytecode text tests All bytecode text tests are run with stdlib in the classpath and only for JVM backend, therefore directives WITH_RUNTIME, TARGET_BACKEND, IGNORE_BACKEND are not needed --- .../codegen/bytecodeText/boxingOptimization/maxMinBy.kt | 3 ++- .../capturedVarsOptimization/capturedInChainOfInlineFuns.kt | 4 +--- .../capturedVarsOptimization/capturedInInlineOnly.kt | 4 +--- .../capturedVarsOptimization/capturedInLocalObject.kt | 4 +--- .../capturedVarsOptimization/capturedInNoInlineOnly.kt | 4 +--- .../capturedInNoInlneInsideChainOfInlineFuns.kt | 4 +--- .../capturedVarsOptimization/capturedVarsOfSize2.kt | 4 +--- .../capturedVarsOptimization/sharedSlotsWithCapturedVars.kt | 4 +--- .../capturedVarsOptimization/withStackNormalization.kt | 4 +--- .../coercionToUnitOptimization/inRangeCheckWithConst.kt | 4 +--- .../bytecodeText/coercionToUnitOptimization/tryInlined.kt | 2 -- compiler/testData/codegen/bytecodeText/constCoroutine.kt | 1 - .../coroutines/intLikeVarSpilling/complicatedMerge.kt | 4 ++-- .../bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt | 4 ++-- .../coroutines/intLikeVarSpilling/loadFromBooleanArray.kt | 4 ++-- .../coroutines/intLikeVarSpilling/loadFromByteArray.kt | 4 ++-- .../coroutines/intLikeVarSpilling/noVariableInTable.kt | 4 ++-- .../coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt | 4 ++-- .../coroutines/intLikeVarSpilling/usedInArrayStore.kt | 5 ++--- .../coroutines/intLikeVarSpilling/usedInMethodCall.kt | 4 ++-- .../coroutines/intLikeVarSpilling/usedInPutfield.kt | 5 ++--- .../coroutines/intLikeVarSpilling/usedInVarStore.kt | 4 ++-- .../codegen/bytecodeText/coroutines/returnUnitInLambda.kt | 3 +-- .../forInArrayWithIndex/forInArrrayWithIndexNoElementVar.kt | 4 +--- .../forInArrayWithIndex/forInArrrayWithIndexNoIndexVar.kt | 4 +--- .../forLoop/forInArrayWithIndex/forInEmptyArrrayWithIndex.kt | 4 +--- .../forLoop/forInArrayWithIndex/forInIntArrrayWithIndex.kt | 4 +--- .../forInArrayWithIndex/forInObjectArrrayWithIndex.kt | 4 +--- .../codegen/bytecodeText/forLoop/forInCharSequence.kt | 2 -- .../forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt | 4 +--- .../forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt | 4 +--- .../forInCharSequenceWithIndex/forInStringWithIndex.kt | 4 +--- .../forInStringWithIndexNoElementVar.kt | 4 +--- .../forInStringWithIndexNoIndexVar.kt | 4 +--- .../forInStringWithIndexWithExplicitlyTypedIndexVariable.kt | 4 +--- .../forLoop/forInIndices/forInCharSequenceIndices.kt | 4 +--- .../forInIndices/forInCollectionImplicitReceiverIndices.kt | 4 +--- .../forLoop/forInIndices/forInCollectionIndices.kt | 4 +--- .../forLoop/forInIndices/forInNonOptimizedIndices.kt | 2 -- .../forLoop/forInIndices/forInObjectArrayIndices.kt | 4 +--- .../forLoop/forInIndices/forInPrimitiveArrayIndices.kt | 4 +--- .../forInIterableWithIndex/forInEmptyListWithIndex.kt | 4 +--- .../forLoop/forInIterableWithIndex/forInListWithIndex.kt | 4 +--- .../forInIterableWithIndex/forInListWithIndexNoElementVar.kt | 4 +--- .../forInIterableWithIndex/forInListWithIndexNoIndexVar.kt | 4 +--- .../forInListWithIndexWithExplicitlyTypedIndexVariable.kt | 4 +--- .../forLoop/forInReversed/ForInReversedReversedRange.kt | 3 +-- .../forLoop/forInReversed/forInReversedArrayIndices.kt | 3 +-- .../forInReversed/forInReversedCharSequenceIndices.kt | 3 +-- .../forLoop/forInReversed/forInReversedCollectionIndices.kt | 3 +-- .../forLoop/forInReversed/forInReversedDownTo.kt | 3 +-- .../forLoop/forInReversed/forInReversedEmptyRangeLiteral.kt | 4 +--- .../bytecodeText/forLoop/forInReversed/forInReversedRange.kt | 3 +-- .../forLoop/forInReversed/forInReversedRangeLiteral.kt | 3 +-- .../forInReversed/forInReversedReversedReversedRange.kt | 3 +-- .../bytecodeText/forLoop/forInReversed/forInReversedUntil.kt | 3 +-- .../forInSequenceWithIndex/forInEmptySequenceWithIndex.kt | 4 +--- .../forLoop/forInSequenceWithIndex/forInSequenceWithIndex.kt | 4 +--- .../forInSequenceWithIndexNoElementVar.kt | 4 +--- .../forInSequenceWithIndexNoIndexVar.kt | 4 +--- .../forInSequenceWithIndexThrowsCME.kt | 4 +--- ...forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt | 4 +--- .../codegen/bytecodeText/forLoop/forInStringSpecialized.kt | 2 -- compiler/testData/codegen/bytecodeText/forLoop/forInUntil.kt | 4 +--- .../testData/codegen/bytecodeText/forLoop/forIntInDownTo.kt | 4 +--- ...nctionsWithInlineClassParametersHaveStableMangledNames.kt | 3 +-- .../inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt | 4 +--- .../codegen/bytecodeText/intrinsics/javaObjectType.kt | 2 -- .../codegen/bytecodeText/intrinsics/javaPrimitiveType.kt | 2 -- .../jvm8/jvmDefault/compatibility/defaultArgs.kt | 1 - .../jvm8/jvmDefault/compatibility/simpleProperty.kt | 1 - compiler/testData/codegen/bytecodeText/kt7188.kt | 3 --- .../multifileClasses/optimizedMultifileClassFacadeMethods.kt | 1 - .../bytecodeText/nullCheckOptimization/ifNullEqualsNull.kt | 4 +--- .../nullCheckOptimization/ifNullEqualsNullInline.kt | 4 +--- .../bytecodeText/nullCheckOptimization/ifUnitEqualsNull.kt | 4 +--- .../nullCheckOptimization/ifUnitEqualsNullInline.kt | 4 +--- .../codegen/bytecodeText/nullCheckOptimization/kt12839.kt | 4 +--- .../testData/codegen/bytecodeText/ranges/inArrayIndices.kt | 4 +--- .../codegen/bytecodeText/ranges/inCharSequenceIndices.kt | 2 -- .../codegen/bytecodeText/ranges/inCollectionIndices.kt | 2 -- .../bytecodeText/ranges/inNonMatchingRangeIntrinsified.kt | 2 -- .../bytecodeText/ranges/inNonMatchingRangeNotIntrinsified.kt | 2 -- .../codegen/bytecodeText/ranges/inOptimizableRange.kt | 2 -- compiler/testData/codegen/bytecodeText/ranges/inUntil.kt | 4 +--- .../bytecodeText/ranges/noDupXForLiteralRangeContains.kt | 4 +--- .../bytecodeText/sam/samWrapperForNullInitialization.kt | 3 +-- .../bytecodeText/sam/samWrapperForNullableInitialization.kt | 3 +-- compiler/testData/codegen/bytecodeText/when/kt18818.kt | 4 +--- .../kotlin/checkers/CompilerTestLanguageVersionSettings.kt | 4 ++-- 90 files changed, 86 insertions(+), 227 deletions(-) diff --git a/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt b/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt index adc07399f5a..8d1e08667f5 100644 --- a/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt +++ b/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt @@ -1,9 +1,10 @@ -// WITH_RUNTIME // FILE: list.kt + val intList = listOf(1, 2, 3) val longList = listOf(1L, 2L, 3L) // FILE: box.kt + fun box(): String { val intListMin = intList.minBy { it } ?: -1 if (intListMin != 1) return "Fail intListMin=$intListMin" diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInChainOfInlineFuns.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInChainOfInlineFuns.kt index 2d1e4d88113..6c25a82f9a7 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInChainOfInlineFuns.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInChainOfInlineFuns.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var x = 0 run { @@ -13,4 +11,4 @@ fun test() { // 0 NEW // 0 GETFIELD -// 0 PUTFIELD \ No newline at end of file +// 0 PUTFIELD diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInInlineOnly.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInInlineOnly.kt index c0d87f2e430..67ac4d25403 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInInlineOnly.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInInlineOnly.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var x = 0 run { ++x } @@ -7,4 +5,4 @@ fun test() { // 0 NEW // 0 GETFIELD -// 0 PUTFIELD \ No newline at end of file +// 0 PUTFIELD diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInLocalObject.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInLocalObject.kt index b12531d62b1..957e305cffd 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInLocalObject.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInLocalObject.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var x = 0 run { @@ -12,4 +10,4 @@ fun test() { // 1 NEW kotlin/jvm/internal/Ref\$IntRef // 2 GETFIELD kotlin/jvm/internal/Ref\$IntRef\.element -// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element \ No newline at end of file +// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlineOnly.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlineOnly.kt index 7537f21d76e..de57444d84b 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlineOnly.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlineOnly.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun runNoInline(f: () -> Unit) = f() fun test() { @@ -9,4 +7,4 @@ fun test() { // 1 NEW kotlin/jvm/internal/Ref\$IntRef // 2 GETFIELD kotlin/jvm/internal/Ref\$IntRef\.element -// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element \ No newline at end of file +// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlneInsideChainOfInlineFuns.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlneInsideChainOfInlineFuns.kt index 3ca3d3887cd..dd70d0cae61 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlneInsideChainOfInlineFuns.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedInNoInlneInsideChainOfInlineFuns.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun runNoInline(f: () -> Unit) = f() fun test() { @@ -17,4 +15,4 @@ fun test() { // 1 NEW kotlin/jvm/internal/Ref\$IntRef // 2 GETFIELD kotlin/jvm/internal/Ref\$IntRef\.element -// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element \ No newline at end of file +// 2 PUTFIELD kotlin/jvm/internal/Ref\$IntRef\.element diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedVarsOfSize2.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedVarsOfSize2.kt index 612779bc861..209ca2934e0 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedVarsOfSize2.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/capturedVarsOfSize2.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { var xl = 0L // Long, size 2 var xi = 0 // Int, size 1 @@ -22,4 +20,4 @@ fun box(): String { return "OK" } -// 0 NEW \ No newline at end of file +// 0 NEW diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt index 009a7fc8452..475b5dd1d9b 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { run { run { @@ -29,4 +27,4 @@ fun box(): String { // 0 NEW // 0 GETFIELD -// 0 PUTFIELD \ No newline at end of file +// 0 PUTFIELD diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/withStackNormalization.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/withStackNormalization.kt index e42c6440663..c580dcb4e10 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/withStackNormalization.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/withStackNormalization.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun add(x: Int, y: Int) = x + y fun test() { @@ -11,4 +9,4 @@ fun test() { // 0 NEW // 0 GETFIELD -// 0 PUTFIELD \ No newline at end of file +// 0 PUTFIELD diff --git a/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/inRangeCheckWithConst.kt b/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/inRangeCheckWithConst.kt index b2a20820ea2..e596b35588a 100644 --- a/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/inRangeCheckWithConst.kt +++ b/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/inRangeCheckWithConst.kt @@ -1,7 +1,5 @@ -// WITH_RUNTIME - fun testPrimitiveArray(ints: IntArray) = 10 in ints.indices // 0 DUP -// 0 POP \ No newline at end of file +// 0 POP diff --git a/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/tryInlined.kt b/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/tryInlined.kt index 424a364c5bd..f818a1d30c4 100644 --- a/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/tryInlined.kt +++ b/compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/tryInlined.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test(list: List) { val result = mutableListOf() use1 { list.forEach { result.add(it) } } diff --git a/compiler/testData/codegen/bytecodeText/constCoroutine.kt b/compiler/testData/codegen/bytecodeText/constCoroutine.kt index 8b7f11f6730..a2eed33d77a 100644 --- a/compiler/testData/codegen/bytecodeText/constCoroutine.kt +++ b/compiler/testData/codegen/bytecodeText/constCoroutine.kt @@ -1,5 +1,4 @@ // !LANGUAGE: -ReleaseCoroutines -// WITH_RUNTIME // WITH_COROUTINES // TREAT_AS_ONE_FILE diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt index e4fb5f9bef7..39dea2b297c 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt index 8adcbaf733b..660b8be959b 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt index df594c61fb6..c95e3a622ac 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt index 2e3d6130fc6..2f69c82f5b4 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt index 60295fa026f..969add6338d 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt index 89af4fafa40..dab606d0c2d 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt index 19d266671fe..b51c9503d7c 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt @@ -1,9 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE -// TARGET_BACKEND: JVM + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt index 44ed3199652..86ea32b9374 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt index c5d34d6f6ed..c37f92f4306 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt @@ -1,9 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE -// TARGET_BACKEND: JVM + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt index 393337b6edc..28b35aeb946 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt @@ -1,8 +1,8 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES -import helpers.* // TREAT_AS_ONE_FILE + +import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt index 92f5b42f4bf..b014aea9f74 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt @@ -1,11 +1,10 @@ -// WITH_RUNTIME // COMMON_COROUTINES_TEST // WITH_COROUTINES +// TREAT_AS_ONE_FILE import helpers.* import COROUTINES_PACKAGE.* import COROUTINES_PACKAGE.intrinsics.* -// TREAT_AS_ONE_FILE var res = "FAIL" diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoElementVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoElementVar.kt index 65ed573b8f4..a124903ab87 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoElementVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoElementVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val arr = arrayOf("a", "b", "c", "d") fun box(): String { @@ -19,4 +17,4 @@ fun box(): String { // 0 next // 0 component1 // 0 component2 -// 1 ARRAYLENGTH \ No newline at end of file +// 1 ARRAYLENGTH diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoIndexVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoIndexVar.kt index b9281c40db9..3ea99af81a2 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoIndexVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInArrrayWithIndexNoIndexVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val arr = arrayOf("a", "b", "c", "d") fun box(): String { @@ -19,4 +17,4 @@ fun box(): String { // 0 next // 0 component1 // 0 component2 -// 1 ARRAYLENGTH \ No newline at end of file +// 1 ARRAYLENGTH diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInEmptyArrrayWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInEmptyArrrayWithIndex.kt index 0110498e519..d167719bc54 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInEmptyArrrayWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInEmptyArrrayWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val arr = intArrayOf() fun box(): String { @@ -16,4 +14,4 @@ fun box(): String { // 0 next // 0 component1 // 0 component2 -// 1 ARRAYLENGTH \ No newline at end of file +// 1 ARRAYLENGTH diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInIntArrrayWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInIntArrrayWithIndex.kt index e4f07d19361..692807ba3c2 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInIntArrrayWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInIntArrrayWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val arr = intArrayOf(10, 20, 30, 40) fun box(): String { @@ -17,4 +15,4 @@ fun box(): String { // 0 next // 0 component1 // 0 component2 -// 1 ARRAYLENGTH \ No newline at end of file +// 1 ARRAYLENGTH diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInObjectArrrayWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInObjectArrrayWithIndex.kt index e7df8239c33..d70865fad14 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInObjectArrrayWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInArrayWithIndex/forInObjectArrrayWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val arr = arrayOf("a", "b", "c", "d") fun box(): String { @@ -19,4 +17,4 @@ fun box(): String { // 0 next // 0 component1 // 0 component2 -// 1 ARRAYLENGTH \ No newline at end of file +// 1 ARRAYLENGTH diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequence.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequence.kt index d218e77e28f..75de096871b 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequence.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequence.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var s = "" for (c in "testString") { diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt index 25fa8cb750d..7faa11099ef 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val cs: CharSequence = "abcd" fun box(): String { @@ -20,4 +18,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 1 charAt \ No newline at end of file +// 1 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt index 49bdbeff981..878b67afedf 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInEmptyStringWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { for ((index, x) in "".withIndex()) { return "Loop over empty String should not be executed" @@ -14,4 +12,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 1 charAt \ No newline at end of file +// 1 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndex.kt index f79bc693b43..341545a8ae9 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { val s = StringBuilder() @@ -18,4 +16,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 1 charAt \ No newline at end of file +// 1 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt index d5b801995fe..f308f50226d 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = "abcd" fun box(): String { @@ -20,4 +18,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 0 charAt \ No newline at end of file +// 0 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt index 1aa599dc8f0..f1ab171acbc 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = "abcd" fun box(): String { @@ -20,4 +18,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 1 charAt \ No newline at end of file +// 1 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt index e23dd13b02b..624945cbf48 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = "abcd" fun useAny(x: Any) {} @@ -23,4 +21,4 @@ fun box(): String { // 0 component1 // 0 component2 // 1 length -// 1 charAt \ No newline at end of file +// 1 charAt diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCharSequenceIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCharSequenceIndices.kt index fd762ae38be..cb689fab0cc 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCharSequenceIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCharSequenceIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test(s: CharSequence): Int { var result = 0 for (i in s.indices) { @@ -16,4 +14,4 @@ fun test(s: CharSequence): Int { // 0 IF_ICMPGT // 0 IF_ICMPEQ -// 1 IF_ICMPGE \ No newline at end of file +// 1 IF_ICMPGE diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionImplicitReceiverIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionImplicitReceiverIndices.kt index d0671f45be0..121a21b847f 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionImplicitReceiverIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionImplicitReceiverIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun Collection.sumIndices(): Int { var sum = 0 for (i in indices) { @@ -16,4 +14,4 @@ fun Collection.sumIndices(): Int { // 0 IF_ICMPGT // 0 IF_ICMPEQ -// 1 IF_ICMPGE \ No newline at end of file +// 1 IF_ICMPGE diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionIndices.kt index 3bb9a771284..420e8ca8b0b 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInCollectionIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var sum = 0 for (i in listOf(0, 0, 0, 0).indices) { @@ -15,4 +13,4 @@ fun test() { // 0 IF_ICMPGT // 0 IF_ICMPEQ -// 1 IF_ICMPGE \ No newline at end of file +// 1 IF_ICMPGE diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInNonOptimizedIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInNonOptimizedIndices.kt index 11f3a5923e6..94b39a240c4 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInNonOptimizedIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInNonOptimizedIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - import kotlin.test.assertEquals fun test(coll: Collection<*>?): Int { diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInObjectArrayIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInObjectArrayIndices.kt index 3295579fc25..853fd657ae8 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInObjectArrayIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInObjectArrayIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var sum = 0 for (i in arrayOf("", "", "", "").indices) { @@ -15,4 +13,4 @@ fun test() { // 0 IF_ICMPGT // 0 IF_ICMPEQ -// 1 IF_ICMPGE \ No newline at end of file +// 1 IF_ICMPGE diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInPrimitiveArrayIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInPrimitiveArrayIndices.kt index 351599cdee1..dc2fff37d4a 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInPrimitiveArrayIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIndices/forInPrimitiveArrayIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var sum = 0 for (i in intArrayOf(0, 0, 0, 0).indices) { @@ -15,4 +13,4 @@ fun test() { // 0 IF_ICMPGT // 0 IF_ICMPEQ -// 1 IF_ICMPGE \ No newline at end of file +// 1 IF_ICMPGE diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInEmptyListWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInEmptyListWithIndex.kt index c34804b0469..198c6a578f6 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInEmptyListWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInEmptyListWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf() fun box(): String { @@ -15,4 +13,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndex.kt index 4824f633a68..c59fa671cbe 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d") fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoElementVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoElementVar.kt index 29e823d376c..df66afd4015 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoElementVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoElementVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d") fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt index 2115a067c1c..1448f7e5ebf 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d") fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt index 6abe341f2f9..d8c3d633ccc 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d") fun useAny(x: Any) {} @@ -21,4 +19,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/ForInReversedReversedRange.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/ForInReversedReversedRange.kt index b1a15e7eda4..e016f417fee 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/ForInReversedReversedRange.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/ForInReversedReversedRange.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun intRange() = 1 .. 4 @@ -27,4 +26,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedArrayIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedArrayIndices.kt index 7074d1a59f7..866cd220a02 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedArrayIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedArrayIndices.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -12,4 +11,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCharSequenceIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCharSequenceIndices.kt index 8d911d9fba7..41e920fea81 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCharSequenceIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCharSequenceIndices.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -12,4 +11,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCollectionIndices.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCollectionIndices.kt index fb32a5c9930..103374d28ae 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCollectionIndices.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedCollectionIndices.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -12,4 +11,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedDownTo.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedDownTo.kt index daa6d1ba35a..00640aba979 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedDownTo.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedDownTo.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -23,4 +22,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedEmptyRangeLiteral.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedEmptyRangeLiteral.kt index 13fe6972ea4..22a6006f7d4 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedEmptyRangeLiteral.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedEmptyRangeLiteral.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun box(): String { for (i in (4 .. 1).reversed()) { throw AssertionError("Loop should not be executed") @@ -18,4 +16,4 @@ fun box(): String { // 0 getEnd // 0 getFirst // 0 getLast -// 0 getStep \ No newline at end of file +// 0 getStep diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRange.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRange.kt index 66a1e83caa3..a0345656294 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRange.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRange.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun intRange() = 1 .. 4 @@ -27,4 +26,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRangeLiteral.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRangeLiteral.kt index 07f26f41983..ca115eb661d 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRangeLiteral.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedRangeLiteral.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -32,4 +31,4 @@ fun box(): String { // 0 IFEQ // 0 IF_ICMPEQ // 2 IF_ICMPLT -// 1 LCMP \ No newline at end of file +// 1 LCMP diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedReversedReversedRange.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedReversedReversedRange.kt index d6713087ec1..2282aa0b435 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedReversedReversedRange.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedReversedReversedRange.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun intRange() = 1 .. 4 @@ -27,4 +26,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedUntil.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedUntil.kt index cbd63d29e69..fcc004d3f6d 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedUntil.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInReversed/forInReversedUntil.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME import kotlin.test.* fun box(): String { @@ -20,4 +19,4 @@ fun box(): String { return "OK" } -// 0 reversed \ No newline at end of file +// 0 reversed diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt index b6a3adc2c6c..7c3082e8cac 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInEmptySequenceWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf().asSequence() fun box(): String { @@ -15,4 +13,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndex.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndex.kt index 6c3924cd7f2..e4242bc9457 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndex.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndex.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d").asSequence() fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt index 34e7fec0508..772797656b5 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d").asSequence() fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt index a5a3d8bc998..0b891315fb9 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d").asSequence() fun box(): String { @@ -18,4 +16,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt index 0dbad69823f..cafb197f25c 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt @@ -1,6 +1,4 @@ -// IGNORE_BACKEND: JS, NATIVE // FULL_JDK -// WITH_RUNTIME val xsl = arrayListOf("a", "b", "c", "d") val xs = xsl.asSequence() @@ -29,4 +27,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt index b7cb31d1814..b1a5a0f7eae 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - val xs = listOf("a", "b", "c", "d").asSequence() fun useAny(x: Any) {} @@ -21,4 +19,4 @@ fun box(): String { // 1 hasNext // 1 next // 0 component1 -// 0 component2 \ No newline at end of file +// 0 component2 diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInStringSpecialized.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInStringSpecialized.kt index 25ac51b7735..c882c798ce9 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInStringSpecialized.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInStringSpecialized.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { var s = "" for (c in "testString") { diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInUntil.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInUntil.kt index 37a118177a5..c3cb7b9374a 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forInUntil.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forInUntil.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test(): Int { var sum = 0 for (i in 1 until 6) { @@ -13,4 +11,4 @@ fun test(): Int { // 0 getEnd // 0 getFirst // 0 getLast -// 1 IF \ No newline at end of file +// 1 IF diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forIntInDownTo.kt b/compiler/testData/codegen/bytecodeText/forLoop/forIntInDownTo.kt index 1c73597d72b..9c6489c03e0 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/forIntInDownTo.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/forIntInDownTo.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test(): Int { var sum = 0 for (i in 4 downTo 1) { @@ -14,4 +12,4 @@ fun test(): Int { // 0 getFirst // 0 getLast // 0 IF_ICMPEQ -// 1 IF_ICMPLT \ No newline at end of file +// 1 IF_ICMPLT diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt index 3c68ea419df..f4450217429 100644 --- a/compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt +++ b/compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JVM_IR inline class Id(val id: String) @@ -26,4 +25,4 @@ fun test(password: Password) { // 1 public final static test-tmnojjU\(Ljava/lang/String;\)V // 1 public final static test-hI9h0ro\(Ljava/lang/String;\)V // 1 public final static test-75PUH38\(Ljava/lang/String;\)V -// 1 public final static test-3mN7H-Y\(Ljava/lang/String;\)V \ No newline at end of file +// 1 public final static test-3mN7H-Y\(Ljava/lang/String;\)V diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt index 9cf94a72cef..78ab535a722 100644 --- a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt +++ b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun uint(vararg us: UInt): UIntArray = us // FILE: NoBoxing.kt @@ -23,4 +21,4 @@ fun test2(nullable: UInt?, ns: Array) { // @BoxingKt.class: // 2 INVOKESTATIC kotlin.UInt\.box -// 0 INVOKEVIRTUAL kotlin.UInt.unbox \ No newline at end of file +// 0 INVOKEVIRTUAL kotlin.UInt.unbox diff --git a/compiler/testData/codegen/bytecodeText/intrinsics/javaObjectType.kt b/compiler/testData/codegen/bytecodeText/intrinsics/javaObjectType.kt index 2f4e548c4ff..a80fac6a2f4 100644 --- a/compiler/testData/codegen/bytecodeText/intrinsics/javaObjectType.kt +++ b/compiler/testData/codegen/bytecodeText/intrinsics/javaObjectType.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - class A { } diff --git a/compiler/testData/codegen/bytecodeText/intrinsics/javaPrimitiveType.kt b/compiler/testData/codegen/bytecodeText/intrinsics/javaPrimitiveType.kt index f6d6d7538c5..33ac3c27c19 100644 --- a/compiler/testData/codegen/bytecodeText/intrinsics/javaPrimitiveType.kt +++ b/compiler/testData/codegen/bytecodeText/intrinsics/javaPrimitiveType.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - class A { } diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt index f2a77803275..79f757c0152 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt @@ -1,6 +1,5 @@ // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 -// WITH_RUNTIME // FULL_JDK interface KInterface { diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt index 38a9bfc4c9f..04d4e7b0a37 100644 --- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt +++ b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt @@ -1,6 +1,5 @@ // !JVM_DEFAULT_MODE: compatibility // JVM_TARGET: 1.8 -// WITH_RUNTIME interface KInterface { diff --git a/compiler/testData/codegen/bytecodeText/kt7188.kt b/compiler/testData/codegen/bytecodeText/kt7188.kt index 63d853e0b7e..bf58c7f17b7 100644 --- a/compiler/testData/codegen/bytecodeText/kt7188.kt +++ b/compiler/testData/codegen/bytecodeText/kt7188.kt @@ -1,6 +1,3 @@ -// WITH_RUNTIME -// TARGET_BACKEND: JVM - // FILE: Dummy.kt // Empty body to trigger multifile test mode diff --git a/compiler/testData/codegen/bytecodeText/multifileClasses/optimizedMultifileClassFacadeMethods.kt b/compiler/testData/codegen/bytecodeText/multifileClasses/optimizedMultifileClassFacadeMethods.kt index 0753e91c07b..4494d82f89a 100644 --- a/compiler/testData/codegen/bytecodeText/multifileClasses/optimizedMultifileClassFacadeMethods.kt +++ b/compiler/testData/codegen/bytecodeText/multifileClasses/optimizedMultifileClassFacadeMethods.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME // KOTLIN_CONFIGURATION_FLAGS: +JVM.INHERIT_MULTIFILE_PARTS // FILE: bar.kt diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNull.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNull.kt index 1e4a4758cd8..fd188e7f7a1 100644 --- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNull.kt +++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNull.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test1() { val a = null @@ -15,4 +13,4 @@ fun test1() { // 0 IFNULL // 0 IFNONNULL // 0 X1 -// 1 X2 \ No newline at end of file +// 1 X2 diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNullInline.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNullInline.kt index 2c13b047cf3..8c78f586a57 100644 --- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNullInline.kt +++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifNullEqualsNullInline.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - // FILE: test.kt fun test1() { @@ -16,4 +14,4 @@ fun test1() { // 0 X3 // FILE: inline.kt -inline fun T?.elvis(rhs: () -> T): T = this ?: rhs() \ No newline at end of file +inline fun T?.elvis(rhs: () -> T): T = this ?: rhs() diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNull.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNull.kt index 4642a4c399a..44408837217 100644 --- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNull.kt +++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNull.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test1() { val a = Unit @@ -15,4 +13,4 @@ fun test1() { // 0 IFNULL // 0 IFNONNULL // 1 X1 -// 0 X2 \ No newline at end of file +// 0 X2 diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNullInline.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNullInline.kt index d1e1bd1e18f..7969f6a38bf 100644 --- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNullInline.kt +++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/ifUnitEqualsNullInline.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - // FILE: test.kt fun test1(): String { @@ -15,4 +13,4 @@ fun test1(): String { // FILE: inline.kt inline fun T?.mapNullable(ifNotNull: (T) -> R, ifNull: () -> R): R = - if (this == null) ifNull() else ifNotNull(this) \ No newline at end of file + if (this == null) ifNull() else ifNotNull(this) diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/kt12839.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/kt12839.kt index bed00f82766..391fdb2ec4e 100644 --- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/kt12839.kt +++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/kt12839.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test() { val value = System.getProperty("key") if (value != null) { @@ -8,4 +6,4 @@ fun test() { } // 1 IFNULL -// 0 IFNONNULL \ No newline at end of file +// 0 IFNONNULL diff --git a/compiler/testData/codegen/bytecodeText/ranges/inArrayIndices.kt b/compiler/testData/codegen/bytecodeText/ranges/inArrayIndices.kt index bc9f40442e7..d7f12b1df94 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inArrayIndices.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inArrayIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun testPrimitiveArray(i: Int, ints: IntArray) = i in ints.indices fun testObjectArray(i: Int, xs: Array) = i in xs.indices @@ -13,4 +11,4 @@ fun testLongWithObjectArray(i: Long, xs: Array) = i in xs.indices // 2 I2L // 4 ARRAYLENGTH // 2 LCONST_0 -// 6 ICONST_0 \ No newline at end of file +// 6 ICONST_0 diff --git a/compiler/testData/codegen/bytecodeText/ranges/inCharSequenceIndices.kt b/compiler/testData/codegen/bytecodeText/ranges/inCharSequenceIndices.kt index cbc50b4efb1..2ea100e61d6 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inCharSequenceIndices.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inCharSequenceIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun testCharSequence(i: Int, cs: CharSequence) = i in cs.indices fun testLongWithCharSequence(i: Long, cs: CharSequence) = i in cs.indices diff --git a/compiler/testData/codegen/bytecodeText/ranges/inCollectionIndices.kt b/compiler/testData/codegen/bytecodeText/ranges/inCollectionIndices.kt index a426af13d85..2426d4cf79e 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inCollectionIndices.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inCollectionIndices.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun testCollection(i: Int, xs: List) = i in xs.indices fun testLongWithCollection(i: Long, xs: List) = i in xs.indices diff --git a/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeIntrinsified.kt b/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeIntrinsified.kt index 7932876e8a1..b952fa6de1d 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeIntrinsified.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeIntrinsified.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun inInt(x: Long): Boolean { return x in 1..2 } diff --git a/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeNotIntrinsified.kt b/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeNotIntrinsified.kt index c37186c1150..d96085a9fb5 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeNotIntrinsified.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inNonMatchingRangeNotIntrinsified.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun byteInFloat(x: Byte, a: Float, b: Float) = x in a .. b fun byteInDouble(x: Byte, a: Double, b: Double) = x in a .. b fun shortInFloat(x: Short, a: Float, b: Float) = x in a .. b diff --git a/compiler/testData/codegen/bytecodeText/ranges/inOptimizableRange.kt b/compiler/testData/codegen/bytecodeText/ranges/inOptimizableRange.kt index de9df165820..b2ed83f3408 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inOptimizableRange.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inOptimizableRange.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun Byte.inByte(left: Byte, right: Byte) = this in left..right fun Short.inInt(left: Int, right: Int) = this in left .. right diff --git a/compiler/testData/codegen/bytecodeText/ranges/inUntil.kt b/compiler/testData/codegen/bytecodeText/ranges/inUntil.kt index 5d6ab9a476c..9f72a9a2d7c 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/inUntil.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/inUntil.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun testByte(a: Byte, x: Byte, y: Byte) = a in x until y fun testShort(a: Short, x: Short, y: Short) = a in x until y @@ -9,4 +7,4 @@ fun testInt(a: Int, x: Int, y: Int) = a in x until y fun testLong(a: Long, x: Long, y: Long) = a in x until y // 0 until -// 0 INVOKEVIRTUAL \ No newline at end of file +// 0 INVOKEVIRTUAL diff --git a/compiler/testData/codegen/bytecodeText/ranges/noDupXForLiteralRangeContains.kt b/compiler/testData/codegen/bytecodeText/ranges/noDupXForLiteralRangeContains.kt index 96912848084..9e2428ef4cb 100644 --- a/compiler/testData/codegen/bytecodeText/ranges/noDupXForLiteralRangeContains.kt +++ b/compiler/testData/codegen/bytecodeText/ranges/noDupXForLiteralRangeContains.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun test(a: Int) = a in 1 .. 10 fun test(a: Long) = a in 1L .. 10L fun test(a: Float) = a in 1.0f .. 10.0f @@ -9,4 +7,4 @@ fun test(a: String) = a in "abc" .. "def" // 0 DUP_X1 // 0 DUP2_X1 // 0 DUP_X2 -// 0 DUP2_X2 \ No newline at end of file +// 0 DUP2_X2 diff --git a/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullInitialization.kt b/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullInitialization.kt index 79753dcc970..720826b1179 100644 --- a/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullInitialization.kt +++ b/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullInitialization.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME // FILE: JFoo.java import org.jetbrains.annotations.Nullable; @@ -23,4 +22,4 @@ fun test() { // 1 INVOKESPECIAL TestKt\$test\$1. // 0 IFNONNULL // 0 IFNULL -// 1 ACONST_NULL \ No newline at end of file +// 1 ACONST_NULL diff --git a/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt b/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt index 1df803ea0ff..741dd5beb09 100644 --- a/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt +++ b/compiler/testData/codegen/bytecodeText/sam/samWrapperForNullableInitialization.kt @@ -1,4 +1,3 @@ -// WITH_RUNTIME // FILE: JFoo.java import org.jetbrains.annotations.Nullable; @@ -21,4 +20,4 @@ fun test() { // 2 NEW // 0 IFNONNULL // 1 IFNULL -// 1 ACONST_NULL \ No newline at end of file +// 1 ACONST_NULL diff --git a/compiler/testData/codegen/bytecodeText/when/kt18818.kt b/compiler/testData/codegen/bytecodeText/when/kt18818.kt index e6ddb213f42..225a7f05cf2 100644 --- a/compiler/testData/codegen/bytecodeText/when/kt18818.kt +++ b/compiler/testData/codegen/bytecodeText/when/kt18818.kt @@ -1,5 +1,3 @@ -// WITH_RUNTIME - fun findUserId(username: String): Long? = null fun main(args: Array) { @@ -11,4 +9,4 @@ fun main(args: Array) { } } -// 0 areEqual \ No newline at end of file +// 0 areEqual diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt index 0a6b5a9f099..c8f069afd9b 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt @@ -60,8 +60,8 @@ fun parseLanguageVersionSettings(directiveMap: Map): CompilerTes val skipMetadataVersionCheck = AnalysisFlags.skipMetadataVersionCheck to directiveMap.containsKey(SKIP_METADATA_VERSION_CHECK) val allowResultReturnType = AnalysisFlags.allowResultReturnType to directiveMap.containsKey(ALLOW_RESULT_RETURN_TYPE) - if (apiVersionString == null && languageFeaturesString == null && experimental == null && - useExperimental == null && !ignoreDataFlowInAssert.second && !allowResultReturnType.second + if (apiVersionString == null && languageFeaturesString == null && experimental == null && useExperimental == null && + !ignoreDataFlowInAssert.second && enableJvmDefault == null && !skipMetadataVersionCheck.second && !allowResultReturnType.second ) { return null }