diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index 12f0d59f932..e5016b6851c 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -42460,6 +42460,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @Test + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @Test @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt index 9f57b5dc3d8..1fb919861df 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt @@ -52,6 +52,7 @@ class ConstLowering(val context: JvmBackendContext) : IrElementTransformerVoid() private fun IrExpression.lowerConstRead(receiver: IrExpression?, field: IrField?): IrExpression? { val value = field?.constantValue() ?: return null + transformChildrenVoid() val resultExpression = if (context.state.shouldInlineConstVals) value.copyWithOffsets(startOffset, endOffset) else diff --git a/compiler/testData/codegen/box/unsignedTypes/kt47716.kt b/compiler/testData/codegen/box/unsignedTypes/kt47716.kt new file mode 100644 index 00000000000..1e3a6c46bae --- /dev/null +++ b/compiler/testData/codegen/box/unsignedTypes/kt47716.kt @@ -0,0 +1,12 @@ +// IGNORE_BACKEND: WASM +// WITH_RUNTIME + +fun box(): String { + val r = + try { + ULong + } finally { + UInt.MAX_VALUE + }.MAX_VALUE + return if (r == ULong.MAX_VALUE) "OK" else "FAIL" +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index afab9f9c7a2..1479994f547 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -42418,6 +42418,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @Test + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @Test @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 1ab56bb8a84..040d1df8697 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -42460,6 +42460,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @Test + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @Test @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 60e4d249d9f..3c56cf51476 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -34180,6 +34180,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java index 76a7de68379..8430191ba3e 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java @@ -28460,6 +28460,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 2ea7ee15434..20fc0409a05 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -27866,6 +27866,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 66ac62a0437..140b6deb7ae 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -27826,6 +27826,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index 689ed59da20..83733bc47c5 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -15849,6 +15849,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/unsignedTypes/kt43286a.kt"); } + @TestMetadata("kt47716.kt") + public void testKt47716() throws Exception { + runTest("compiler/testData/codegen/box/unsignedTypes/kt47716.kt"); + } + @TestMetadata("literalEqualsNullableUnsigned.kt") public void testLiteralEqualsNullableUnsigned() throws Exception { runTest("compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt");