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

[FIR] Handle lateinit local variable properly

Browse Source
This commit is contained in:
Jinseong Jeon
2020-04-07 09:17:22 +03:00
committed by Mikhail Glukhikh
parent 33d4655053
commit fa9d79392f
8 changed files with 8 additions and 8 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
@@ -787,10 +787,11 @@ class Fir2IrDeclarationStorage(
variable.name.isSpecial -> IrDeclarationOrigin.IR_TEMPORARY_VARIABLE
else -> IrDeclarationOrigin.DEFINED
}
val isLateInit = if (variable is FirProperty) variable.isLateInit else false
val irVariable = variable.convertWithOffsets { startOffset, endOffset ->
declareIrVariable(
startOffset, endOffset, origin,
variable.name, type, variable.isVar, isConst = false, isLateinit = false
variable.name, type, variable.isVar, isConst = false, isLateinit = isLateInit
)
}
irVariable.parent = irParent
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+3 -1
View File
@@ -880,7 +880,9 @@ class DeclarationsConverter(
expression = expressionConverter.getAsFirExpression(it, "Incorrect delegate expression")
}
}
status = FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
status = FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL).apply {
isLateInit = modifiers.hasLateinit()
}
val receiver = delegateExpression?.let {
expressionConverter.getAsFirExpression<FirExpression>(it, "Incorrect delegate expression")
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+3 -1
View File
@@ -958,7 +958,9 @@ class RawFirBuilder(
}
}
status = FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
status = FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL).apply {
isLateInit = hasModifier(LATEINIT_KEYWORD)
}
val receiver = delegateExpression?.toFirExpression("Incorrect delegate expression")
generateAccessorsByDelegate(delegateBuilder, null, baseSession, isExtension = false, stubMode, receiver)