[Analysis API] Keep the collected 'FirTowerDataContext' mutable

'ContextCollector' is used for computing context of 'FirCodeFragment's.
Code fragments themselves might contain additional smart cast operations
that modify the context receiver stack.

^KT-63056 Fixed
This commit is contained in:
Yan Zhulanow
2023-11-01 19:04:59 +09:00
committed by Space Team
parent 4a7f12a8eb
commit 0944e8fc36
14 changed files with 87 additions and 27 deletions
@@ -176,7 +176,7 @@ sealed class ImplicitReceiverValue<S : FirBasedSymbol<*>>(
)
}
abstract fun createSnapshot(): ImplicitReceiverValue<S>
abstract fun createSnapshot(keepMutable: Boolean): ImplicitReceiverValue<S>
}
private fun receiverExpression(
@@ -219,8 +219,8 @@ class ImplicitDispatchReceiverValue(
useSiteSession, scopeSession
)
override fun createSnapshot(): ImplicitReceiverValue<FirClassSymbol<*>> {
return ImplicitDispatchReceiverValue(boundSymbol, type, useSiteSession, scopeSession, false)
override fun createSnapshot(keepMutable: Boolean): ImplicitReceiverValue<FirClassSymbol<*>> {
return ImplicitDispatchReceiverValue(boundSymbol, type, useSiteSession, scopeSession, keepMutable)
}
override val isContextReceiver: Boolean
@@ -234,8 +234,8 @@ class ImplicitExtensionReceiverValue(
scopeSession: ScopeSession,
mutable: Boolean = true,
) : ImplicitReceiverValue<FirCallableSymbol<*>>(boundSymbol, type, useSiteSession, scopeSession, mutable) {
override fun createSnapshot(): ImplicitReceiverValue<FirCallableSymbol<*>> {
return ImplicitExtensionReceiverValue(boundSymbol, type, useSiteSession, scopeSession, false)
override fun createSnapshot(keepMutable: Boolean): ImplicitReceiverValue<FirCallableSymbol<*>> {
return ImplicitExtensionReceiverValue(boundSymbol, type, useSiteSession, scopeSession, keepMutable)
}
override val isContextReceiver: Boolean
@@ -250,8 +250,8 @@ class InaccessibleImplicitReceiverValue(
scopeSession: ScopeSession,
mutable: Boolean = true,
) : ImplicitReceiverValue<FirClassSymbol<*>>(boundSymbol, type, useSiteSession, scopeSession, mutable, inaccessibleReceiver = true) {
override fun createSnapshot(): ImplicitReceiverValue<FirClassSymbol<*>> {
return InaccessibleImplicitReceiverValue(boundSymbol, type, useSiteSession, scopeSession, false)
override fun createSnapshot(keepMutable: Boolean): ImplicitReceiverValue<FirClassSymbol<*>> {
return InaccessibleImplicitReceiverValue(boundSymbol, type, useSiteSession, scopeSession, keepMutable)
}
override val isContextReceiver: Boolean
@@ -269,7 +269,7 @@ sealed class ContextReceiverValue<S : FirBasedSymbol<*>>(
) : ImplicitReceiverValue<S>(
boundSymbol, type, useSiteSession, scopeSession, mutable, contextReceiverNumber,
) {
abstract override fun createSnapshot(): ContextReceiverValue<S>
abstract override fun createSnapshot(keepMutable: Boolean): ContextReceiverValue<S>
override val isContextReceiver: Boolean
get() = true
@@ -286,8 +286,8 @@ class ContextReceiverValueForCallable(
) : ContextReceiverValue<FirCallableSymbol<*>>(
boundSymbol, type, labelName, useSiteSession, scopeSession, mutable, contextReceiverNumber
) {
override fun createSnapshot(): ContextReceiverValue<FirCallableSymbol<*>> =
ContextReceiverValueForCallable(boundSymbol, type, labelName, useSiteSession, scopeSession, mutable = false, contextReceiverNumber)
override fun createSnapshot(keepMutable: Boolean): ContextReceiverValue<FirCallableSymbol<*>> =
ContextReceiverValueForCallable(boundSymbol, type, labelName, useSiteSession, scopeSession, keepMutable, contextReceiverNumber)
}
class ContextReceiverValueForClass(
@@ -301,8 +301,8 @@ class ContextReceiverValueForClass(
) : ContextReceiverValue<FirClassSymbol<*>>(
boundSymbol, type, labelName, useSiteSession, scopeSession, mutable, contextReceiverNumber
) {
override fun createSnapshot(): ContextReceiverValue<FirClassSymbol<*>> =
ContextReceiverValueForClass(boundSymbol, type, labelName, useSiteSession, scopeSession, mutable = false, contextReceiverNumber)
override fun createSnapshot(keepMutable: Boolean): ContextReceiverValue<FirClassSymbol<*>> =
ContextReceiverValueForClass(boundSymbol, type, labelName, useSiteSession, scopeSession, keepMutable, contextReceiverNumber)
}
class ImplicitReceiverValueForScript(
@@ -316,7 +316,7 @@ class ImplicitReceiverValueForScript(
) : ContextReceiverValue<FirScriptSymbol>(
boundSymbol, type, labelName, useSiteSession, scopeSession, mutable, contextReceiverNumber
) {
override fun createSnapshot(): ContextReceiverValue<FirScriptSymbol> =
ImplicitReceiverValueForScript(boundSymbol, type, labelName, useSiteSession, scopeSession, mutable = false, contextReceiverNumber)
override fun createSnapshot(keepMutable: Boolean): ContextReceiverValue<FirScriptSymbol> =
ImplicitReceiverValueForScript(boundSymbol, type, labelName, useSiteSession, scopeSession, keepMutable, contextReceiverNumber)
}
@@ -949,7 +949,10 @@ class BodyResolveContext(
@OptIn(PrivateForInline::class)
fun storeCallableReferenceContext(callableReferenceAccess: FirCallableReferenceAccess) {
specialTowerDataContexts.storeCallableReferenceContext(callableReferenceAccess, towerDataContext.createSnapshot())
specialTowerDataContexts.storeCallableReferenceContext(
callableReferenceAccess,
towerDataContext.createSnapshot(keepMutable = false)
)
}
@OptIn(PrivateForInline::class)
@@ -236,12 +236,12 @@ class FirTowerDataContext private constructor(
)
}
fun createSnapshot(): FirTowerDataContext {
fun createSnapshot(keepMutable: Boolean): FirTowerDataContext {
return FirTowerDataContext(
towerDataElements.map(FirTowerDataElement::createSnapshot).toPersistentList(),
implicitReceiverStack.createSnapshot(),
towerDataElements.map { it.createSnapshot(keepMutable) }.toPersistentList(),
implicitReceiverStack.createSnapshot(keepMutable),
localScopes.toPersistentList(),
nonLocalTowerDataElements.map(FirTowerDataElement::createSnapshot).toPersistentList()
nonLocalTowerDataElements.map { it.createSnapshot(keepMutable) }.toPersistentList()
)
}
}
@@ -254,11 +254,11 @@ class FirTowerDataElement(
val isLocal: Boolean,
val staticScopeOwnerSymbol: FirRegularClassSymbol? = null
) {
fun createSnapshot(): FirTowerDataElement =
fun createSnapshot(keepMutable: Boolean): FirTowerDataElement =
FirTowerDataElement(
scope,
implicitReceiver?.createSnapshot(),
contextReceiverGroup?.map { it.createSnapshot() },
implicitReceiver?.createSnapshot(keepMutable),
contextReceiverGroup?.map { it.createSnapshot(keepMutable) },
isLocal,
staticScopeOwnerSymbol
)
@@ -110,9 +110,9 @@ class PersistentImplicitReceiverStack private constructor(
stack[index].updateTypeFromSmartcast(type)
}
fun createSnapshot(): PersistentImplicitReceiverStack {
fun createSnapshot(keepMutable: Boolean): PersistentImplicitReceiverStack {
return PersistentImplicitReceiverStack(
stack.map { it.createSnapshot() }.toPersistentList(),
stack.map { it.createSnapshot(keepMutable) }.toPersistentList(),
receiversPerLabel,
indexesPerSymbol,
originalTypes