azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR2IR] Properly calculate dispatch receiver type for fake overrides

Browse Source 
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
2023-08-24 14:40:29 +03:00
committed by Space Team
parent e28f97cf6d
commit d4f55894b4
75 changed files with 1866 additions and 2794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/smartCasts/kt44814.fir.ir.txt
Vendored
+8 -8
View File
@@ -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