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

FIR2IR: IrField.isFakeOverride

Browse Source
This commit is contained in:
Dmitry Petrov
2019-10-23 18:03:12 +03:00
parent edaa42ea46
commit 3fcdbf2c88
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+2 -1
View File
@@ -558,7 +558,8 @@ class Fir2IrDeclarationStorage(
field.name, type, field.visibility, field.name, type, field.visibility,
isFinal = field.modality == Modality.FINAL, isFinal = field.modality == Modality.FINAL,
isExternal = false, isExternal = false,
isStatic = field.isStatic isStatic = field.isStatic,
isFakeOverride = false
).apply { ).apply {
descriptor.bind(this) descriptor.bind(this)
} }
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+2 -1
View File
@@ -510,7 +510,8 @@ class Fir2IrVisitor(
startOffset, endOffset, origin, symbol, startOffset, endOffset, origin, symbol,
name, inferredType, name, inferredType,
visibility, isFinal = isFinal, isExternal = false, visibility, isFinal = isFinal, isExternal = false,
isStatic = property.isStatic || parent !is IrClass isStatic = property.isStatic || parent !is IrClass,
isFakeOverride = origin == IrDeclarationOrigin.FAKE_OVERRIDE
) )
}.setParentByParentStack().withParent { }.setParentByParentStack().withParent {
declarationStorage.enterScope(descriptor) declarationStorage.enterScope(descriptor)