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

[FIR] Drop ImplicitReceiverValue.expandedType

Browse Source 
This field cached expansion of type of implicit receiver, which is incorrect,
  because type of receiver may change because of smartcasts, but this field
  was immutable
This commit is contained in:
Dmitriy Novozhilov
2023-06-02 11:29:24 +03:00
committed by Space Team
parent c55ddab1bf
commit b564260a33
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
+1 -3
View File
@@ -97,7 +97,7 @@ open class ExpressionReceiverValue(
sealed class ImplicitReceiverValue<S : FirBasedSymbol<*>>( sealed class ImplicitReceiverValue<S : FirBasedSymbol<*>>(
val boundSymbol: S, val boundSymbol: S,
type: ConeKotlinType, type: ConeKotlinType,
protected val useSiteSession: FirSession, val useSiteSession: FirSession,
protected val scopeSession: ScopeSession, protected val scopeSession: ScopeSession,
private val mutable: Boolean, private val mutable: Boolean,
val contextReceiverNumber: Int = -1, val contextReceiverNumber: Int = -1,
@@ -110,8 +110,6 @@ sealed class ImplicitReceiverValue<S : FirBasedSymbol<*>>(
val originalType: ConeKotlinType = type val originalType: ConeKotlinType = type
val expandedType: ConeKotlinType = type.applyIf(type is ConeClassLikeType) { fullyExpandedType(useSiteSession) }
var implicitScope: FirTypeScope? = var implicitScope: FirTypeScope? =
type.scope( type.scope(
useSiteSession, useSiteSession,
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/declarations/ImplicitReceiverUtils.kt
+1 -1
View File
@@ -276,7 +276,7 @@ class FirTowerDataElement(
} }
private fun ImplicitReceiverValue<*>.getImplicitScope(): FirScope { private fun ImplicitReceiverValue<*>.getImplicitScope(): FirScope {
return when (expandedType) { return when (type.fullyExpandedType(useSiteSession)) {
is ConeErrorType, is ConeErrorType,
is ConeStubType -> FirTypeScope.Empty is ConeStubType -> FirTypeScope.Empty
else -> implicitScope ?: error("Scope for type ${type::class.simpleName} is null.") else -> implicitScope ?: error("Scope for type ${type::class.simpleName} is null.")