diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt index 2e16716c23a..5ab8640c6cd 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt @@ -356,7 +356,7 @@ abstract class FirVisibilityChecker : FirSessionComponent { stubTypesEqualToAnything = false ) if (AbstractTypeChecker.isSubtypeOf( - typeCheckerState, dispatchReceiverType.fullyExpandedType(session), containingUseSiteClass.typeWithStarProjections() + typeCheckerState, dispatchReceiverType.fullyExpandedType(session), containingUseSiteClass.symbol.typeWithStarProjections() ) ) { return true diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt index 6dd5edcc980..7efb9f90765 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt @@ -119,10 +119,10 @@ fun ClassId.defaultType(parameters: List): ConeClassLike isNullable = false, ) -fun FirClass.typeWithStarProjections(): ConeClassLikeType = +fun FirClassSymbol<*>.typeWithStarProjections(): ConeClassLikeType = ConeClassLikeTypeImpl( - symbol.toLookupTag(), - typeParameters.map { ConeStarProjection }.toTypedArray(), + this.toLookupTag(), + typeParameterSymbols.map { ConeStarProjection }.toTypedArray(), isNullable = false ) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/fir/SerializationFirResolveExtension.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/fir/SerializationFirResolveExtension.kt index 02a8388eb28..427186dd819 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/fir/SerializationFirResolveExtension.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/fir/SerializationFirResolveExtension.kt @@ -260,8 +260,7 @@ class SerializationFirResolveExtension(session: FirSession) : FirDeclarationGene }) superTypeRefs += buildResolvedTypeRef { - @OptIn(SymbolInternals::class) - type = generatedSerializerClassId.constructClassLikeType(arrayOf(owner.fir.typeWithStarProjections()), isNullable = false) + type = generatedSerializerClassId.constructClassLikeType(arrayOf(owner.typeWithStarProjections()), isNullable = false) } } // TODO: add typed constructor