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

IR: Fix scope transparency in ReturnableBlockLowering

Browse Source 
An IrReturnableBlock introduces a new variable scope and shouldn't be
replaced with a transparent IrComposite block.
This commit is contained in:
Steven Schäfer
2022-07-18 13:35:40 +02:00
committed by Alexander Udalov
parent b93c000250
commit 6f0ff6aeb0
11 changed files with 113 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+12
View File
@@ -15993,6 +15993,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ReturnableBlockLowering.kt
+1 -1
View File
@@ -127,7 +127,7 @@ class ReturnableBlockTransformer(val context: CommonBackendContext, val containe
returnMap.remove(expression.symbol)
if (!hasReturned) {
return IrCompositeImpl(
return IrBlockImpl(
expression.startOffset,
expression.endOffset,
expression.type,
compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun box(): String {
val a = "OK"
val c = {
val b = a
b
}.invoke()
return a
}
compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun box(): String {
val a = "OK"
val c = (fun(): String {
val b = a
return b
}).invoke()
return a
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+12
View File
@@ -15807,6 +15807,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+12
View File
@@ -15993,6 +15993,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+10
View File
@@ -13020,6 +13020,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/nestedLambdas.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+12
View File
@@ -12197,6 +12197,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+12
View File
@@ -12239,6 +12239,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+10
View File
@@ -10870,6 +10870,16 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/nestedLambdas.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+12
View File
@@ -13243,6 +13243,18 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/directInvokeOptimization/contructorRef.kt");
}
@Test
@TestMetadata("kt53202.kt")
public void testKt53202() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202.kt");
}
@Test
@TestMetadata("kt53202_funLiteral.kt")
public void testKt53202_funLiteral() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {