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 6778432599b50..ec1ca99d0c33d 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 @@ -7438,6 +7438,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 e4d80de96e411..6def5c153fe7b 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 @@ -7438,6 +7438,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 2fcfbb4ff68c3..ab7c954d196d9 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 9f37886c4430c..8ef26a337fe91 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { diff --git a/compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt b/compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt new file mode 100644 index 0000000000000..0c5e32ec57413 --- /dev/null +++ b/compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt @@ -0,0 +1,26 @@ +// IGNORE_BACKEND_K2: JVM_IR +// ISSUE: KT-70417 + +interface A { + var x: String +} + +open class B : A { + override lateinit var x: String +} + +interface C: A + +open class D : C { + override var x: String + get() = "OK" + set(_) {} +} + +class E : B(), C by D() + +fun box(): String { + val e = E() + e.x = "Fail" + return e.x +} \ No newline at end of file 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 652024cc00fa7..3b9ce341b262a 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 2ac36c1166a7b..0db0eac7d0efa 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 @@ -7061,6 +7061,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 f6a110dc2f3ec..c8318caa2f9ee 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 d8a6433f4d59b..c7e4d1f7ace33 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 4b4a690a4331d..bec607d64c7c6 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 @@ -7373,6 +7373,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index f30bed272a6c1..e725a712c4e72 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -6424,6 +6424,11 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @TestMetadata("method.kt") public void testMethod() { runTest("compiler/testData/codegen/box/classDelegation/method.kt"); 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 48eee909aa58c..f854860154463 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 @@ -5651,6 +5651,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 23a5e9e00c5da..d3746848da931 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 @@ -5651,6 +5651,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 fa29615edbc7d..913be13b579d0 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 @@ -5651,6 +5651,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 b56ff4e8acb95..4327ddce405bf 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 @@ -5651,6 +5651,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 6153f631c518c..a1586a50363ba 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 @@ -5827,6 +5827,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 6984892f00aff..c219833682a4f 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 @@ -5947,6 +5947,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 87c6ac9a8a161..aedf82a00682b 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 @@ -5707,6 +5707,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 b272376026db9..522740f9450ec 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 @@ -5828,6 +5828,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 b0a8e4a9da048..c11a1c19aeee5 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 @@ -5633,6 +5633,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() { 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 b9bbbda705303..683eb4c9b38d5 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 @@ -5633,6 +5633,12 @@ public void testGeneric() { runTest("compiler/testData/codegen/box/classDelegation/generic.kt"); } + @Test + @TestMetadata("hiddenDelegateAndLateinitVar.kt") + public void testHiddenDelegateAndLateinitVar() { + runTest("compiler/testData/codegen/box/classDelegation/hiddenDelegateAndLateinitVar.kt"); + } + @Test @TestMetadata("method.kt") public void testMethod() {