From 90bf4a3a24b69eac51b947fe47f502c1188f2577 Mon Sep 17 00:00:00 2001
From: Dmitrii Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 25 Nov 2022 15:40:45 +0100
Subject: [PATCH] [AA FIR] drop redundant analyze from symbol pointers

^KT-54051
---
 .../fir/symbols/KtFirValueParameterSymbol.kt  | 19 ++++++++-----------
 .../pointers/KtFirMemberSymbolPointer.kt      |  6 ------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt
index 5a30ed5da94..c4343c36e63 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.KtFakeSourceElementKind
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
-import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.annotations.KtFirAnnotationListForDeclaration
 import org.jetbrains.kotlin.analysis.api.fir.findPsi
@@ -87,17 +86,15 @@ internal class KtFirValueParameterSymbol(
     override fun createPointer(): KtSymbolPointer<KtValueParameterSymbol> = withValidityAssertion {
         KtPsiBasedSymbolPointer.createForSymbolFromSource<KtValueParameterSymbol>(this)?.let { return it }
 
-        analyze(firResolveSession.useSiteKtModule) {
-            when (val owner = getContainingSymbol()) {
-                is KtFunctionLikeSymbol ->
-                    KtFirValueParameterSymbolPointer(
-                        owner.createPointer(),
-                        name,
-                        (owner.firSymbol.fir as FirFunction).valueParameters.indexOf(firSymbol.fir),
-                    )
+        when (val owner = getContainingSymbol()) {
+            is KtFunctionLikeSymbol ->
+                KtFirValueParameterSymbolPointer(
+                    owner.createPointer(),
+                    name,
+                    (owner.firSymbol.fir as FirFunction).valueParameters.indexOf(firSymbol.fir),
+                )
 
-                else -> error("${requireNotNull(owner)::class}")
-            }
+            else -> error("${requireNotNull(owner)::class}")
         }
     }
 
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/KtFirMemberSymbolPointer.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/KtFirMemberSymbolPointer.kt
index a56b6010376..3399c27d479 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/KtFirMemberSymbolPointer.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/KtFirMemberSymbolPointer.kt
@@ -52,9 +52,3 @@ internal inline fun <reified T : KtSymbol> KtSymbol.requireOwnerPointer(): KtSym
     @Suppress("UNCHECKED_CAST")
     return symbolWithMembers.createPointer() as KtSymbolPointer<T>
 }
-
-internal inline fun <reified T : KtSymbol> KtFirSymbol<*>.requireOwnerPointer(): KtSymbolPointer<T> {
-    return analyze(firResolveSession.useSiteKtModule) {
-        requireOwnerPointer<T>()
-    }
-}