azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR2IR] Fix unwrapping of single-statement blocks

Browse Source 
Unwrapping should be done with respect to `forceUnitType` parameter.

^KT-65019: Fixed
This commit is contained in:
vladislav.grechko
2024-01-16 14:16:46 +01:00
committed by Space Team
parent 5b7478c0a6
commit 8b1d87848d
22 changed files with 132 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -19726,6 +19726,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -19726,6 +19726,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+1 -1
View File
@@ -1146,7 +1146,7 @@ class Fir2IrVisitor(
} else {
val irStatements = mapToIrStatements()
val singleStatement = irStatements.singleOrNull()
if (origin?.isLoop != true && singleStatement is IrBlock &&
if (singleStatement is IrBlock && (!forceUnitType || singleStatement.type.isUnit()) &&
(singleStatement.origin == IrStatementOrigin.POSTFIX_INCR || singleStatement.origin == IrStatementOrigin.POSTFIX_DECR)
) {
singleStatement
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/testData/codegen/box/finally/decrementInFinally.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
fun box(): String {
var variable = 0
try {
try {
null!!
} finally {
variable--
}
} catch (e: NullPointerException) {
return if (variable == -1) "OK" else "Fail"
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18609,6 +18609,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -19455,6 +19455,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -16237,6 +16237,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/finallyAndFinally.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14607,6 +14607,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14607,6 +14607,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14607,6 +14607,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14607,6 +14607,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -16472,6 +16472,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -16858,6 +16858,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -16086,6 +16086,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -16473,6 +16473,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14583,6 +14583,12 @@ public class FirWasmJsCodegenBoxTestGenerated extends AbstractFirWasmJsCodegenBo
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14583,6 +14583,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/finally/continueAndOuterFinally.kt");
}
@Test
@TestMetadata("decrementInFinally.kt")
public void testDecrementInFinally() throws Exception {
runTest("compiler/testData/codegen/box/finally/decrementInFinally.kt");
}
@Test
@TestMetadata("finallyAndFinally.kt")
public void testFinallyAndFinally() throws Exception {