diff --git a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.txt b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.txt index e41abf3def2..5042d9ae8f1 100644 --- a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.txt +++ b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.txt @@ -64,6 +64,8 @@ FILE fqName: fileName:/delegatedGenericImplementation.kt a: GET_VAR 'a: E of .Test1 declared in .Test1.foo' type=E of .Test1 origin=null b: GET_VAR 'b: B of .Test1.foo declared in .Test1.foo' type=B of .Test1.foo origin=null PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] + overridden: + public abstract id: kotlin.collections.Map.IBase, C of .IBase.>? [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN ($this:.Test1.Test1>, $receiver:C of .Test1.) returnType:kotlin.collections.Map.Test1, C of .Test1.>? correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] overridden: @@ -79,6 +81,8 @@ FILE fqName: fileName:/delegatedGenericImplementation.kt receiver: GET_VAR ': .Test1.Test1> declared in .Test1.' type=.Test1.Test1> origin=null $receiver: GET_VAR ': C of .Test1. declared in .Test1.' type=C of .Test1. origin=null PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var] + overridden: + public abstract x: D of .IBase.? [var] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN ($this:.Test1.Test1>, $receiver:kotlin.collections.List.Test1.>) returnType:D of .Test1.? correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var] overridden: @@ -165,6 +169,8 @@ FILE fqName: fileName:/delegatedGenericImplementation.kt a: GET_VAR 'a: kotlin.String declared in .Test2.foo' type=kotlin.String origin=null b: GET_VAR 'b: B of .Test2.foo declared in .Test2.foo' type=B of .Test2.foo origin=null PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] + overridden: + public abstract id: kotlin.collections.Map.IBase, C of .IBase.>? [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN ($this:.Test2, $receiver:C of .Test2.) returnType:kotlin.collections.Map.Test2.>? correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] overridden: @@ -180,6 +186,8 @@ FILE fqName: fileName:/delegatedGenericImplementation.kt receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null $receiver: GET_VAR ': C of .Test2. declared in .Test2.' type=C of .Test2. origin=null PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var] + overridden: + public abstract x: D of .IBase.? [var] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN ($this:.Test2, $receiver:kotlin.collections.List.Test2.>) returnType:D of .Test2.? correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [var] overridden: diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt index a1fdbfb2fa9..26599e04f76 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt @@ -301,6 +301,8 @@ FILE fqName: fileName:/delegatedImplementation.kt x0: CONST String type=kotlin.String value="" y0: CONST Int type=kotlin.Int value=42 PROPERTY DELEGATED_MEMBER name:z1 visibility:public modality:OPEN [val] + overridden: + public abstract z1: kotlin.Int [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Test2, $receiver:kotlin.Byte) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:z1 visibility:public modality:OPEN [val] overridden: @@ -314,6 +316,8 @@ FILE fqName: fileName:/delegatedImplementation.kt receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null $receiver: GET_VAR ': kotlin.Byte declared in .Test2.' type=kotlin.Byte origin=null PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [val] + overridden: + public abstract x: kotlin.String [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Test2) returnType:kotlin.String correspondingProperty: PROPERTY DELEGATED_MEMBER name:x visibility:public modality:OPEN [val] overridden: @@ -325,6 +329,8 @@ FILE fqName: fileName:/delegatedImplementation.kt $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_1 type:.IOther visibility:private [final]' type=.IOther origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null PROPERTY DELEGATED_MEMBER name:z2 visibility:public modality:OPEN [var] + overridden: + public abstract z2: kotlin.Int [var] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Test2, $receiver:kotlin.Byte) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:z2 visibility:public modality:OPEN [var] overridden: @@ -351,6 +357,8 @@ FILE fqName: fileName:/delegatedImplementation.kt $receiver: GET_VAR ': kotlin.Byte declared in .Test2.' type=kotlin.Byte origin=null : GET_VAR ': kotlin.Int declared in .Test2.' type=kotlin.Int origin=null PROPERTY DELEGATED_MEMBER name:y visibility:public modality:OPEN [var] + overridden: + public abstract y: kotlin.Int [var] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Test2) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:y visibility:public modality:OPEN [var] overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt index 3032d5e006c..aa769d9dc52 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.txt @@ -85,6 +85,8 @@ FILE fqName: fileName:/annotationsOnDelegatedMembers.kt $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:.IFoo visibility:private [final]' type=.IFoo origin=null receiver: GET_VAR ': .DFoo declared in .DFoo.testFun' type=.DFoo origin=null PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val] + overridden: + public abstract testExtVal: kotlin.String [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.DFoo, $receiver:kotlin.String) returnType:kotlin.String correspondingProperty: PROPERTY DELEGATED_MEMBER name:testExtVal visibility:public modality:OPEN [val] overridden: @@ -98,6 +100,8 @@ FILE fqName: fileName:/annotationsOnDelegatedMembers.kt receiver: GET_VAR ': .DFoo declared in .DFoo.' type=.DFoo origin=null $receiver: GET_VAR ': kotlin.String declared in .DFoo.' type=kotlin.String origin=null PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val] + overridden: + public abstract testVal: kotlin.String [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.DFoo) returnType:kotlin.String correspondingProperty: PROPERTY DELEGATED_MEMBER name:testVal visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt index 9e16da9daa8..1436ee0f1b6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt +++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.txt @@ -44,6 +44,8 @@ FILE fqName: fileName:/inheritingDeprecation.kt EXPRESSION_BODY GET_VAR 'foo: .IFoo declared in .Delegated.' type=.IFoo origin=null PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val] + overridden: + public open extProp: kotlin.String [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Delegated, $receiver:kotlin.String) returnType:kotlin.String correspondingProperty: PROPERTY DELEGATED_MEMBER name:extProp visibility:public modality:OPEN [val] overridden: @@ -57,6 +59,8 @@ FILE fqName: fileName:/inheritingDeprecation.kt receiver: GET_VAR ': .Delegated declared in .Delegated.' type=.Delegated origin=null $receiver: GET_VAR ': kotlin.String declared in .Delegated.' type=kotlin.String origin=null PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val] + overridden: + public open prop: kotlin.String [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Delegated) returnType:kotlin.String correspondingProperty: PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/declarations/kt35550.txt b/compiler/testData/ir/irText/declarations/kt35550.txt index dd50338c65c..bd9eb2d6880 100644 --- a/compiler/testData/ir/irText/declarations/kt35550.txt +++ b/compiler/testData/ir/irText/declarations/kt35550.txt @@ -34,6 +34,8 @@ FILE fqName: fileName:/kt35550.kt EXPRESSION_BODY GET_VAR 'i: .I declared in .A.' type=.I origin=null PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] + overridden: + public open id: T of .I. [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN ($this:.A, $receiver:T of .A.) returnType:T of .A. correspondingProperty: PROPERTY DELEGATED_MEMBER name:id visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt index 0919600addb..69e5451997d 100644 --- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt +++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt @@ -63,6 +63,8 @@ FILE fqName: fileName:/delegatedMembers.kt receiver: GET_VAR ': .Test.Test> declared in .Test.foo' type=.Test.Test> origin=null x: GET_VAR 'x: kotlin.Int declared in .Test.foo' type=kotlin.Int origin=null PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val] + overridden: + public abstract bar: kotlin.Int [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Test.Test>) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt index fd4b1eee2d3..62e4e32d22d 100644 --- a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt +++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.txt @@ -123,6 +123,9 @@ FILE fqName: fileName:/DelegationAndInheritanceFromJava.kt receiver: GET_VAR ': .Impl declared in .Impl.retainAll' type=.Impl origin=null elements: GET_VAR 'elements: kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> declared in .Impl.retainAll' type=kotlin.collections.Collection<@[FlexibleNullability] kotlin.String?> origin=null PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val] + overridden: + public abstract size: kotlin.Int [val] + public abstract size: kotlin.Int [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Impl) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.txt b/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.txt index 718b1e51089..7fb01b39126 100644 --- a/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.txt +++ b/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.txt @@ -128,6 +128,8 @@ FILE fqName: fileName:/Fir2IrClassifierStorage.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:components type:.Fir2IrComponents visibility:private [final]' type=.Fir2IrComponents origin=null receiver: GET_VAR ': .Fir2IrClassifierStorage declared in .Fir2IrClassifierStorage.' type=.Fir2IrClassifierStorage origin=null PROPERTY DELEGATED_MEMBER name:classifierStorage visibility:public modality:OPEN [val] + overridden: + public abstract classifierStorage: .Fir2IrClassifierStorage [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Fir2IrClassifierStorage) returnType:.Fir2IrClassifierStorage correspondingProperty: PROPERTY DELEGATED_MEMBER name:classifierStorage visibility:public modality:OPEN [val] overridden: @@ -139,6 +141,8 @@ FILE fqName: fileName:/Fir2IrClassifierStorage.kt $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:components type:.Fir2IrComponents visibility:private [final]' type=.Fir2IrComponents origin=null receiver: GET_VAR ': .Fir2IrClassifierStorage declared in .Fir2IrClassifierStorage.' type=.Fir2IrClassifierStorage origin=null PROPERTY DELEGATED_MEMBER name:session visibility:public modality:OPEN [val] + overridden: + public abstract session: .FirSession [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.Fir2IrClassifierStorage) returnType:.FirSession correspondingProperty: PROPERTY DELEGATED_MEMBER name:session visibility:public modality:OPEN [val] overridden: diff --git a/compiler/testData/ir/irText/firProblems/kt43342.txt b/compiler/testData/ir/irText/firProblems/kt43342.txt index 22591312811..babc007d470 100644 --- a/compiler/testData/ir/irText/firProblems/kt43342.txt +++ b/compiler/testData/ir/irText/firProblems/kt43342.txt @@ -62,6 +62,8 @@ FILE fqName: fileName:/kt43342.kt $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> origin=null receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.isEmpty' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null PROPERTY DELEGATED_MEMBER name:entries visibility:public modality:OPEN [val] + overridden: + public abstract entries: kotlin.collections.Set> [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo>) returnType:kotlin.collections.Set.ControlFlowInfo, V of .ControlFlowInfo>> correspondingProperty: PROPERTY DELEGATED_MEMBER name:entries visibility:public modality:OPEN [val] overridden: @@ -73,6 +75,8 @@ FILE fqName: fileName:/kt43342.kt $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> origin=null receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null PROPERTY DELEGATED_MEMBER name:keys visibility:public modality:OPEN [val] + overridden: + public abstract keys: kotlin.collections.Set [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo>) returnType:kotlin.collections.Set.ControlFlowInfo> correspondingProperty: PROPERTY DELEGATED_MEMBER name:keys visibility:public modality:OPEN [val] overridden: @@ -84,6 +88,8 @@ FILE fqName: fileName:/kt43342.kt $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> origin=null receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val] + overridden: + public abstract size: kotlin.Int [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo>) returnType:kotlin.Int correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val] overridden: @@ -95,6 +101,8 @@ FILE fqName: fileName:/kt43342.kt $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> visibility:private [final]' type=kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo> origin=null receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null PROPERTY DELEGATED_MEMBER name:values visibility:public modality:OPEN [val] + overridden: + public abstract values: kotlin.collections.Collection [val] FUN DELEGATED_MEMBER name: visibility:public modality:OPEN <> ($this:.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo>) returnType:kotlin.collections.Collection.ControlFlowInfo> correspondingProperty: PROPERTY DELEGATED_MEMBER name:values visibility:public modality:OPEN [val] overridden: