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

JVM IR: Avoid IrComposite in ReturnableBlockLowering (KT-53202)

Browse Source
This commit is contained in:
Steven Schäfer
2022-08-02 12:30:30 +02:00
committed by Alexander Udalov
parent c974ff8965
commit 03aee58585
10 changed files with 57 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
+6
View File
@@ -16005,6 +16005,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.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
@@ -143,7 +143,7 @@ class ReturnableBlockTransformer(val context: CommonBackendContext, val containe
newStatements
)
return builder.irComposite(expression, expression.origin) {
return builder.irBlock(expression, expression.origin) {
+variable
+loop
+irGet(variable)
compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun box(): String {
val a = ""
val c = fun(): String {
if (a != "") return "Fail"
return "OK"
}.invoke()
return c
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -15819,6 +15819,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.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
+6
View File
@@ -16005,6 +16005,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13030,6 +13030,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.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
+6
View File
@@ -12209,6 +12209,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -12251,6 +12251,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.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
+5
View File
@@ -10880,6 +10880,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.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
+6
View File
@@ -13255,6 +13255,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_funLiteral.kt");
}
@Test
@TestMetadata("kt53202_returns.kt")
public void testKt53202_returns() throws Exception {
runTest("compiler/testData/codegen/box/directInvokeOptimization/kt53202_returns.kt");
}
@Test
@TestMetadata("nestedLambdas.kt")
public void testNestedLambdas() throws Exception {