Revert "[FIR] Don't save original user type in FirResolvedTypeRef"
Also fix `FirGeneratedElementsValidator` so it doesn't check `FirResolvedTypeRef.delegatedTypeRef`
This commit is contained in:
+4
@@ -53,6 +53,10 @@ object FirGeneratedElementsValidator : FirDefaultVisitorVoid() {
|
|||||||
typeRef.acceptChildren(this)
|
typeRef.acceptChildren(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef) {
|
||||||
|
resolvedTypeRef.annotations.forEach { it.accept(this) }
|
||||||
|
}
|
||||||
|
|
||||||
override fun visitDeclarationStatus(declarationStatus: FirDeclarationStatus) {
|
override fun visitDeclarationStatus(declarationStatus: FirDeclarationStatus) {
|
||||||
require(declarationStatus is FirResolvedDeclarationStatus)
|
require(declarationStatus is FirResolvedDeclarationStatus)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-3
@@ -47,9 +47,7 @@ class FirSpecificTypeResolverTransformer(
|
|||||||
source = typeRef.source
|
source = typeRef.source
|
||||||
type = resolvedType.takeIfAcceptable() ?: return typeRef.compose()
|
type = resolvedType.takeIfAcceptable() ?: return typeRef.compose()
|
||||||
annotations += typeRef.annotations
|
annotations += typeRef.annotations
|
||||||
if (typeRef !is FirUserTypeRef) {
|
delegatedTypeRef = typeRef
|
||||||
delegatedTypeRef = typeRef
|
|
||||||
}
|
|
||||||
}.compose()
|
}.compose()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user