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

FIR LC: use property modifiers for backing field if lateinit

Browse Source
This commit is contained in:
Jinseong Jeon
2021-09-17 12:20:16 -07:00
committed by Ilya Kirillov
parent a2bfcfeae8
commit 150f066254
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt
+4 -2
View File
@@ -170,9 +170,11 @@ internal class FirLightClassForSymbol(
for (propertySymbol in propertySymbols) { for (propertySymbol in propertySymbols) {
val isJvmField = propertySymbol.hasJvmFieldAnnotation() val isJvmField = propertySymbol.hasJvmFieldAnnotation()
val isJvmStatic = propertySymbol.hasJvmStaticAnnotation() val isJvmStatic = propertySymbol.hasJvmStaticAnnotation()
val isLateInit = (propertySymbol as? KtKotlinPropertySymbol)?.isLateInit == true
val forceStatic = isObject && (propertySymbol is KtKotlinPropertySymbol && propertySymbol.isConst || isJvmStatic || isJvmField) val forceStatic =
val takePropertyVisibility = !isCompanionObject && (isJvmField || forceStatic) isObject && (propertySymbol is KtKotlinPropertySymbol && propertySymbol.isConst || isJvmStatic || isJvmField)
val takePropertyVisibility = !isCompanionObject && (isLateInit || isJvmField || forceStatic)
createField( createField(
declaration = propertySymbol, declaration = propertySymbol,
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
Vendored
+3 -1
View File
@@ -36,4 +36,6 @@ class Class {
private val privateN: String? = { "" }() private val privateN: String? = { "" }()
lateinit var lateInitVar: String lateinit var lateInitVar: String
} }
// FIR_COMPARISON