diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java index a0c52052a81..82497ce6f30 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java @@ -2624,6 +2624,12 @@ public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmI runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java index 3d726f2eed4..84723ccd4f7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java @@ -2624,6 +2624,12 @@ public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest { runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { diff --git a/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.ir.txt b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.ir.txt new file mode 100644 index 00000000000..492ab7a169b --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.ir.txt @@ -0,0 +1,129 @@ +FILE fqName: fileName:/FakeOverrideInAnonymousWithDelegation.kt + CLASS CLASS name:Wrapper modality:FINAL visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Wrapper + CONSTRUCTOR visibility:public <> () returnType:.Wrapper [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Wrapper modality:FINAL visibility:public superTypes:[kotlin.Any]' + PROPERTY name:dummy visibility:private modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:dummy type:.Wrapper.dummy. visibility:private [final] + EXPRESSION_BODY + BLOCK type=.Wrapper.dummy. origin=OBJECT_LITERAL + CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Bar] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Wrapper.dummy. + CONSTRUCTOR visibility:public <> () returnType:.Wrapper.dummy. [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Bar]' + PROPERTY FAKE_OVERRIDE name:foo visibility:public modality:OPEN [fake_override,val] + overridden: + public open foo: kotlin.String [val] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Bar) returnType:kotlin.String [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:foo visibility:public modality:OPEN [fake_override,val] + overridden: + public open fun (): kotlin.String declared in .Bar + $this: VALUE_PARAMETER name: type:.Bar + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int [fake_override] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String [fake_override] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Wrapper.dummy.' type=.Wrapper.dummy. origin=OBJECT_LITERAL + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.Wrapper) returnType:.Wrapper.dummy. + correspondingProperty: PROPERTY name:dummy visibility:private modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.Wrapper + BLOCK_BODY + RETURN type=kotlin.Nothing from='private final fun (): .Wrapper.dummy. declared in .Wrapper' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dummy type:.Wrapper.dummy. visibility:private [final]' type=.Wrapper.dummy. origin=null + receiver: GET_VAR ': .Wrapper declared in .Wrapper.' type=.Wrapper origin=null + PROPERTY name:bar visibility:private modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:bar type:.Wrapper.bar. visibility:private [final] + EXPRESSION_BODY + BLOCK type=.Wrapper.bar. origin=OBJECT_LITERAL + CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Bar] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Wrapper.bar. + CONSTRUCTOR visibility:public <> () returnType:.Wrapper.bar. [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Bar]' + FIELD DELEGATE name:$$delegate_0 type:.Wrapper.dummy. visibility:private [final] + EXPRESSION_BODY + CALL 'private final fun (): .Wrapper.dummy. declared in .Wrapper' type=.Wrapper.dummy. origin=GET_PROPERTY + $this: GET_VAR ': .Wrapper declared in .Wrapper' type=.Wrapper origin=null + PROPERTY DELEGATED_MEMBER name:foo visibility:public modality:OPEN [val] + overridden: + public open foo: kotlin.String [val] + FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Wrapper.bar.) returnType:kotlin.String + correspondingProperty: PROPERTY DELEGATED_MEMBER name:foo visibility:public modality:OPEN [val] + overridden: + public open fun (): kotlin.String declared in .Bar + $this: VALUE_PARAMETER name: type:.Wrapper.bar. + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .Wrapper.bar.' + CALL 'public open fun (): kotlin.String [fake_override] declared in .Wrapper.dummy.' type=kotlin.String origin=null + $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:.Wrapper.dummy. visibility:private [final]' type=.Wrapper.dummy. origin=null + receiver: GET_VAR ': .Wrapper.bar. declared in .Wrapper.bar..' type=.Wrapper.bar. origin=null + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int [fake_override] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String [fake_override] declared in .Bar + $this: VALUE_PARAMETER name: type:kotlin.Any + CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Wrapper.bar.' type=.Wrapper.bar. origin=OBJECT_LITERAL + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.Wrapper) returnType:.Wrapper.bar. + correspondingProperty: PROPERTY name:bar visibility:private modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.Wrapper + BLOCK_BODY + RETURN type=kotlin.Nothing from='private final fun (): .Wrapper.bar. declared in .Wrapper' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:.Wrapper.bar. visibility:private [final]' type=.Wrapper.bar. origin=null + receiver: GET_VAR ': .Wrapper declared in .Wrapper.' type=.Wrapper origin=null + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + CLASS INTERFACE name:Bar modality:ABSTRACT visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Bar + PROPERTY name:foo visibility:public modality:OPEN [val] + FUN name: visibility:public modality:OPEN <> ($this:.Bar) returnType:kotlin.String + correspondingProperty: PROPERTY name:foo visibility:public modality:OPEN [val] + $this: VALUE_PARAMETER name: type:.Bar + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .Bar' + CONST String type=kotlin.String value="" + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt new file mode 100644 index 00000000000..740fc2332a5 --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt @@ -0,0 +1,9 @@ +class Wrapper { + private val dummy = object : Bar {} + private val bar = object : Bar by dummy {} +} + +interface Bar { + val foo: String + get() = "" +} diff --git a/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt.txt b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt.txt new file mode 100644 index 00000000000..c6f18bc7235 --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt.txt @@ -0,0 +1,52 @@ +class Wrapper { + constructor() /* primary */ { + super/*Any*/() + /* () */ + + } + + private val dummy: + field = { // BLOCK + local class : Bar { + constructor() /* primary */ { + super/*Any*/() + /* () */ + + } + + } + + () + } + private get + + private val bar: + field = { // BLOCK + local class : Bar { + constructor() /* primary */ { + super/*Any*/() + /* () */ + + } + + private /* final field */ val $$delegate_0: = .() + override val foo: String + override get(): String { + return .#$$delegate_0.() + } + + } + + () + } + private get + +} + +interface Bar { + val foo: String + get(): String { + return "" + } + +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java index a7d431e77fc..ce8d35994e6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java @@ -2624,6 +2624,12 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java index ade29445baa..93273936c01 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java @@ -1900,6 +1900,11 @@ public class KlibIrTextTestCaseGenerated extends AbstractKlibIrTextTestCase { runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { runTest("compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java index 96ef984adef..d5e722fa5a9 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java @@ -2174,6 +2174,12 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java index d5fc944f76d..07f997eb2b9 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java @@ -2174,6 +2174,12 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest { runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java index ba6405c7c14..31739b94fce 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java @@ -2174,6 +2174,12 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest { runTest("compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.kt"); } + @Test + @TestMetadata("FakeOverrideInAnonymousWithDelegation.kt") + public void testFakeOverrideInAnonymousWithDelegation() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.kt"); + } + @Test @TestMetadata("Fir2IrClassifierStorage.kt") public void testFir2IrClassifierStorage() throws Exception {