From b239239cc1eb55db990c3c6951dcc555c3fcf97d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 7 May 2024 10:22:00 +0200 Subject: [PATCH] K2: build outer classes sequence in FirImplicitBodyResolve properly Before this commit, we used classId-based methods which didn't work correctly on local classes / objects, thus provoking exceptions. Now we use lookupTag-based methods which don't have such problems. #KT-67993 Fixed (cherry picked from commit 865f6faa535368b4b540ba764163ef02b9dbe8f0) --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++++ ...LFirBlackBoxCodegenBasedTestGenerated.java | 6 ++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++++ ...rsedBlackBoxCodegenBasedTestGenerated.java | 6 ++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 ++++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 ++++ ...LightTreeBlackBoxCodegenTestGenerated.java | 6 ++++ ...2IrFakeOverrideGeneratorTestGenerated.java | 6 ++++ .../FirPsiBlackBoxCodegenTestGenerated.java | 6 ++++ .../body/resolve/FirImplicitBodyResolve.kt | 8 +++-- .../box/builderInference/issues/kt67993.kt | 32 +++++++++++++++++++ .../tests/builderInference/issues/kt67993.kt | 25 +++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++ .../JvmAbiConsistencyTestBoxGenerated.java | 6 ++++ .../codegen/BlackBoxCodegenTestGenerated.java | 6 ++++ .../IrBlackBoxCodegenTestGenerated.java | 6 ++++ ...kBoxCodegenWithIrInlinerTestGenerated.java | 6 ++++ ...xCodegenTestWithInlineScopesGenerated.java | 6 ++++ .../LightAnalysisModeTestGenerated.java | 5 +++ .../fir/FirJsCodegenBoxTestGenerated.java | 6 ++++ .../fir/FirJsES6CodegenBoxTestGenerated.java | 6 ++++ .../test/ir/IrJsCodegenBoxTestGenerated.java | 6 ++++ .../ir/IrJsES6CodegenBoxTestGenerated.java | 6 ++++ .../FirNativeCodegenBoxTestGenerated.java | 6 ++++ .../FirNativeCodegenBoxTestNoPLGenerated.java | 6 ++++ .../NativeCodegenBoxTestGenerated.java | 6 ++++ .../NativeCodegenBoxTestNoPLGenerated.java | 6 ++++ .../FirWasmJsCodegenBoxTestGenerated.java | 6 ++++ .../test/K1WasmCodegenBoxTestGenerated.java | 6 ++++ 29 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 compiler/testData/codegen/box/builderInference/issues/kt67993.kt create mode 100644 compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index e49664bf7a1bb..98a1c1ab0793b 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -4474,6 +4474,12 @@ public void testKt66272() { public void testKt67875() { runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67875.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index a031d591b89d1..1bf0919490c7a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -3994,6 +3994,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index ca34552520423..75a27d48d23c0 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -4474,6 +4474,12 @@ public void testKt66272() { public void testKt67875() { runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67875.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index 11448c4d782e8..acfca24445c3a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -3994,6 +3994,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index f12850c80e763..277ad358d6896 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -4468,6 +4468,12 @@ public void testKt66272() { public void testKt67875() { runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67875.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index fe434430557aa..f6982176f3192 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -4474,6 +4474,12 @@ public void testKt66272() { public void testKt67875() { runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67875.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index c710c2f32bfbe..86efa022eb28e 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java index afa4364855869..5afd00e548ffb 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 3b28162fde7eb..f34b7203140f9 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt index e58a164c5e5e5..7fa44bfc50c62 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.resolve.FirRegularTowerDataContexts import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.providers.firProvider +import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.AdapterForResolveProcessor import org.jetbrains.kotlin.fir.resolve.transformers.FirTransformerBasedResolveProcessor import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator @@ -310,9 +311,10 @@ open class ReturnTypeCalculatorWithJump( val file = provider.getFirCallableContainerFile(symbol) val script = file?.declarations?.firstIsInstanceOrNull() - val outerClasses = generateSequence(symbol.containingClassLookupTag()?.classId) { classId -> - classId.outerClassId - }.mapTo(mutableListOf()) { provider.getFirClassifierByFqName(it) } + val containingClassLookupTag = symbol.containingClassLookupTag() + val outerClasses = generateSequence(containingClassLookupTag) { lookupTag -> + lookupTag.toSymbol(session)?.getContainingClassLookupTag() + }.mapTo(mutableListOf()) { it.toSymbol(session)?.fir } if (file == null || outerClasses.any { it == null }) { return buildErrorTypeRef { diff --git a/compiler/testData/codegen/box/builderInference/issues/kt67993.kt b/compiler/testData/codegen/box/builderInference/issues/kt67993.kt new file mode 100644 index 0000000000000..dd096162685b3 --- /dev/null +++ b/compiler/testData/codegen/box/builderInference/issues/kt67993.kt @@ -0,0 +1,32 @@ +// ISSUE: KT-67993 +// IGNORE_REVERSED_RESOLVE +// IGNORE_NON_REVERSED_RESOLVE +// Reason: see KT-68031 + +class Builder { + var res: T? = null + + fun add(x: T) { + res = x + } +} + +fun foo(build: Builder.() -> Unit): T { + return Builder().apply(build).res!! +} + +class C { + val a = foo { + object { + fun bar() { + add(foo()) + } + + private fun foo() = "OK" + }.bar() + } +} + +fun box(): String { + return C().a +} diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt new file mode 100644 index 0000000000000..0dd37019b048e --- /dev/null +++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt @@ -0,0 +1,25 @@ +// FIR_IDENTICAL +// ISSUE: KT-67993 +// IGNORE_REVERSED_RESOLVE +// IGNORE_NON_REVERSED_RESOLVE +// Reason: see KT-68031 + +class Builder { + fun add(x: T) {} +} + +fun foo(build: Builder.() -> Unit) { + Builder().apply(build) +} + +class C { + val a = foo { + object { + fun bar() { + add(foo()) + } + + private fun foo() = "..." + } + } +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 1630b0fb9bffd..24b46bf17d875 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -4474,6 +4474,12 @@ public void testKt66272() { public void testKt67875() { runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67875.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/diagnostics/tests/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index e4402f2306a2a..cf26e5fe605d0 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested 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 7a603771df411..abe795b01a4fb 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 @@ -3761,6 +3761,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested 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 5d46ae03bdd5f..20b5547b0a361 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 @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index f47b65696c599..01fa73298b102 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java index d11ff0f909e13..084d0c5b056cb 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java @@ -3971,6 +3971,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index c551d9da0c352..250f9582023f8 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -3444,6 +3444,11 @@ public void testKt66229() { public void testKt66243() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66243.kt"); } + + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @TestMetadata("compiler/testData/codegen/box/builderInference/oneParameter") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 2dce743e08c9c..106c0cf17f685 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -3041,6 +3041,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java index a5cbbf321538e..90b8ffd78d97a 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java @@ -3041,6 +3041,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index d9fca77f6098e..c5bc7dfd4aa33 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -3041,6 +3041,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index f48655e3c5642..73621303c79ef 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -3041,6 +3041,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java index e637ce5f729b3..a04cd1e7e2416 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java @@ -3124,6 +3124,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java index f457cef9b91f6..744dd2e7494ba 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java @@ -3182,6 +3182,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java index b44e26fda7d4b..e010327131ce1 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java @@ -3066,6 +3066,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java index c4ae577337076..ff87c149a692a 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java @@ -3125,6 +3125,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java index 7267fee217f57..9e370b8652a88 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java @@ -3029,6 +3029,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 28c135f0e34ba..58213b045d859 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -3029,6 +3029,12 @@ public void testKt66243() { public void testKt66272() { runTest("compiler/testData/codegen/box/builderInference/issues/kt66272.kt"); } + + @Test + @TestMetadata("kt67993.kt") + public void testKt67993() { + runTest("compiler/testData/codegen/box/builderInference/issues/kt67993.kt"); + } } @Nested