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

FIR2IR KT-46578 add overridden properties generation

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-05-13 09:18:42 +03:00
committed by teamcityserver
parent 53c1de172f
commit a255f44d6e
29 changed files with 163 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.txt
Vendored
+3
View File
@@ -20,6 +20,9 @@ FILE fqName:<root> fileName:/AbstractMutableMap.kt
RETURN type=kotlin.Nothing from='public final fun put (key: K of <root>.MyMap, value: V of <root>.MyMap): V of <root>.MyMap? declared in <root>.MyMap'
CONST Null type=kotlin.Nothing? value=null
PROPERTY name:entries visibility:public modality:FINAL [val]
overridden:
public abstract entries: @[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] kotlin.collections.Map.Entry<@[FlexibleNullability] K of kotlin.collections.AbstractMutableMap?, @[FlexibleNullability] V of kotlin.collections.AbstractMutableMap?>?>? [fake_override,val]
public abstract entries: @[FlexibleNullability] kotlin.collections.Set<@[FlexibleNullability] kotlin.collections.Map.Entry<@[FlexibleNullability] K of java.util.AbstractMap?, @[FlexibleNullability] V of java.util.AbstractMap?>?>? [val]
FUN name:<get-entries> visibility:public modality:FINAL <> ($this:<root>.MyMap<K of <root>.MyMap, V of <root>.MyMap>) returnType:kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K of <root>.MyMap, V of <root>.MyMap>>
correspondingProperty: PROPERTY name:entries visibility:public modality:FINAL [val]
overridden:
compiler/testData/ir/irText/firProblems/ArrayMap.fir.txt
Vendored
+10
View File
@@ -61,6 +61,8 @@ FILE fqName:<root> fileName:/ArrayMap.kt
<T>: kotlin.Nothing
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:EmptyArrayMap modality:FINAL visibility:internal superTypes:[<root>.ArrayMap<kotlin.Nothing>]'
PROPERTY name:size visibility:public modality:FINAL [val]
overridden:
public abstract size: kotlin.Int [val]
FUN name:<get-size> visibility:public modality:FINAL <> ($this:<root>.EmptyArrayMap) returnType:kotlin.Int
correspondingProperty: PROPERTY name:size visibility:public modality:FINAL [val]
overridden:
@@ -182,6 +184,8 @@ FILE fqName:<root> fileName:/ArrayMap.kt
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:index type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
receiver: GET_VAR '<this>: <root>.OneElementArrayMap<T of <root>.OneElementArrayMap> declared in <root>.OneElementArrayMap.<get-index>' type=<root>.OneElementArrayMap<T of <root>.OneElementArrayMap> origin=null
PROPERTY name:size visibility:public modality:FINAL [val]
overridden:
public abstract size: kotlin.Int [val]
FUN name:<get-size> visibility:public modality:FINAL <> ($this:<root>.OneElementArrayMap<T of <root>.OneElementArrayMap>) returnType:kotlin.Int
correspondingProperty: PROPERTY name:size visibility:public modality:FINAL [val]
overridden:
@@ -395,6 +399,8 @@ FILE fqName:<root> fileName:/ArrayMap.kt
size: CALL 'private final fun <get-DEFAULT_SIZE> (): kotlin.Int declared in <root>.ArrayMapImpl.Companion' type=kotlin.Int origin=GET_PROPERTY
$this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.ArrayMapImpl.Companion
PROPERTY name:size visibility:public modality:FINAL [var]
overridden:
public abstract size: kotlin.Int [val]
FIELD PROPERTY_BACKING_FIELD name:size type:kotlin.Int visibility:private
EXPRESSION_BODY
CONST Int type=kotlin.Int value=0
@@ -681,6 +687,8 @@ FILE fqName:<root> fileName:/ArrayMap.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Entry modality:FINAL visibility:public [data] superTypes:[kotlin.collections.Map.Entry<kotlin.Int, T of <root>.ArrayMapImpl.Entry>]'
PROPERTY name:key visibility:public modality:FINAL [val]
overridden:
public abstract key: K of kotlin.collections.Map.Entry [val]
FIELD PROPERTY_BACKING_FIELD name:key type:kotlin.Int visibility:private [final]
EXPRESSION_BODY
GET_VAR 'key: kotlin.Int declared in <root>.ArrayMapImpl.Entry.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@@ -694,6 +702,8 @@ FILE fqName:<root> fileName:/ArrayMap.kt
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:key type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
receiver: GET_VAR '<this>: <root>.ArrayMapImpl.Entry<T of <root>.ArrayMapImpl.Entry> declared in <root>.ArrayMapImpl.Entry.<get-key>' type=<root>.ArrayMapImpl.Entry<T of <root>.ArrayMapImpl.Entry> origin=null
PROPERTY name:value visibility:public modality:FINAL [val]
overridden:
public abstract value: V of kotlin.collections.Map.Entry [val]
FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.ArrayMapImpl.Entry visibility:private [final]
EXPRESSION_BODY
GET_VAR 'value: T of <root>.ArrayMapImpl.Entry declared in <root>.ArrayMapImpl.Entry.<init>' type=T of <root>.ArrayMapImpl.Entry origin=INITIALIZE_PROPERTY_FROM_PARAMETER
compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.txt
Vendored
+3
View File
@@ -112,6 +112,9 @@ FILE fqName:<root> fileName:/DelegationAndInheritanceFromJava.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Foo.B visibility:local [final]' type=<root>.Foo.B origin=null
receiver: GET_VAR '<this>: <root>.Impl declared in <root>.Impl.isEmpty' type=<root>.Impl origin=null
PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
overridden:
public abstract size: kotlin.Int [fake_override,val]
public abstract size: kotlin.Int [fake_override,val]
FUN DELEGATED_MEMBER name:<get-size> visibility:public modality:OPEN <> ($this:<root>.Impl) returnType:kotlin.Int
correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
overridden:
compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.fir.txt
Vendored
+8
View File
@@ -61,6 +61,8 @@ FILE fqName:<root> fileName:/Fir2IrClassifierStorage.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Fir2IrComponentsStorage modality:FINAL visibility:public superTypes:[<root>.Fir2IrComponents]'
PROPERTY name:session visibility:public modality:FINAL [val]
overridden:
public abstract session: <root>.FirSession [val]
FIELD PROPERTY_BACKING_FIELD name:session type:<root>.FirSession visibility:private [final]
EXPRESSION_BODY
GET_VAR 'session: <root>.FirSession declared in <root>.Fir2IrComponentsStorage.<init>' type=<root>.FirSession origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@@ -74,6 +76,8 @@ FILE fqName:<root> fileName:/Fir2IrClassifierStorage.kt
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:session type:<root>.FirSession visibility:private [final]' type=<root>.FirSession origin=null
receiver: GET_VAR '<this>: <root>.Fir2IrComponentsStorage declared in <root>.Fir2IrComponentsStorage.<get-session>' type=<root>.Fir2IrComponentsStorage origin=null
PROPERTY name:classifierStorage visibility:public modality:FINAL [lateinit,var]
overridden:
public abstract classifierStorage: <root>.Fir2IrClassifierStorage [val]
FIELD PROPERTY_BACKING_FIELD name:classifierStorage type:<root>.Fir2IrClassifierStorage visibility:public
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-classifierStorage> visibility:public modality:FINAL <> ($this:<root>.Fir2IrComponentsStorage) returnType:<root>.Fir2IrClassifierStorage
correspondingProperty: PROPERTY name:classifierStorage visibility:public modality:FINAL [lateinit,var]
@@ -113,6 +117,8 @@ FILE fqName:<root> fileName:/Fir2IrClassifierStorage.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Fir2IrClassifierStorage modality:FINAL visibility:public superTypes:[<root>.Fir2IrComponents]'
PROPERTY DELEGATED_MEMBER name:session visibility:public modality:OPEN [val]
overridden:
public abstract session: <root>.FirSession [val]
FUN DELEGATED_MEMBER name:<get-session> visibility:public modality:OPEN <> ($this:<root>.Fir2IrClassifierStorage) returnType:<root>.FirSession
correspondingProperty: PROPERTY DELEGATED_MEMBER name:session visibility:public modality:OPEN [val]
overridden:
@@ -124,6 +130,8 @@ FILE fqName:<root> fileName:/Fir2IrClassifierStorage.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:<root>.Fir2IrComponents visibility:local [final]' type=<root>.Fir2IrComponents origin=null
receiver: GET_VAR '<this>: <root>.Fir2IrClassifierStorage declared in <root>.Fir2IrClassifierStorage.<get-session>' type=<root>.Fir2IrClassifierStorage origin=null
PROPERTY DELEGATED_MEMBER name:classifierStorage visibility:public modality:OPEN [val]
overridden:
public abstract classifierStorage: <root>.Fir2IrClassifierStorage [val]
FUN DELEGATED_MEMBER name:<get-classifierStorage> visibility:public modality:OPEN <> ($this:<root>.Fir2IrClassifierStorage) returnType:<root>.Fir2IrClassifierStorage
correspondingProperty: PROPERTY DELEGATED_MEMBER name:classifierStorage visibility:public modality:OPEN [val]
overridden:
compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.txt
Vendored
+2
View File
@@ -71,6 +71,8 @@ FILE fqName:<root> fileName:/ImplicitReceiverStack.kt
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:boundSymbol type:S of <root>.ImplicitReceiverValue? visibility:private [final]' type=S of <root>.ImplicitReceiverValue? origin=null
receiver: GET_VAR '<this>: <root>.ImplicitReceiverValue<S of <root>.ImplicitReceiverValue> declared in <root>.ImplicitReceiverValue.<get-boundSymbol>' type=<root>.ImplicitReceiverValue<S of <root>.ImplicitReceiverValue> origin=null
PROPERTY name:type visibility:public modality:FINAL [val]
overridden:
public abstract type: kotlin.String [val]
FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.String visibility:private [final]
EXPRESSION_BODY
GET_VAR 'type: kotlin.String declared in <root>.ImplicitReceiverValue.<init>' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
compiler/testData/ir/irText/firProblems/candidateSymbol.fir.txt
Vendored
+2
View File
@@ -106,6 +106,8 @@ FILE fqName:<root> fileName:/candidateSymbol.kt
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirCallableMemberDeclaration<F of <root>.FirCallableMemberDeclaration>
TYPE_PARAMETER name:F index:0 variance: superTypes:[<root>.FirCallableMemberDeclaration<F of <root>.FirCallableMemberDeclaration>]
PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
overridden:
public abstract symbol: <root>.AbstractFirBasedSymbol<E of <root>.FirSymbolOwner> [val]
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-symbol> visibility:public modality:ABSTRACT <> ($this:<root>.FirCallableMemberDeclaration<F of <root>.FirCallableMemberDeclaration>) returnType:<root>.AbstractFirBasedSymbol<F of <root>.FirCallableMemberDeclaration>
correspondingProperty: PROPERTY name:symbol visibility:public modality:ABSTRACT [val]
overridden:
compiler/testData/ir/irText/firProblems/kt43342.fir.txt
Vendored
+8
View File
@@ -67,6 +67,8 @@ FILE fqName:<root> fileName:/kt43342.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> visibility:local [final]' type=kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
receiver: GET_VAR '<this>: <root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> declared in <root>.ControlFlowInfo.isEmpty' type=<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
PROPERTY DELEGATED_MEMBER name:entries visibility:public modality:OPEN [val]
overridden:
public abstract entries: kotlin.collections.Set<kotlin.collections.Map.Entry<K of kotlin.collections.Map, V of kotlin.collections.Map>> [val]
FUN DELEGATED_MEMBER name:<get-entries> visibility:public modality:OPEN <> ($this:<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>) returnType:kotlin.collections.Set<kotlin.collections.Map.Entry<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>>
correspondingProperty: PROPERTY DELEGATED_MEMBER name:entries visibility:public modality:OPEN [val]
overridden:
@@ -78,6 +80,8 @@ FILE fqName:<root> fileName:/kt43342.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> visibility:local [final]' type=kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
receiver: GET_VAR '<this>: <root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> declared in <root>.ControlFlowInfo.<get-entries>' type=<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
PROPERTY DELEGATED_MEMBER name:keys visibility:public modality:OPEN [val]
overridden:
public abstract keys: kotlin.collections.Set<K of kotlin.collections.Map> [val]
FUN DELEGATED_MEMBER name:<get-keys> visibility:public modality:OPEN <> ($this:<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>) returnType:kotlin.collections.Set<K of <root>.ControlFlowInfo>
correspondingProperty: PROPERTY DELEGATED_MEMBER name:keys visibility:public modality:OPEN [val]
overridden:
@@ -89,6 +93,8 @@ FILE fqName:<root> fileName:/kt43342.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> visibility:local [final]' type=kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
receiver: GET_VAR '<this>: <root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> declared in <root>.ControlFlowInfo.<get-keys>' type=<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
overridden:
public abstract size: kotlin.Int [val]
FUN DELEGATED_MEMBER name:<get-size> visibility:public modality:OPEN <> ($this:<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>) returnType:kotlin.Int
correspondingProperty: PROPERTY DELEGATED_MEMBER name:size visibility:public modality:OPEN [val]
overridden:
@@ -100,6 +106,8 @@ FILE fqName:<root> fileName:/kt43342.kt
$this: GET_FIELD 'FIELD DELEGATE name:<$$delegate_0> type:kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> visibility:local [final]' type=kotlin.collections.Map<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
receiver: GET_VAR '<this>: <root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> declared in <root>.ControlFlowInfo.<get-size>' type=<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo> origin=null
PROPERTY DELEGATED_MEMBER name:values visibility:public modality:OPEN [val]
overridden:
public abstract values: kotlin.collections.Collection<V of kotlin.collections.Map> [val]
FUN DELEGATED_MEMBER name:<get-values> visibility:public modality:OPEN <> ($this:<root>.ControlFlowInfo<K of <root>.ControlFlowInfo, V of <root>.ControlFlowInfo>) returnType:kotlin.collections.Collection<V of <root>.ControlFlowInfo>
correspondingProperty: PROPERTY DELEGATED_MEMBER name:values visibility:public modality:OPEN [val]
overridden:
compiler/testData/ir/irText/firProblems/typeVariableAfterBuildMap.fir.txt
Vendored
+4
View File
@@ -127,6 +127,8 @@ FILE fqName:<root> fileName:/typeVariableAfterBuildMap.kt
isPublicAPI: CONST Boolean type=kotlin.Boolean value=false
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:PrivateToThis modality:FINAL visibility:public superTypes:[<root>.Visibility]'
PROPERTY name:internalDisplayName visibility:public modality:FINAL [val]
overridden:
public open internalDisplayName: kotlin.String [val]
FUN name:<get-internalDisplayName> visibility:public modality:FINAL <> ($this:<root>.Visibilities.PrivateToThis) returnType:kotlin.String
correspondingProperty: PROPERTY name:internalDisplayName visibility:public modality:FINAL [val]
overridden:
@@ -450,6 +452,8 @@ FILE fqName:<root> fileName:/typeVariableAfterBuildMap.kt
RETURN type=kotlin.Nothing from='public final fun mustCheckInImports (): kotlin.Boolean declared in <root>.Visibilities.InvisibleFake'
CONST Boolean type=kotlin.Boolean value=true
PROPERTY name:externalDisplayName visibility:public modality:FINAL [val]
overridden:
public open externalDisplayName: kotlin.String [val]
FUN name:<get-externalDisplayName> visibility:public modality:FINAL <> ($this:<root>.Visibilities.InvisibleFake) returnType:kotlin.String
correspondingProperty: PROPERTY name:externalDisplayName visibility:public modality:FINAL [val]
overridden: