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

[LL FIR] mark entire delegate as lazy expression

Browse Source 
To simplify modification and restoring

^KT-59687
This commit is contained in:
Dmitrii Gridin
2023-07-01 22:59:12 +02:00
committed by Space Team
parent f8b2b4ac21
commit a81523fa74
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
+5 -10
View File
@@ -139,9 +139,9 @@ private fun replaceLazyInitializer(target: FirVariable, copy: FirVariable) {
}
}
private fun replaceLazyExpression(target: FirWrappedExpression, copy: FirWrappedExpression) {
if (target.expression is FirLazyExpression) {
target.replaceExpression(copy.expression)
private fun replaceLazyDelegate(target: FirVariable, copy: FirVariable) {
if (target.delegate is FirLazyExpression) {
target.replaceDelegate(copy.delegate)
}
}
@@ -187,17 +187,12 @@ private fun calculateLazyBodyForProperty(designation: FirDesignation) {
}
replaceLazyInitializer(firProperty, newProperty)
replaceLazyDelegate(firProperty, newProperty)
firProperty.getExplicitBackingField()?.let { backingField ->
val newBackingField = newProperty.getExplicitBackingField()!!
replaceLazyInitializer(backingField, newBackingField)
}
(firProperty.delegate as? FirWrappedDelegateExpression)?.let { delegate ->
val newDelegate = newProperty.delegate as FirWrappedDelegateExpression
replaceLazyExpression(delegate, newDelegate)
delegate.replaceDelegateProvider(newDelegate.delegateProvider)
}
}
private fun calculateLazyInitializerForEnumEntry(designation: FirDesignation) {
@@ -258,7 +253,7 @@ private fun needCalculatingLazyBodyForProperty(firProperty: FirProperty): Boolea
firProperty.getter?.let { needCalculatingLazyBodyForFunction(it) } == true
|| firProperty.setter?.let { needCalculatingLazyBodyForFunction(it) } == true
|| firProperty.initializer is FirLazyExpression
|| (firProperty.delegate as? FirWrappedDelegateExpression)?.expression is FirLazyExpression
|| firProperty.delegate is FirLazyExpression
|| firProperty.getExplicitBackingField()?.initializer is FirLazyExpression
private enum class FirLazyAnnotationTransformerScope {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
+7 -8
View File
@@ -223,6 +223,7 @@ internal object BodyStateKeepers {
if (!isCallableWithSpecialBody(variable)) {
add(FirVariable::initializerIfUnresolved, FirVariable::replaceInitializer, ::expressionGuard)
add(FirVariable::delegateIfUnresolved, FirVariable::replaceDelegate, ::expressionGuard)
}
}
@@ -253,11 +254,6 @@ internal object BodyStateKeepers {
entity(property.setterIfUnresolved, FUNCTION)
entity(property.backingFieldIfUnresolved, VARIABLE)
entity(property.delegateIfUnresolved) {
add(FirWrappedDelegateExpression::expression, FirWrappedDelegateExpression::replaceExpression, ::expressionGuard)
add(FirWrappedDelegateExpression::delegateProvider, FirWrappedDelegateExpression::replaceDelegateProvider, ::expressionGuard)
}
add(FirProperty::controlFlowGraphReference, FirProperty::replaceControlFlowGraphReference)
}
}
@@ -324,6 +320,12 @@ private val FirVariable.initializerIfUnresolved: FirExpression?
else -> initializer
}
private val FirVariable.delegateIfUnresolved: FirExpression?
get() = when (this) {
is FirProperty -> if (bodyResolveState < FirPropertyBodyResolveState.EVERYTHING_RESOLVED) delegate else null
else -> delegate
}
private val FirProperty.backingFieldIfUnresolved: FirBackingField?
get() = if (bodyResolveState < FirPropertyBodyResolveState.INITIALIZER_RESOLVED) getExplicitBackingField() else null
@@ -333,9 +335,6 @@ private val FirProperty.getterIfUnresolved: FirPropertyAccessor?
private val FirProperty.setterIfUnresolved: FirPropertyAccessor?
get() = if (bodyResolveState < FirPropertyBodyResolveState.EVERYTHING_RESOLVED) setter else null
private val FirProperty.delegateIfUnresolved: FirWrappedDelegateExpression?
get() = if (bodyResolveState < FirPropertyBodyResolveState.EVERYTHING_RESOLVED) delegate as? FirWrappedDelegateExpression else null
private fun delegatedConstructorCallGuard(fir: FirDelegatedConstructorCall): FirDelegatedConstructorCall {
if (fir is FirLazyDelegatedConstructorCall) {
return fir