Revert "FIR: Report CAPTURED_VAL_INITIALIZATION if initialization is done"
This reverts commit 1c4023fda5.
#KT-64854 Submitted
#KT-59906 Submitted
This commit is contained in:
committed by
Space Team
parent
0fe793943d
commit
0b34d66b87
-7
@@ -131,13 +131,6 @@ private fun PropertyInitializationInfoData.checkPropertyAccesses(
|
||||
else
|
||||
FirErrors.CAPTURED_VAL_INITIALIZATION
|
||||
reporter.reportOn(node.fir.lValue.source, error, symbol, context)
|
||||
} else if (!symbol.isLocal && getValue(node).values.any { symbol !in it.initializedInsideConstructor }) {
|
||||
/* If the assignment is inside INVOKE_ONCE lambda and the lambda is not inlined,
|
||||
backend generates either separate function or separate class for the lambda.
|
||||
If we try to initialize non-static final field there, we will get exception at
|
||||
runtime, since we can initialize such fields only inside constructors.
|
||||
*/
|
||||
reporter.reportOn(node.fir.lValue.source, FirErrors.CAPTURED_VAL_INITIALIZATION, symbol, context)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -47,8 +47,6 @@ class PropertyInitializationInfo(
|
||||
val EMPTY = PropertyInitializationInfo()
|
||||
}
|
||||
|
||||
val initializedInsideConstructor: MutableSet<FirPropertySymbol> = mutableSetOf()
|
||||
|
||||
override val constructor: (PersistentMap<FirPropertySymbol, EventOccurrencesRange>) -> PropertyInitializationInfo =
|
||||
::PropertyInitializationInfo
|
||||
}
|
||||
|
||||
-57
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.fir.analysis.cfa.util
|
||||
|
||||
import kotlinx.collections.immutable.persistentMapOf
|
||||
import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange
|
||||
import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
|
||||
import org.jetbrains.kotlin.fir.declarations.InlineStatus
|
||||
import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression
|
||||
import org.jetbrains.kotlin.fir.expressions.calleeReference
|
||||
import org.jetbrains.kotlin.fir.expressions.dispatchReceiver
|
||||
@@ -42,8 +40,6 @@ class PropertyInitializationInfoCollector(
|
||||
private val EMPTY_INFO: PathAwarePropertyInitializationInfo = persistentMapOf(NormalPath to PropertyInitializationInfo.EMPTY)
|
||||
}
|
||||
|
||||
private val scopeStack = arrayListOf<ControlFlowGraph>()
|
||||
|
||||
override val emptyInfo: PathAwarePropertyInitializationInfo
|
||||
get() = EMPTY_INFO
|
||||
|
||||
@@ -62,17 +58,6 @@ class PropertyInitializationInfoCollector(
|
||||
val symbol = node.fir.calleeReference?.toResolvedPropertySymbol() ?: return dataForNode
|
||||
if (symbol !in localProperties) return dataForNode
|
||||
return addRange(dataForNode, symbol, EventOccurrencesRange.EXACTLY_ONCE)
|
||||
.also { it.setPropertyAsInitializedInsideConstructorIfNeeded(symbol) }
|
||||
}
|
||||
|
||||
private fun PathAwarePropertyInitializationInfo.setPropertyAsInitializedInsideConstructorIfNeeded(
|
||||
symbol: FirPropertySymbol,
|
||||
) {
|
||||
if (scopeStack.all { (it.declaration as? FirAnonymousFunction)?.inlineStatus == InlineStatus.Inline }) {
|
||||
for (info in values) {
|
||||
info.initializedInsideConstructor.add(symbol)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun visitVariableDeclarationNode(
|
||||
@@ -137,48 +122,6 @@ class PropertyInitializationInfoCollector(
|
||||
declaredVariableCollector.exitCapturingStatement(node.fir)
|
||||
return visitNode(node, data)
|
||||
}
|
||||
|
||||
override fun visitFunctionEnterNode(
|
||||
node: FunctionEnterNode,
|
||||
data: PathAwareControlFlowInfo<PropertyInitializationInfo>
|
||||
): PathAwareControlFlowInfo<PropertyInitializationInfo> {
|
||||
if (node.owner.declaration is FirAnonymousFunction) {
|
||||
scopeStack.add(node.owner)
|
||||
}
|
||||
return super.visitFunctionEnterNode(node, data)
|
||||
}
|
||||
|
||||
override fun visitFunctionExitNode(
|
||||
node: FunctionExitNode,
|
||||
data: PathAwareControlFlowInfo<PropertyInitializationInfo>
|
||||
): PathAwareControlFlowInfo<PropertyInitializationInfo> {
|
||||
if (node.owner.declaration is FirAnonymousFunction) {
|
||||
assert(scopeStack.isNotEmpty() && node.owner == scopeStack.last()) {
|
||||
"Unexpected scopeStack's top. Expected: ${node.owner.name}, but got: ${if (scopeStack.isEmpty()) "null" else scopeStack.last().name}"
|
||||
}
|
||||
scopeStack.removeLast()
|
||||
}
|
||||
return super.visitFunctionExitNode(node, data)
|
||||
}
|
||||
|
||||
override fun visitAnonymousObjectEnterNode(
|
||||
node: AnonymousObjectEnterNode,
|
||||
data: PathAwareControlFlowInfo<PropertyInitializationInfo>
|
||||
): PathAwareControlFlowInfo<PropertyInitializationInfo> {
|
||||
scopeStack.add(node.owner)
|
||||
return super.visitAnonymousObjectEnterNode(node, data)
|
||||
}
|
||||
|
||||
override fun visitAnonymousObjectExpressionExitNode(
|
||||
node: AnonymousObjectExpressionExitNode,
|
||||
data: PathAwareControlFlowInfo<PropertyInitializationInfo>
|
||||
): PathAwareControlFlowInfo<PropertyInitializationInfo> {
|
||||
assert(scopeStack.isNotEmpty() && node.owner == scopeStack.last()) {
|
||||
"Unexpected scopeStack's top. Expected: ${node.owner.name}, but got: ${if (scopeStack.isEmpty()) "null" else scopeStack.last().name}"
|
||||
}
|
||||
scopeStack.removeLast()
|
||||
return super.visitAnonymousObjectExpressionExitNode(node, data)
|
||||
}
|
||||
}
|
||||
|
||||
internal fun <S : ControlFlowInfo<S, K, EventOccurrencesRange>, K : Any> addRange(
|
||||
|
||||
Reference in New Issue
Block a user