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

FIR2IR: support backing field symbols from FIR, fix test data

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-06-20 12:46:38 +03:00
parent 54078c4e9c
commit ca401cb01d
7 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+2 -1
View File
@@ -106,6 +106,7 @@ fun FirNamedReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): Ir
when (val callableSymbol = this.coneSymbol) { when (val callableSymbol = this.coneSymbol) {
is FirFunctionSymbol -> return callableSymbol.toFunctionSymbol(declarationStorage) is FirFunctionSymbol -> return callableSymbol.toFunctionSymbol(declarationStorage)
is FirPropertySymbol -> return callableSymbol.toPropertyOrFieldSymbol(declarationStorage) is FirPropertySymbol -> return callableSymbol.toPropertyOrFieldSymbol(declarationStorage)
is FirBackingFieldSymbol -> return callableSymbol.toPropertyOrFieldSymbol(declarationStorage)
is FirVariableSymbol -> return callableSymbol.toValueSymbol(declarationStorage) is FirVariableSymbol -> return callableSymbol.toValueSymbol(declarationStorage)
} }
} }
@@ -124,7 +125,7 @@ fun FirFunctionSymbol.toFunctionSymbol(declarationStorage: Fir2IrDeclarationStor
return declarationStorage.getIrFunctionSymbol(this) return declarationStorage.getIrFunctionSymbol(this)
} }
fun FirPropertySymbol.toPropertyOrFieldSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol { fun FirVariableSymbol.toPropertyOrFieldSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol {
return declarationStorage.getIrPropertyOrFieldSymbol(this) return declarationStorage.getIrPropertyOrFieldSymbol(this)
} }
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+2 -2
View File
@@ -499,8 +499,8 @@ class Fir2IrDeclarationStorage(
} }
} }
fun getIrPropertyOrFieldSymbol(firPropertySymbol: FirPropertySymbol): IrSymbol { fun getIrPropertyOrFieldSymbol(firVariableSymbol: FirVariableSymbol): IrSymbol {
return when (val fir = firPropertySymbol.fir) { return when (val fir = firVariableSymbol.fir) {
is FirProperty -> { is FirProperty -> {
val irProperty = getIrProperty(fir).apply { val irProperty = getIrProperty(fir).apply {
setAndModifyParent(findIrParent(fir)) setAndModifyParent(findIrParent(fir))
compiler/testData/ir/irText/classes/initVar.fir.txt
Vendored
+6 -3
View File
@@ -138,7 +138,8 @@ FILE fqName:<root> fileName:/initVar.kt
$this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetter $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetter
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetter.<set-x>' type=kotlin.Int origin=null
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
overridden: overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -168,7 +169,8 @@ FILE fqName:<root> fileName:/initVar.kt
$this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterWithExplicitCtor $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterWithExplicitCtor
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetterWithExplicitCtor.<set-x>' type=kotlin.Int origin=null
ANONYMOUS_INITIALIZER isStatic=false ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY BLOCK_BODY
SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
@@ -206,7 +208,8 @@ FILE fqName:<root> fileName:/initVar.kt
$this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterInCtor $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterInCtor
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetterInCtor.<set-x>' type=kotlin.Int origin=null
CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterInCtor CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterInCtor
BLOCK_BODY BLOCK_BODY
SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
Vendored
+2 -1
View File
@@ -58,7 +58,8 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
$this: VALUE_PARAMETER name:<this> type:<root>.C $this: VALUE_PARAMETER name:<this> type:<root>.C
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.C.<set-test4>' type=kotlin.Int origin=null
PROPERTY name:test5 visibility:public modality:FINAL [var] 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:public
EXPRESSION_BODY EXPRESSION_BODY
compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
Vendored
+2 -1
View File
@@ -42,7 +42,8 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var]
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.<set-test4>' type=kotlin.Int origin=null
PROPERTY name:test5 visibility:public modality:FINAL [var] PROPERTY name:test5 visibility:public modality:FINAL [var]
FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static] FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static]
EXPRESSION_BODY EXPRESSION_BODY
compiler/testData/ir/irText/expressions/field.fir.txt
Vendored
+4 -3
View File
@@ -12,7 +12,8 @@ FILE fqName:<root> fileName:/field.kt
correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var]
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.<set-testSimple>' type=kotlin.Int origin=null
PROPERTY name:testAugmented visibility:public modality:FINAL [var] PROPERTY name:testAugmented visibility:public modality:FINAL [var]
FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static] FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]
EXPRESSION_BODY EXPRESSION_BODY
@@ -26,5 +27,5 @@ FILE fqName:<root> fileName:/field.kt
correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var]
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.<set-testAugmented>' type=kotlin.Int origin=null
compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
Vendored
+21 -20
View File
@@ -130,12 +130,13 @@ FILE fqName:<root> fileName:/propertyReferences.kt
correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var]
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-varWithBackingFieldAndAccessors> (): kotlin.Int declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-varWithBackingFieldAndAccessors> (): kotlin.Int declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType ERROR_CALL 'No getter found for F|/varWithBackingFieldAndAccessors|' type=kotlin.Int
FUN name:<set-varWithBackingFieldAndAccessors> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit FUN name:<set-varWithBackingFieldAndAccessors> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit
correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var]
VALUE_PARAMETER name:value index:0 type:kotlin.Int VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.<set-varWithBackingFieldAndAccessors>' type=kotlin.Int origin=null
PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val] PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [final,static] FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [final,static]
EXPRESSION_BODY EXPRESSION_BODY
@@ -146,39 +147,39 @@ FILE fqName:<root> fileName:/propertyReferences.kt
RETURN type=kotlin.Nothing from='public final fun <get-test_varWithBackingFieldAndAccessors> (): kotlin.Int declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-test_varWithBackingFieldAndAccessors> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
PROPERTY name:valWithAccessors visibility:public modality:FINAL [val] PROPERTY name:valWithAccessors visibility:public modality:FINAL [val]
FUN name:<get-valWithAccessors> visibility:public modality:FINAL <> () returnType:IrErrorType FUN name:<get-valWithAccessors> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:valWithAccessors visibility:public modality:FINAL [val] correspondingProperty: PROPERTY name:valWithAccessors visibility:public modality:FINAL [val]
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-valWithAccessors> (): IrErrorType declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-valWithAccessors> (): kotlin.Int declared in <root>'
CONST Int type=IrErrorType value=1 CONST Int type=kotlin.Int value=1
PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val] PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:IrErrorType visibility:public [final,static] FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.Int visibility:public [final,static]
EXPRESSION_BODY EXPRESSION_BODY
CALL 'public final fun <get-valWithAccessors> (): IrErrorType declared in <root>' type=IrErrorType origin=null CALL 'public final fun <get-valWithAccessors> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_valWithAccessors> visibility:public modality:FINAL <> () returnType:IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_valWithAccessors> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val] correspondingProperty: PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val]
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test_valWithAccessors> (): IrErrorType declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-test_valWithAccessors> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
PROPERTY name:varWithAccessors visibility:public modality:FINAL [var] PROPERTY name:varWithAccessors visibility:public modality:FINAL [var]
FUN name:<get-varWithAccessors> visibility:public modality:FINAL <> () returnType:IrErrorType FUN name:<get-varWithAccessors> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:varWithAccessors visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:varWithAccessors visibility:public modality:FINAL [var]
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-varWithAccessors> (): IrErrorType declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-varWithAccessors> (): kotlin.Int declared in <root>'
CONST Int type=IrErrorType value=1 CONST Int type=kotlin.Int value=1
FUN name:<set-varWithAccessors> visibility:public modality:FINAL <> (value:IrErrorType) returnType:kotlin.Unit FUN name:<set-varWithAccessors> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit
correspondingProperty: PROPERTY name:varWithAccessors visibility:public modality:FINAL [var] correspondingProperty: PROPERTY name:varWithAccessors visibility:public modality:FINAL [var]
VALUE_PARAMETER name:value index:0 type:IrErrorType VALUE_PARAMETER name:value index:0 type:kotlin.Int
BLOCK_BODY BLOCK_BODY
PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val] PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:IrErrorType visibility:public [final,static] FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.Int visibility:public [final,static]
EXPRESSION_BODY EXPRESSION_BODY
CALL 'public final fun <get-varWithAccessors> (): IrErrorType declared in <root>' type=IrErrorType origin=null CALL 'public final fun <get-varWithAccessors> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithAccessors> visibility:public modality:FINAL <> () returnType:IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithAccessors> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val] correspondingProperty: PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val]
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test_varWithAccessors> (): IrErrorType declared in <root>' RETURN type=kotlin.Nothing from='public final fun <get-test_varWithAccessors> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
PROPERTY name:delegatedVal visibility:public modality:FINAL [delegated,val] PROPERTY name:delegatedVal visibility:public modality:FINAL [delegated,val]
FIELD PROPERTY_BACKING_FIELD name:delegatedVal type:IrErrorType visibility:public [final,static] FIELD PROPERTY_BACKING_FIELD name:delegatedVal type:IrErrorType visibility:public [final,static]
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-delegatedVal> visibility:public modality:FINAL <> () returnType:IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name:<get-delegatedVal> visibility:public modality:FINAL <> () returnType:IrErrorType