diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index ca1b4cb1348..cce08986244 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -195,7 +195,7 @@ fun BodyResolveComponents.typeFromCallee(access: T): FirReso else implicitReceiverStack.lastDispatchReceiver() val resolvedTypeRef = newCallee.superTypeRef as? FirResolvedTypeRef - ?: implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs?.singleOrNull() as? FirResolvedTypeRef + ?: implicitReceiver?.boundSymbol?.fir?.superTypeRefs?.singleOrNull() as? FirResolvedTypeRef resolvedTypeRef ?: buildErrorTypeRef { source = newCallee.source diagnostic = ConeUnresolvedNameError(Name.identifier("super")) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt index e19570b24fa..edaa7211755 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.calls.* import org.jetbrains.kotlin.fir.resolve.diagnostics.* import org.jetbrains.kotlin.fir.resolve.inference.FirStubInferenceSession -import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.InvocationKindTransformer import org.jetbrains.kotlin.fir.resolve.transformers.StoreReceiver import org.jetbrains.kotlin.fir.resolve.transformers.firClassLike @@ -160,7 +159,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform val actualSuperType = (superReference.superTypeRef.coneType as? ConeClassLikeType) ?.fullyExpandedType(session)?.let { superType -> val classId = superType.lookupTag.classId - val superTypeRefs = implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs + val superTypeRefs = implicitReceiver?.boundSymbol?.fir?.superTypeRefs val correspondingDeclaredSuperType = superTypeRefs?.firstOrNull { it.coneType.fullyExpandedType(session).classId == classId }?.coneTypeSafe()?.fullyExpandedType(session) ?: return@let superType @@ -190,7 +189,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform superReferenceContainer.resultType = actualSuperTypeRef } else -> { - val superTypeRefs = implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs + val superTypeRefs = implicitReceiver?.boundSymbol?.fir?.superTypeRefs val resultType = when { superTypeRefs?.isNotEmpty() != true || containingCall == null -> { buildErrorTypeRef { @@ -656,7 +655,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform lhs.typeArguments.map { it.toConeTypeProjection() }.toTypedArray() } else { // Otherwise, prepare the star projections as many as the size of type parameters. - Array((symbol?.phasedFir as? FirTypeParameterRefsOwner)?.typeParameters?.size ?: 0) { + Array((symbol?.fir as? FirTypeParameterRefsOwner)?.typeParameters?.size ?: 0) { ConeStarProjection } }