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

[FIR] SignatureEnhancement: reduce access to initializer field

Browse Source 
It can trigger lazy calculation of FirJavaField initializer

^KT-56543
This commit is contained in:
Dmitrii Gridin
2023-04-04 17:34:04 +02:00
committed by Space Team
parent 6170d83301
commit efdae98ba8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt
+4 -1
View File
@@ -42,10 +42,13 @@ class FirJavaField @FirImplementationDetail constructor(
override val isVar: Boolean,
annotationBuilder: () -> List<FirAnnotation>,
override val typeParameters: MutableList<FirTypeParameterRef>,
private var lazyInitializer: Lazy<FirExpression?>,
lazyInitializer: Lazy<FirExpression?>,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val attributes: FirDeclarationAttributes,
) : FirField() {
internal var lazyInitializer: Lazy<FirExpression?> = lazyInitializer
private set
init {
symbol.bind(this)
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+7 -4
View File
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.fakeElement
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.analysis.checkers.typeParameterSymbols
import org.jetbrains.kotlin.fir.caches.FirCache
import org.jetbrains.kotlin.fir.caches.FirCachesFactory
import org.jetbrains.kotlin.fir.caches.createCache
@@ -116,8 +115,7 @@ class FirSignatureEnhancement(
predefinedEnhancementInfo = null
).let {
val lowerBound = it.type.lowerBoundIfFlexible()
if (firElement.isStatic && firElement.initializer != null && (lowerBound.isString || lowerBound.isInt)) {
if ((lowerBound.isString || lowerBound.isInt) && firElement.isStatic && firElement.initializer != null) {
it.withReplacedConeType(it.type.withNullability(ConeNullability.NOT_NULL, session.typeContext))
} else {
it
@@ -140,7 +138,12 @@ class FirSignatureEnhancement(
isStatic = firElement.isStatic
annotationBuilder = { firElement.annotations }
status = firElement.status
initializer = firElement.initializer
if (firElement is FirJavaField) {
lazyInitializer = firElement.lazyInitializer
} else {
initializer = firElement.initializer
}
dispatchReceiverType = firElement.dispatchReceiverType
attributes = firElement.attributes.copy()
}