From f21d1e1c1bafad97bdf630be987cdc9c72fc16c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 29 May 2020 16:10:26 +0300 Subject: [PATCH] [FIR] Record non-user type refs to resolved type refs That `delegatedTypeRef` is needed for reporting errors on value parameters of function types and errors about cyclic dependencies between types See 6f241c6d --- .../resolve/transformers/FirSpecificTypeResolverTransformer.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt index a1bc1fdc519..3980941fcf5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt @@ -47,6 +47,9 @@ class FirSpecificTypeResolverTransformer( source = typeRef.source type = resolvedType.takeIfAcceptable() ?: return typeRef.compose() annotations += typeRef.annotations + if (typeRef !is FirUserTypeRef) { + delegatedTypeRef = typeRef + } }.compose() }