Revert "FIR: do not eagerly resolve class references in imported annotations"
This reverts commit 1a57d60f
This commit is contained in:
@@ -641,7 +641,7 @@ internal fun JavaAnnotationArgument.toFirExpression(
|
||||
is JavaClassObjectAnnotationArgument -> buildGetClassCall {
|
||||
argumentList = buildUnaryArgumentList(
|
||||
buildClassReferenceExpression {
|
||||
classTypeRef = getReferencedType().toFirJavaTypeRef(session, javaTypeParameterStack)
|
||||
classTypeRef = getReferencedType().toFirResolvedTypeRef(session, javaTypeParameterStack)
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -704,3 +704,17 @@ private fun FirConstExpression<*>.setProperType(session: FirSession): FirConstEx
|
||||
replaceTypeRef(typeRef)
|
||||
return this
|
||||
}
|
||||
|
||||
private fun JavaType.toFirResolvedTypeRef(
|
||||
session: FirSession, javaTypeParameterStack: JavaTypeParameterStack
|
||||
): FirResolvedTypeRef {
|
||||
if (this is JavaClassifierType) return toFirResolvedTypeRef(
|
||||
session,
|
||||
javaTypeParameterStack,
|
||||
isForSupertypes = false,
|
||||
forTypeParameterBounds = false
|
||||
)
|
||||
return buildResolvedTypeRef {
|
||||
type = ConeClassErrorType(ConeSimpleDiagnostic("Unexpected JavaType: $this", DiagnosticKind.Java))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user