From f7164404c9a8b3569a0e65b9d5931a12fd6f8859 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Wed, 11 Nov 2020 08:11:21 +0100 Subject: [PATCH] IC mangling: Ignore FIR tests --- .../hiddenConstructor/kt28855.kt | 1 + .../codegen/box/ranges/forInUntil/kt42533.kt | 1 + .../rangeTo/minValueToMaxValueStepMaxValue.kt | 1 + .../rangeTo/zeroToMaxValueStepMaxValue.kt | 1 + .../until/minValueToMaxValueStepMaxValue.kt | 1 + .../until/zeroToMaxValueStepMaxValue.kt | 1 + .../rangeTo/minValueToMaxValueStepMaxValue.kt | 1 + .../rangeTo/zeroToMaxValueStepMaxValue.kt | 1 + .../until/minValueToMaxValueStepMaxValue.kt | 1 + .../until/zeroToMaxValueStepMaxValue.kt | 1 + .../expression/inexactDownToMinValue.kt | 1 + .../unsigned/expression/inexactToMaxValue.kt | 1 + .../expression/maxValueMinusTwoToMaxValue.kt | 1 + .../expression/progressionDownToMinValue.kt | 1 + .../progressionMaxValueMinusTwoToMaxValue.kt | 1 + .../simpleRangeWithNonConstantEnds.kt | 1 + .../ranges/unsigned/inMixedUnsignedRange.kt | 1 + .../codegen/box/ranges/unsigned/kt35004.kt | 1 + .../unsigned/literal/inexactDownToMinValue.kt | 1 + .../unsigned/literal/inexactToMaxValue.kt | 1 + .../literal/maxValueMinusTwoToMaxValue.kt | 1 + .../literal/progressionDownToMinValue.kt | 1 + .../progressionMaxValueMinusTwoToMaxValue.kt | 1 + .../literal/simpleRangeWithNonConstantEnds.kt | 1 + .../progressionExpression.kt | 1 + .../nullableLoopParameter/rangeExpression.kt | 1 + .../nullableLoopParameter/rangeLiteral.kt | 1 + .../unsigned/outOfBoundsInMixedContains.kt | 1 + .../call/inlineClasses/suspendFunction.kt | 1 + ...spendFunctionWithInlineClassInSignature.kt | 1 + .../checkBasicUnsignedLiterals.kt | 1 + .../box/unsignedTypes/forInUnsignedDownTo.kt | 1 + .../unsignedTypes/forInUnsignedProgression.kt | 1 + .../box/unsignedTypes/forInUnsignedRange.kt | 1 + .../forInUnsignedRangeLiteral.kt | 1 + .../forInUnsignedRangeWithCoercion.kt | 1 + .../box/unsignedTypes/forInUnsignedUntil.kt | 1 + .../box/unsignedTypes/inUnsignedDownTo.kt | 1 + .../box/unsignedTypes/inUnsignedRange.kt | 1 + .../unsignedTypes/inUnsignedRangeLiteral.kt | 1 + .../box/unsignedTypes/inUnsignedUntil.kt | 1 + .../iterateOverArrayOfUnsignedValues.kt | 1 + .../iterateOverListOfBoxedUnsignedValues.kt | 1 + .../codegen/box/unsignedTypes/kt25784.kt | 1 + .../box/unsignedTypes/unsignedIntDivide.kt | 1 + .../box/unsignedTypes/unsignedIntRemainder.kt | 1 + .../box/unsignedTypes/unsignedLongDivide.kt | 1 + .../unsignedTypes/unsignedLongRemainder.kt | 1 + ...unsignedTypeValuesInsideStringTemplates.kt | 1 + .../unsignedTypes/varargsOfUnsignedTypes.kt | 1 + .../unsignedTypes/unsignedIntDivide_jvm18.kt | 1 + .../unsignedIntRemainder_jvm18.kt | 1 + .../unsignedTypes/unsignedLongDivide_jvm18.kt | 1 + .../unsignedLongRemainder_jvm18.kt | 1 + .../tests/GenerateRangesCodegenTestData.java | 33 ++++++++++++++++--- .../GenerateSteppedRangesCodegenTestData.kt | 8 ++++- .../IrCodegenBoxWasmTestGenerated.java | 5 +++ 57 files changed, 94 insertions(+), 6 deletions(-) diff --git a/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt b/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt index fcb0e09e436..e4a455fc25f 100644 --- a/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt +++ b/compiler/testData/codegen/box/inlineClasses/hiddenConstructor/kt28855.kt @@ -3,6 +3,7 @@ // !LANGUAGE: +InlineClasses // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR class C(val x: T, vararg ys: UInt) { val y0 = ys[0] diff --git a/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt b/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt index dd0029787d2..a30811ac523 100644 --- a/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt +++ b/compiler/testData/codegen/box/ranges/forInUntil/kt42533.kt @@ -1,6 +1,7 @@ // IGNORE_BACKEND: JVM // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { // These should all be empty progressions 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 7caf0799450..cca600f7978 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 70570b7635e..4742793e487 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 47c8b668b7c..029c2a7f1f1 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 77d8af8ac20..8e497d8c87f 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 4057dfb2d0f..6817190c2e4 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 364c2a26286..84ffb855caa 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 e7dd4bea0a9..f6a123b665c 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME 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 71a852c16fe..923acc19271 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,4 +1,5 @@ // Auto-generated by GenerateSteppedRangesCodegenTestData. Do not edit! +// IGNORE_BACKEND_FIR: JVM_IR // DONT_TARGET_EXACT_BACKEND: WASM // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt index 174c6ac583f..550f022afd6 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactDownToMinValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt index 67d3c78628c..86183e986c7 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/inexactToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt index 1afbcf9d366..978bcb6f6ba 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/maxValueMinusTwoToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt index 44a451225e6..8977a3ef132 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionDownToMinValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt index fe5b3c8cb68..e050dcebcd0 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/progressionMaxValueMinusTwoToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt index d744d23e068..c494d4de955 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/expression/simpleRangeWithNonConstantEnds.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR diff --git a/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt b/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt index 132819b96ae..b23d54112ce 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/inMixedUnsignedRange.kt @@ -1,5 +1,6 @@ // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun ub_ub(x: UByte, a: UByte, b: UByte) = x in a..b fun ub_us(x: UByte, a: UShort, b: UShort) = x in a..b diff --git a/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt b/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt index d8e6459244d..ecee127b474 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/kt35004.kt @@ -1,5 +1,6 @@ // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun ULong.foobar() = when (this) { diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt index 59f538569ed..05fe26a6910 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactDownToMinValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt index 7ea406af627..e54e1f2b1ba 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/inexactToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt index 7bdadad10be..08a859d88ac 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/maxValueMinusTwoToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt index 171cf47fa8f..e77dc07fd19 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionDownToMinValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt index 1325586e0a0..eb0811ee620 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/progressionMaxValueMinusTwoToMaxValue.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val MaxUI = UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt index 2ec1bfab108..4e59b76f35e 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/literal/simpleRangeWithNonConstantEnds.kt @@ -2,6 +2,7 @@ // KJS_WITH_FULL_RUNTIME // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT! // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt index e6be182814b..4a9d45bb045 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/progressionExpression.kt @@ -3,6 +3,7 @@ // IGNORE_LIGHT_ANALYSIS // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { var result = 0u diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt index bef0270964f..720130b8084 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeExpression.kt @@ -3,6 +3,7 @@ // IGNORE_LIGHT_ANALYSIS // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { var result = 0u diff --git a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt index f1646d783e0..850050f8e40 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/nullableLoopParameter/rangeLiteral.kt @@ -3,6 +3,7 @@ // IGNORE_LIGHT_ANALYSIS // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { var result = 0u diff --git a/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt b/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt index 99830393053..ef200ef7e00 100644 --- a/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt +++ b/compiler/testData/codegen/box/ranges/unsigned/outOfBoundsInMixedContains.kt @@ -1,5 +1,6 @@ // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun testIn(x: ULong) = x in UInt.MIN_VALUE..UInt.MAX_VALUE diff --git a/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt b/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt index f41c33180e6..f5009338eef 100644 --- a/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt +++ b/compiler/testData/codegen/box/reflection/call/inlineClasses/suspendFunction.kt @@ -1,6 +1,7 @@ // TARGET_BACKEND: JVM // WITH_REFLECT // WITH_COROUTINES +// IGNORE_BACKEND_FIR: JVM_IR package test diff --git a/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt b/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt index fea4c73c5d3..df54d7999c2 100644 --- a/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt +++ b/compiler/testData/codegen/box/reflection/mapping/inlineClasses/suspendFunctionWithInlineClassInSignature.kt @@ -1,5 +1,6 @@ // TARGET_BACKEND: JVM // WITH_REFLECT +// IGNORE_BACKEND_FIR: JVM_IR package test diff --git a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt index 0950cc04632..b6f577af500 100644 --- a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt +++ b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { val good = 42.toUInt() diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt index 3ecb162d576..9bfd25fba24 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedDownTo.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt index 92035351c45..7e19fe5610b 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedProgression.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt index 7a88f58a014..7884c066cce 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRange.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt index aaefd703764..828605c752d 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeLiteral.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt index 86ef6034e61..d18f1b00de4 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedRangeWithCoercion.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val UB_MAX = UByte.MAX_VALUE val UB_START = (UB_MAX - 10u).toUByte() diff --git a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt index 8468e31d528..10c81177a1a 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forInUnsignedUntil.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt index c87972db022..8d3a75a8a1b 100644 --- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt +++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedDownTo.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_COLLECTIONS // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt index f87d766e4fa..9ebf6e83f73 100644 --- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt +++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRange.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt index 5b0cc5eab28..47cdcd81f87 100644 --- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt +++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedRangeLiteral.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt b/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt index df040cb2512..c1eda749a21 100644 --- a/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt +++ b/compiler/testData/codegen/box/unsignedTypes/inUnsignedUntil.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MaxUI = UInt.MAX_VALUE const val MinUI = UInt.MIN_VALUE diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt index 75c87d38f30..52aa896b8a3 100644 --- a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt +++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: UNSIGNED_ARRAYS // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { var sum = 0u diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt index fdd7ee8188a..0aaf9aa8006 100644 --- a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt +++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { var sum = 0u diff --git a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt index e7dc0265f04..2fd166341e2 100644 --- a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt +++ b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: PROPERTY_REFERENCES // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR import kotlin.reflect.KProperty import kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt index 0f2412922a2..8ff522f2cc0 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedIntDivide.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234U val ub = 5678U diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt index 5052b82ebea..f94a54880c2 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedIntRemainder.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234U val ub = 5678U diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt index c9436d97084..5fb5226ab2b 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLongDivide.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234UL val ub = 5678UL diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt index 09ca73b544d..254e71c600a 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLongRemainder.kt @@ -1,5 +1,6 @@ // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234UL val ub = 5678UL diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt index 32b0ffc28d2..a59aec5f3ad 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: STDLIB_TEXT // KJS_WITH_FULL_RUNTIME // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR const val MAX_BYTE: UByte = 0xFFu const val HUNDRED: UByte = 100u diff --git a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt index b37a7918758..bf1ebbbace5 100644 --- a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt +++ b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt @@ -2,6 +2,7 @@ // WASM_MUTE_REASON: SPREAD_OPERATOR // WITH_RUNTIME // KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR fun uint(vararg us: UInt): UIntArray = us diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt index 6765deea354..ac0308002e3 100644 --- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt +++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntDivide_jvm18.kt @@ -1,5 +1,6 @@ // JVM_TARGET: 1.8 // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234U val ub = 5678U diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt index cd5135f232b..ea97267b2a9 100644 --- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt +++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedIntRemainder_jvm18.kt @@ -1,5 +1,6 @@ // JVM_TARGET: 1.8 // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234U val ub = 5678U diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt index 795efb5e002..bf85cd0126c 100644 --- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt +++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongDivide_jvm18.kt @@ -1,5 +1,6 @@ // JVM_TARGET: 1.8 // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234UL val ub = 5678UL diff --git a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt index de7b81bb0ed..15a7aba6f8a 100644 --- a/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt +++ b/compiler/testData/codegen/bytecodeText/unsignedTypes/unsignedLongRemainder_jvm18.kt @@ -1,5 +1,6 @@ // JVM_TARGET: 1.8 // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR val ua = 1234UL val ub = 5678UL diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java index 203aa9a96d8..286cb0ce251 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java @@ -74,6 +74,24 @@ public class GenerateRangesCodegenTestData { private static final List JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS = Collections.emptyList(); + private static final List FIR_FAILING_UNSIGNED_LITERAL_TESTS = new ArrayList() {{ + add("inexactDownToMinValue"); + add("progressionMaxValueMinusTwoToMaxValue"); + add("inexactToMaxValue"); + add("simpleRangeWithNonConstantEnds"); + add("maxValueMinusTwoToMaxValue"); + add("progressionDownToMinValue"); + }}; + + private static final List FIR_FAILING_UNSIGNED_EXPRESSION_TESTS = new ArrayList() {{ + add("inexactDownToMinValue"); + add("progressionMaxValueMinusTwoToMaxValue"); + add("inexactToMaxValue"); + add("simpleRangeWithNonConstantEnds"); + add("maxValueMinusTwoToMaxValue"); + add("progressionDownToMinValue"); + }}; + static { for (String integerType : INTEGER_PRIMITIVES) { String suffix = integerType.substring(0, integerType.startsWith("U") ? 2 : 1); @@ -138,7 +156,7 @@ public class GenerateRangesCodegenTestData { out.printf("// IGNORE_BACKEND: %s%n%n", backendName); } - private static void writeToFile(File file, String generatedBody, boolean isForUnsigned, boolean ignoreJvmIR) { + private static void writeToFile(File file, String generatedBody, boolean isForUnsigned, boolean ignoreJvmIR, boolean ignoreFir) { PrintWriter out; try { //noinspection IOResourceOpenedButNotSafelyClosed @@ -155,6 +173,9 @@ public class GenerateRangesCodegenTestData { out.println("// KJS_WITH_FULL_RUNTIME"); out.println("// Auto-generated by " + GenerateRangesCodegenTestData.class.getName() + ". DO NOT EDIT!"); out.println("// WITH_RUNTIME"); + if (ignoreFir) { + out.println("// IGNORE_BACKEND_FIR: JVM_IR"); + } out.println(); // Import min/max values, but only in case when the generated test case actually uses them (not to clutter tests which don't) out.println(); @@ -233,12 +254,14 @@ public class GenerateRangesCodegenTestData { } String fileName = testFunName + ".kt"; - 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(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false, false); + writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false, false); writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true, - JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName)); + JVM_IR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName), + FIR_FAILING_UNSIGNED_LITERAL_TESTS.contains(testFunName)); writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true, - JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName)); + JVM_IR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName), + FIR_FAILING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName)); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt index e51a37c8d35..df4db69e05d 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt @@ -19,6 +19,7 @@ object GenerateSteppedRangesCodegenTestData { private val KT_34166_AFFECTED_FILENAMES = setOf("illegalStepZero.kt", "illegalStepNegative.kt", "illegalStepNonConst.kt") private val JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES = setOf() + private val FIR_FAILING_FOR_UNSIGNED_FILENAMES = setOf("minValueToMaxValueStepMaxValue.kt", "zeroToMaxValueStepMaxValue.kt") private enum class Type(val type: String, val isLong: Boolean = false, val isUnsigned: Boolean = false) { INT("Int"), @@ -163,12 +164,16 @@ object GenerateSteppedRangesCodegenTestData { extraCode: String?, fullSubdir: File, asLiteral: Boolean, - shouldIgnoreForJvmIR: Boolean = false + shouldIgnoreForJvmIR: Boolean = false, + shouldIgnoreForFir: Boolean = false, ) { fullSubdir.mkdirs() PrintWriter(File(fullSubdir, fileName)).use { with(it) { println("// $PREAMBLE_MESSAGE") + if (shouldIgnoreForFir) { + println("// IGNORE_BACKEND_FIR: JVM_IR") + } if (shouldIgnoreForJvmIR) { println("// IGNORE_BACKEND: JVM_IR") } @@ -220,6 +225,7 @@ object GenerateSteppedRangesCodegenTestData { File(UNSIGNED_TEST_DATA_DIR, fullSubdirPath), asLiteral, shouldIgnoreForJvmIR = fileName in JVM_IR_FAILING_FOR_UNSIGNED_FILENAMES, + shouldIgnoreForFir = fileName in FIR_FAILING_FOR_UNSIGNED_FILENAMES, ) } if (signedTests.isNotEmpty()) { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index 308270614c8..ddd4a2aa919 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -6867,6 +6867,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt"); } + @TestMetadata("overrideGenericWithInlineClass.kt") + public void testOverrideGenericWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithInlineClass.kt"); + } + @TestMetadata("overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt") public void testOverrideGenericWithNullableInlineClassUpperBoundWithNonNullAny() throws Exception { runTest("compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullAny.kt");