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

IR: Lower shared variables in enum entries (KT-46605)

Browse Source
This commit is contained in:
Steven Schäfer
2021-05-17 12:33:09 +02:00
committed by Alexander Udalov
parent b78c645fb0
commit 60bc0f4baf
10 changed files with 61 additions and 4 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
@@ -14538,6 +14538,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@Test
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@Test
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SharedVariablesLowering.kt
+1 -4
View File
@@ -40,10 +40,7 @@ val sharedVariablesPhase = makeIrFilePhase(
class SharedVariablesLowering(val context: BackendContext) : BodyLoweringPass {
override fun lower(irBody: IrBody, container: IrDeclaration) {
// TODO remove this condition
if (container is IrFunction || container is IrField || container is IrAnonymousInitializer) {
SharedVariablesTransformer(irBody, container).lowerSharedVariables()
}
SharedVariablesTransformer(irBody, container).lowerSharedVariables()
}
private inner class SharedVariablesTransformer(val irBody: IrBody, val irDeclaration: IrDeclaration) {
compiler/testData/codegen/box/enum/kt46605.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
fun call(f: () -> Unit) {
f()
}
enum class E(val f: () -> String) {
A({
var value = "Fail"
call {
value = "OK"
}
value
})
}
fun box(): String {
return E.A.f()
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -14538,6 +14538,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@Test
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@Test
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -14538,6 +14538,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@Test
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@Test
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -11899,6 +11899,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt7257.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -10633,6 +10633,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt7257.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -10039,6 +10039,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt7257.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -10039,6 +10039,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt7257.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -4902,6 +4902,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/enum/kt44744_innerClass.kt");
}
@TestMetadata("kt46605.kt")
public void testKt46605() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt46605.kt");
}
@TestMetadata("kt7257.kt")
public void testKt7257() throws Exception {
runTest("compiler/testData/codegen/box/enum/kt7257.kt");