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

FirTypeResolver. Prohibit resolving FirResolvedTypeRef

Browse Source
This commit is contained in:
Simon Ogorodnik
2022-02-11 23:05:42 +03:00
committed by Space
parent bf3a3caee6
commit 2a7aa2f240
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
+1 -1
View File
@@ -471,7 +471,7 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
supertypeSupplier: SupertypeSupplier supertypeSupplier: SupertypeSupplier
): Pair<ConeKotlinType, ConeDiagnostic?> { ): Pair<ConeKotlinType, ConeDiagnostic?> {
return when (typeRef) { return when (typeRef) {
is FirResolvedTypeRef -> typeRef.type to null is FirResolvedTypeRef -> error("Do not resolve, resolved type-refs")
is FirUserTypeRef -> { is FirUserTypeRef -> {
val (symbol, substitutor, diagnostic) = resolveToSymbol(typeRef, scopeClassDeclaration, useSiteFile, supertypeSupplier) val (symbol, substitutor, diagnostic) = resolveToSymbol(typeRef, scopeClassDeclaration, useSiteFile, supertypeSupplier)
resolveUserType( resolveUserType(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+1 -1
View File
@@ -401,7 +401,7 @@ open class FirSupertypeResolverVisitor(
So we create a copy of supertypeRefs to avoid it So we create a copy of supertypeRefs to avoid it
*/ */
supertypeRefs.createCopy().mapTo(mutableListOf()) { supertypeRefs.createCopy().mapTo(mutableListOf()) {
val superTypeRef = transformer.transformTypeRef(it, scopeDeclaration) val superTypeRef = it.transform<FirTypeRef, ScopeClassDeclaration>(transformer, scopeDeclaration)
val typeParameterType = superTypeRef.coneTypeSafe<ConeTypeParameterType>() val typeParameterType = superTypeRef.coneTypeSafe<ConeTypeParameterType>()
when { when {
typeParameterType != null -> typeParameterType != null ->