From 70f0f357fa9d1a4e0d385c699630ae420c196ff8 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 23 Jun 2020 16:01:10 +0300 Subject: [PATCH] Remove IGNORE_FIR from stepped ranges tests --- .../downTo/maxValueToMinValueStepMaxValue.kt | 1 - .../expression/downTo/maxValueToOneStepMaxValue.kt | 1 - .../downTo/maxValueToZeroStepMaxValue.kt | 1 - .../rangeTo/minValueToMaxValueStepMaxValue.kt | 1 - .../rangeTo/oneToMaxValueStepMaxValue.kt | 1 - .../rangeTo/zeroToMaxValueStepMaxValue.kt | 1 - .../expression/until/emptyProgressionToMinValue.kt | 1 - .../until/minValueToMaxValueStepMaxValue.kt | 1 - .../expression/until/zeroToMaxValueStepMaxValue.kt | 1 - .../downTo/maxValueToMinValueStepMaxValue.kt | 1 - .../literal/downTo/maxValueToOneStepMaxValue.kt | 1 - .../literal/downTo/maxValueToZeroStepMaxValue.kt | 1 - .../rangeTo/minValueToMaxValueStepMaxValue.kt | 1 - .../literal/rangeTo/oneToMaxValueStepMaxValue.kt | 1 - .../literal/rangeTo/zeroToMaxValueStepMaxValue.kt | 1 - .../literal/until/emptyProgressionToMinValue.kt | 1 - .../until/minValueToMaxValueStepMaxValue.kt | 1 - .../literal/until/zeroToMaxValueStepMaxValue.kt | 1 - .../tests/GenerateSteppedRangesCodegenTestData.kt | 14 -------------- 19 files changed, 32 deletions(-) diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt index e4c22919325..0a341b4bbac 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToMinValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt index 58d435bead2..ccfc49f2816 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToOneStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt index e42bbc19148..795ecc71c92 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/downTo/maxValueToZeroStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt index 4e2fd4ee4fb..dca73f8d250 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/minValueToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt index 354ad00b92c..4c3cc84c351 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/oneToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt index 91b04f0eb61..506d39a0f3f 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/rangeTo/zeroToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt index 0ec8b6ca3c4..94ef50aa51f 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/emptyProgressionToMinValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt index 29eb55a07bd..790f63c3b3e 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/minValueToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt index 92402cd59e8..eaee238aa7a 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/expression/until/zeroToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt index a48720ea230..4aa1ce62319 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToMinValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt index 9d640e38519..b81147e54ba 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToOneStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt index ed5fbd896d8..ebed1788519 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/downTo/maxValueToZeroStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt index a81d7200d04..22b379be03a 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/minValueToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt index f0f50661d03..05cd6325a82 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/oneToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt index aaaefcf9373..64736ef6357 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/rangeTo/zeroToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt index 32a5c055746..a73ff83bb51 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/emptyProgressionToMinValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt index db262305f55..63fee4f0f1c 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/minValueToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt index 6695ccd9d71..f6d8a91b8e7 100644 --- a/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/stepped/unsigned/literal/until/zeroToMaxValueStepMaxValue.kt @@ -1,5 +1,4 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME import kotlin.test.* diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt index ca197d9762c..cc8afc8a765 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt @@ -17,15 +17,6 @@ object GenerateSteppedRangesCodegenTestData { |// KT-34166: Translation of loop over literal completely removes the validation of step |// DONT_TARGET_EXACT_BACKEND: JS""".trimMargin() private val KT_34166_AFFECTED_FILENAMES = setOf("illegalStepZero.kt", "illegalStepNegative.kt", "illegalStepNonConst.kt") - private val FIR_FAILING_FOR_UNSIGNED_FILENAMES = setOf( - "emptyProgressionToMinValue.kt", - "maxValueToMinValueStepMaxValue.kt", - "maxValueToOneStepMaxValue.kt", - "maxValueToZeroStepMaxValue.kt", - "minValueToMaxValueStepMaxValue.kt", - "oneToMaxValueStepMaxValue.kt", - "zeroToMaxValueStepMaxValue.kt" - ) private val JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES = setOf() @@ -172,7 +163,6 @@ object GenerateSteppedRangesCodegenTestData { extraCode: String?, fullSubdir: File, asLiteral: Boolean, - shouldIgnoreForFIR: Boolean = false, shouldIgnoreForJvmIR: Boolean = false ) { fullSubdir.mkdirs() @@ -182,9 +172,6 @@ object GenerateSteppedRangesCodegenTestData { if (shouldIgnoreForJvmIR) { println("// IGNORE_BACKEND: JVM_IR") } - if (shouldIgnoreForFIR) { - println("// IGNORE_BACKEND_FIR: JVM_IR") - } println("// KJS_WITH_FULL_RUNTIME") println("// WITH_RUNTIME") if (asLiteral && KT_34166_AFFECTED_FILENAMES.contains(fileName)) { @@ -231,7 +218,6 @@ object GenerateSteppedRangesCodegenTestData { extraCode, File(UNSIGNED_TEST_DATA_DIR, fullSubdirPath), asLiteral, - shouldIgnoreForFIR = fileName in FIR_FAILING_FOR_UNSIGNED_FILENAMES, shouldIgnoreForJvmIR = fileName in JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES, ) }