From cf9bd44cf7303606127a18d186f7cac099113682 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 8 Nov 2023 12:02:21 +0100 Subject: [PATCH] K2: add test to confirm KT-54139 now works properly --- ...LFirBlackBoxCodegenBasedTestGenerated.java | 6 ++++++ ...rsedBlackBoxCodegenBasedTestGenerated.java | 6 ++++++ ...LightTreeBlackBoxCodegenTestGenerated.java | 6 ++++++ ...hIrFakeOverrideGeneratorTestGenerated.java | 6 ++++++ .../FirPsiBlackBoxCodegenTestGenerated.java | 6 ++++++ .../fir/contextReceiverToExtensionReceiver.kt | 21 +++++++++++++++++++ .../IrBlackBoxCodegenTestGenerated.java | 6 ++++++ ...kBoxCodegenWithIrInlinerTestGenerated.java | 6 ++++++ .../LightAnalysisModeTestGenerated.java | 5 +++++ 9 files changed, 68 insertions(+) create mode 100644 compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt 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 351314ff47c..40011131226 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 @@ -19340,6 +19340,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { 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 8ca5b3daadf..6aabe1de3ad 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 @@ -19340,6 +19340,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { 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 6e7d00e6bc7..0ea196ef6e3 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 @@ -19005,6 +19005,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index f11567b7472..1e495bdf702 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -19005,6 +19005,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { 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 e584b9417ec..fad66c7d9b0 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 @@ -19005,6 +19005,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { diff --git a/compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt b/compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt new file mode 100644 index 00000000000..ad4c0ede6f8 --- /dev/null +++ b/compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt @@ -0,0 +1,21 @@ +// LANGUAGE: +ContextReceivers +// TARGET_BACKEND: JVM_IR +// ISSUE: KT-54139 + +class A +class B +fun B.extensionFunction() {} + +context(A, B) +fun test() { + extensionFunction() +} + +fun box(): String { + with(A()) { + with(B()) { + test() + } + } + return "OK" +} 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 b765dc7e4a5..31492e23bde 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 @@ -19005,6 +19005,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { 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 9a9e1eb0ea3..3b10548707a 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 @@ -19005,6 +19005,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @Test + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @Test @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() 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 491da1fd69c..2e68e89ce2a 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -15845,6 +15845,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/fir/ConstValAccess.kt"); } + @TestMetadata("contextReceiverToExtensionReceiver.kt") + public void testContextReceiverToExtensionReceiver() throws Exception { + runTest("compiler/testData/codegen/box/fir/contextReceiverToExtensionReceiver.kt"); + } + @TestMetadata("CustomHashSetSize.kt") public void testCustomHashSetSize() throws Exception { runTest("compiler/testData/codegen/box/fir/CustomHashSetSize.kt");