From c80cf0f34c7ee3feac8218b04cd76125471770ad Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 23 Jun 2020 16:13:05 +0300 Subject: [PATCH] Remove IGNORE_FIR from ranges tests --- .../expression/inexactDownToMinValue.kt | 1 - .../unsigned/expression/inexactToMaxValue.kt | 1 - .../expression/maxValueMinusTwoToMaxValue.kt | 1 - .../unsigned/expression/maxValueToMaxValue.kt | 1 - .../unsigned/expression/maxValueToMinValue.kt | 1 - .../expression/overflowZeroDownToMaxValue.kt | 1 - .../expression/overflowZeroToMinValue.kt | 1 - .../expression/progressionDownToMinValue.kt | 1 - .../progressionMaxValueMinusTwoToMaxValue.kt | 1 - .../progressionMaxValueToMaxValue.kt | 1 - .../progressionMaxValueToMinValue.kt | 1 - .../progressionMinValueToMinValue.kt | 1 - .../unsigned/literal/inexactDownToMinValue.kt | 1 - .../unsigned/literal/inexactToMaxValue.kt | 1 - .../literal/maxValueMinusTwoToMaxValue.kt | 1 - .../unsigned/literal/maxValueToMaxValue.kt | 1 - .../unsigned/literal/maxValueToMinValue.kt | 1 - .../literal/overflowZeroDownToMaxValue.kt | 1 - .../literal/overflowZeroToMinValue.kt | 1 - .../literal/progressionDownToMinValue.kt | 1 - .../progressionMaxValueMinusTwoToMaxValue.kt | 1 - .../literal/progressionMaxValueToMaxValue.kt | 1 - .../literal/progressionMaxValueToMinValue.kt | 1 - .../literal/progressionMinValueToMinValue.kt | 1 - .../tests/GenerateRangesCodegenTestData.java | 19 +++---------------- 25 files changed, 3 insertions(+), 40 deletions(-) diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt index e2d90ab3cb9..d43ba6d4652 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt index 1716905b87d..8c794e7d4f6 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt index 26e594b5383..579e3be543f 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt index b6e836795fd..2c88864ac77 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt index 7a78a1b18e5..63745bd3d90 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt index 19467700b96..4c70ced7329 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroDownToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt index 2e4a8df63b8..89908433718 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/overflowZeroToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt index 89b684d4bb7..0b90405bfd4 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt index 75ad078d1a5..f70eaee198c 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt index b726ddbb685..a6c25211423 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt index 1947bd24b45..2368596c365 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt index dee4580c76e..de7fdbe1e7e 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMinValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt index e644d391431..bb65ba00cc2 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt index 7044e54df90..dfdb4a1919f 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt index f885586a362..10f09c3b70a 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt index 716eda2c0f9..34b4daacf3c 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt index defaefe21dd..43fe095383e 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt index 06398817154..ca316ecc117 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroDownToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt index 365f566d307..2aa249dcce1 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/overflowZeroToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt index b484b56607d..4e49739b63e 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt index 81918991294..aa4fee1c142 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt index a4dac2ad144..96d34f4b348 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMaxValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt index 068a68e2983..90b44046e20 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt index 1803e9e4e6b..e1f306f3d0c 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMinValueToMinValue.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java index 090eef3d96d..80af28f8e06 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java @@ -70,14 +70,6 @@ public class GenerateRangesCodegenTestData { private static final Map ELEMENT_TYPE_KNOWN_SUBSTRINGS = new HashMap<>(); private static final Map MIN_MAX_CONSTANTS = new LinkedHashMap<>(); - private static final List FIR_FAILING_UNSIGNED_LITERAL_TESTS = - Arrays.asList("inexactDownToMinValue", "inexactToMaxValue", "maxValueMinusTwoToMaxValue", "maxValueToMaxValue", - "maxValueToMinValue", "overflowZeroDownToMaxValue", "overflowZeroToMinValue", "progressionDownToMinValue", - "progressionMaxValueMinusTwoToMaxValue", "progressionMaxValueToMaxValue", "progressionMaxValueToMinValue", - "progressionMinValueToMinValue"); - - private static final List FIR_FAILING_UNSIGNED_EXPRESSION_TESTS = FIR_FAILING_UNSIGNED_LITERAL_TESTS; - private static final List JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS = Collections.emptyList(); private static final List JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS = Collections.emptyList(); @@ -146,7 +138,7 @@ public class GenerateRangesCodegenTestData { out.printf("// IGNORE_BACKEND: %s%n%n", backendName); } - private static void writeToFile(File file, String generatedBody, boolean isForUnsigned, boolean ignoreFrontendIR, boolean ignoreJvmIR) { + private static void writeToFile(File file, String generatedBody, boolean isForUnsigned, boolean ignoreJvmIR) { PrintWriter out; try { //noinspection IOResourceOpenedButNotSafelyClosed @@ -159,9 +151,6 @@ public class GenerateRangesCodegenTestData { if (ignoreJvmIR) { out.println("// IGNORE_BACKEND: JVM_IR"); } - if (ignoreFrontendIR) { - out.println("// IGNORE_BACKEND_FIR: JVM_IR"); - } out.println("// KJS_WITH_FULL_RUNTIME"); out.println("// Auto-generated by " + GenerateRangesCodegenTestData.class.getName() + ". DO NOT EDIT!"); out.println("// WITH_RUNTIME"); @@ -241,13 +230,11 @@ public class GenerateRangesCodegenTestData { } String fileName = testFunName + ".kt"; - writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false, false); - writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false, false); + writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false); + writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false); writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true, - FIR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName), JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName)); writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true, - FIR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName), JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName)); } }