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:
Dmitriy Novozhilov
2020-05-29 17:14:28 +03:00
parent 72813cefbe
commit 1d32cab11d
2 changed files with 5 additions and 3 deletions
@@ -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)
} }
@@ -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()
} }