From 7add18661684dba4aabcf7759f74eb3287fd539d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 7 Dec 2020 13:01:12 +0300 Subject: [PATCH] Optimize/simplify FirClass<*>.findNonInterfaceSupertype --- .../jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index 7ce2f17043d..2b5a7f6f0d4 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -288,12 +288,12 @@ private fun FirDeclaration.hasBody(): Boolean = when (this) { */ fun FirClass<*>.findNonInterfaceSupertype(context: CheckerContext): FirTypeRef? { for (it in superTypeRefs) { - val classId = it.safeAs() + val lookupTag = it.safeAs() ?.type.safeAs() - ?.lookupTag?.classId + ?.lookupTag ?: continue - val fir = context.session.firSymbolProvider.getClassLikeSymbolByFqName(classId) + val fir = lookupTag.toSymbol(context.session) ?.fir.safeAs>() ?: continue