[FIR2IR] Properly calculate dispatch receiver type for fake overrides
If some function is not fake-override, then its type should be just default type of containing class For fake overrides the default type calculated in the following way: 1. Find first overridden function, which is not fake override 2. Take its containing class 3. Find supertype of current containing class with type constructor of class from step 2 ^KT-60252 Fixed
This commit is contained in:
Dmitriy Novozhilov
committed by
Space Team
Space Team
parent
e28f97cf6d
commit
d4f55894b4
+18
-18
@@ -92,54 +92,54 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
|
||||
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyRequiresOptIn.MyLevel>
|
||||
correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
|
||||
SYNTHETIC_BODY kind=ENUM_ENTRIES
|
||||
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Any [fake_override]
|
||||
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.Any [fake_override]
|
||||
overridden:
|
||||
protected final fun clone (): kotlin.Any declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>, other:<root>.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator]
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>, other:<root>.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator]
|
||||
overridden:
|
||||
public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
VALUE_PARAMETER name:other index:0 type:<root>.MyRequiresOptIn.MyLevel
|
||||
FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||
FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||
overridden:
|
||||
public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Int [fake_override]
|
||||
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.Int [fake_override]
|
||||
overridden:
|
||||
public final fun hashCode (): kotlin.Int declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.String [fake_override]
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.String [fake_override]
|
||||
overridden:
|
||||
public open fun toString (): kotlin.String declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
|
||||
annotations:
|
||||
IntrinsicConstEvaluation
|
||||
overridden:
|
||||
public final name: kotlin.String
|
||||
FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.String [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.String [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-name> (): kotlin.String declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final ordinal: kotlin.Int
|
||||
FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Int [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.Int [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.MyRequiresOptIn.MyLevel?>? [fake_override]
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.MyRequiresOptIn.MyLevel?>? [fake_override]
|
||||
overridden:
|
||||
public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Unit [fake_override]
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>) returnType:kotlin.Unit [fake_override]
|
||||
overridden:
|
||||
protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<E of kotlin.Enum>
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
|
||||
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 declared in kotlin.Annotation
|
||||
|
||||
compiler/testData/codegen/box/functions/delegatedPropertyWithMultipleOverriddens_generics.fir.ir.txt
Vendored
+8
-8
@@ -52,18 +52,18 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
|
||||
CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E3 of <root>.MyMutableCollection>]
|
||||
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection<E3 of <root>.MyMutableCollection>
|
||||
TYPE_PARAMETER name:E3 index:0 variance: superTypes:[kotlin.Any?] reified:false
|
||||
FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
|
||||
FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
|
||||
overridden:
|
||||
public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
|
||||
PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
|
||||
overridden:
|
||||
public abstract bar: E1 of <root>.MyCollection
|
||||
FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
|
||||
overridden:
|
||||
public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
|
||||
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 declared in <root>.MyCollection
|
||||
@@ -80,18 +80,18 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
|
||||
CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList<E4 of <root>.MyMutableList>; <root>.MyMutableCollection<E4 of <root>.MyMutableList>]
|
||||
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList<E4 of <root>.MyMutableList>
|
||||
TYPE_PARAMETER name:E4 index:0 variance: superTypes:[kotlin.Any?] reified:false
|
||||
FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E4 of <root>.MyMutableList [fake_override]
|
||||
FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
|
||||
overridden:
|
||||
public abstract fun foo (): E2 of <root>.MyList declared in <root>.MyList
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
|
||||
PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
|
||||
overridden:
|
||||
public abstract bar: E2 of <root>.MyList
|
||||
FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E4 of <root>.MyMutableList [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
|
||||
overridden:
|
||||
public abstract fun <get-bar> (): E2 of <root>.MyList declared in <root>.MyList
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
|
||||
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 declared in <root>.MyList
|
||||
|
||||
@@ -418,19 +418,19 @@ FILE fqName:<root> fileName:/kt44814.kt
|
||||
PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final node: Node of <root>.FirModifier
|
||||
FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<Node of <root>.FirModifier>) returnType:<root>.ASTNode [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.ASTNode [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
|
||||
PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final token: <root>.KtModifierKeywordToken
|
||||
FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<Node of <root>.FirModifier>) returnType:<root>.KtModifierKeywordToken [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
|
||||
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 declared in <root>.FirModifier
|
||||
@@ -470,19 +470,19 @@ FILE fqName:<root> fileName:/kt44814.kt
|
||||
PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final node: Node of <root>.FirModifier
|
||||
FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<Node of <root>.FirModifier>) returnType:<root>.LighterASTNode [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.LighterASTNode>) returnType:<root>.LighterASTNode [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.LighterASTNode>
|
||||
PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final token: <root>.KtModifierKeywordToken
|
||||
FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<Node of <root>.FirModifier>) returnType:<root>.KtModifierKeywordToken [fake_override]
|
||||
FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.LighterASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
|
||||
correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
|
||||
overridden:
|
||||
public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.LighterASTNode>
|
||||
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 declared in <root>.FirModifier
|
||||
|
||||
Reference in New Issue
Block a user