diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index fc87d1eb13b..3a155e1cbb5 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -769,9 +769,6 @@ internal class Fir2IrVisitor( if (!ownerField.isStatic) { receiver = qualifiedAccess.dispatchReceiver.takeIf { it !is FirNoReceiverExpression }?.toIrExpression() ?: qualifiedAccess.explicitReceiver?.toIrExpression() - if (receiver == null) { - throw AssertionError() - } } this } diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt index e1f5623a91b..9c912dbac3a 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/classLevelProperties.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -14,7 +14,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -24,7 +24,7 @@ FILE fqName: fileName:/classLevelProperties.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' CONST Int type=kotlin.Int value=0 PROPERTY name:test3 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -32,18 +32,18 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test4 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -51,17 +51,18 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN name: visibility:public modality:FINAL <> ($this:.C, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null + receiver: GET_VAR ': .C declared in .C' type=.C origin=null value: GET_VAR 'value: kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test5 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -69,14 +70,14 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN name: visibility:private modality:FINAL <> ($this:.C, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name:value index:0 type:kotlin.Int PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt index b624250710c..95e9a3810a8 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/delegatedProperties.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:map visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:private [final] EXPRESSION_BODY GET_VAR 'map: kotlin.collections.MutableMap declared in .C.' type=kotlin.collections.MutableMap origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.collections.MutableMap @@ -31,7 +31,7 @@ FILE fqName: fileName:/delegatedProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.collections.MutableMap declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:public [final]' type=kotlin.collections.MutableMap origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test2 visibility:public modality:FINAL [delegated,val] FIELD DELEGATE name:test2$delegate type:kotlin.Lazy visibility:private [final] diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt index 5497ba36f1f..118ec7e3504 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/member.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegate modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .Delegate.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Delegate) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/member.kt $this: VALUE_PARAMETER name: type:.Delegate BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Delegate' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Delegate declared in .Delegate.' type=.Delegate origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Delegate, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Delegate @@ -24,6 +24,7 @@ FILE fqName: fileName:/member.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String declared in .Delegate' CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=null + $this: GET_VAR ': .Delegate declared in .Delegate' type=.Delegate origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -45,7 +46,7 @@ FILE fqName: fileName:/member.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DelegateProvider modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .DelegateProvider.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.DelegateProvider) returnType:kotlin.String @@ -53,7 +54,7 @@ FILE fqName: fileName:/member.kt $this: VALUE_PARAMETER name: type:.DelegateProvider BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .DelegateProvider' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .DelegateProvider declared in .DelegateProvider.' type=.DelegateProvider origin=null FUN name:provideDelegate visibility:public modality:FINAL <> ($this:.DelegateProvider, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:.Delegate $this: VALUE_PARAMETER name: type:.DelegateProvider @@ -63,6 +64,7 @@ FILE fqName: fileName:/member.kt RETURN type=kotlin.Nothing from='public final fun provideDelegate (thisRef: kotlin.Any?, property: kotlin.Any?): .Delegate declared in .DelegateProvider' CONSTRUCTOR_CALL 'public constructor (value: kotlin.String) [primary] declared in .Delegate' type=.Delegate origin=null value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=null + $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider' type=.DelegateProvider origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any