diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index f20c15c0198..66f674ce093 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -18483,6 +18483,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @Test + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @Test @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index a64b8a6f0e1..f38571ac7df 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -171,7 +171,7 @@ protected constructor( propertyDeclaration, trace, c.declarationScopeProvider.getOuterDataFlowInfoForDeclaration(propertyDeclaration), - InferenceSession.default + c.inferenceSession ?: InferenceSession.default ) result.add(propertyDescriptor) } @@ -184,7 +184,7 @@ protected constructor( entry, trace, c.declarationScopeProvider.getOuterDataFlowInfoForDeclaration(entry), - InferenceSession.default + c.inferenceSession ?: InferenceSession.default ) result.add(propertyDescriptor) } diff --git a/compiler/testData/codegen/box/inference/builderInference/kt48445.kt b/compiler/testData/codegen/box/inference/builderInference/kt48445.kt index 489f03c45d0..ed111085076 100644 --- a/compiler/testData/codegen/box/inference/builderInference/kt48445.kt +++ b/compiler/testData/codegen/box/inference/builderInference/kt48445.kt @@ -48,7 +48,6 @@ internal class TowerDataElementsForName3() { } } -// mute due to KT-48633 //internal class TowerDataElementsForName4() { // @OptIn(ExperimentalStdlibApi::class) // val reversedFilteredLocalScopes = buildList l1@ { @@ -72,4 +71,4 @@ fun box(): String { val x3 = TowerDataElementsForName3().reversedFilteredLocalScopes // val x4 = TowerDataElementsForName4().reversedFilteredLocalScopes return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/inference/builderInference/kt48633.kt b/compiler/testData/codegen/box/inference/builderInference/kt48633.kt new file mode 100644 index 00000000000..a3205c37bb6 --- /dev/null +++ b/compiler/testData/codegen/box/inference/builderInference/kt48633.kt @@ -0,0 +1,19 @@ +// DONT_TARGET_EXACT_BACKEND: WASM +// IGNORE_BACKEND_FIR: JVM_IR +// WITH_RUNTIME + +class TowerDataElementsForName() { + @OptIn(ExperimentalStdlibApi::class) + val reversedFilteredLocalScopes = buildList { + class Foo { + val reversedFilteredLocalScopes = { + add("OK") + } + } + Foo().reversedFilteredLocalScopes() + } +} + +fun box(): String { + return TowerDataElementsForName().reversedFilteredLocalScopes[0] +} \ No newline at end of file diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 10619e5487c..80ec7b4c480 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -18357,6 +18357,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @Test + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @Test @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 0647aa1f5d0..aa6efb60b7f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -18483,6 +18483,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @Test + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @Test @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 4b76facebdb..a60b6d1c5cf 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -15221,6 +15221,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/labaledCall.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java index f54936d6acb..740e437a003 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java @@ -13285,6 +13285,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/labaledCall.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 23208758d04..c16a98a156b 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -12691,6 +12691,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); } + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/labaledCall.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java index c68f51024eb..82e5eef380b 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java @@ -14382,6 +14382,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @Test + @TestMetadata("kt48633.kt") + public void testKt48633() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); + } + @TestMetadata("labaledCall.kt") public void testLabaledCall() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/labaledCall.kt");