From 46d16dfb6c267fc89b9cbf1e600b323baefcc227 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 13 Feb 2024 01:13:44 +0100 Subject: [PATCH] [LL FIR] PersistenceContextCollector: change designation path resolution order We will process more specific declaration firstly to avoid contention. As the next step of addbb713a545ea0620a0c0ddf27b3551d9251872 ^KT-65780 --- .../fir/ContextCollectingDiagnosticCollectorVisitor.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/ContextCollectingDiagnosticCollectorVisitor.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/ContextCollectingDiagnosticCollectorVisitor.kt index 7e38d7a3352..8a2b8306912 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/ContextCollectingDiagnosticCollectorVisitor.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/ContextCollectingDiagnosticCollectorVisitor.kt @@ -84,14 +84,14 @@ internal object PersistenceContextCollector { requireWithAttachment( !isLocal, - { "Cannot collect context for local declaration ${declaration::class}" } + { "Cannot collect context for local declaration ${declaration::class.simpleName}" }, ) { withFirEntry("declaration", declaration) } val designation = declaration.collectDesignation(firFile) - designation.path.forEach { firClass -> - firClass.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) + designation.path.asReversed().forEach { + it.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) } return ContextCollectingDiagnosticCollectorVisitor.collect(sessionHolder, designation)