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

[K/JS, K/Wasm, K/Native] Process anonymous initializers inside classes as a part of their primary constructors ^KT-61929 Fixed

Browse Source
This commit is contained in:
Artem Kobzar
2023-11-17 13:04:34 +00:00
committed by Space Team
parent 3413b07550
commit e64068cf82
21 changed files with 149 additions and 2 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
@@ -6736,6 +6736,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() 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
@@ -6736,6 +6736,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -6677,6 +6677,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -6677,6 +6677,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -6677,6 +6677,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+8 -2
View File
@@ -585,8 +585,14 @@ class LocalDeclarationsLowering(
rewriteFunctionBody(it.declaration, it)
}
localClassConstructors.values.forEach {
rewriteFunctionBody(it.declaration, it)
localClassConstructors.values.forEach { constructorContext ->
rewriteFunctionBody(constructorContext.declaration, constructorContext)
if (!constructorContext.declaration.isPrimary) return@forEach
constructorContext.declaration.constructedClass.declarations
.filterIsInstance<IrAnonymousInitializer>()
.forEach { rewriteFunctionBody(it, constructorContext) }
}
localClasses.values.forEach {
compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// KT-61929
// WITH_SDTLIB
// EXPECTED_REACHABLE_NODES: 1301
package foo
fun doSomething(lambda: () -> Unit) { lambda() }
class CompilerBug(result: String) {
var result: String = "Failed"
init {
run {
object {
init {
doSomething { completed(result) }
}
}
}
}
fun completed(value: String) {
this.result = value
}
}
fun box(): String {
return CompilerBug("OK").result
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -6443,6 +6443,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -6677,6 +6677,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -6677,6 +6677,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -5830,6 +5830,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
runTest("compiler/testData/codegen/box/classes/outerThis.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4901,6 +4901,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4901,6 +4901,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4901,6 +4901,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4901,6 +4901,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -5056,6 +5056,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -5170,6 +5170,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4942,6 +4942,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -5057,6 +5057,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4883,6 +4883,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -4883,6 +4883,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/classes/namedClassObject.kt");
}
@Test
@TestMetadata("nestedInitBlocksWithLambda.kt")
public void testNestedInitBlocksWithLambda() throws Exception {
runTest("compiler/testData/codegen/box/classes/nestedInitBlocksWithLambda.kt");
}
@Test
@TestMetadata("outerThis.kt")
public void testOuterThis() throws Exception {