From daa4c708a2401ecdb0227412871a7f4a02a7afac Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 8 Jul 2021 18:53:43 +0300
Subject: [PATCH] [FIR] Remove unused parameter from `ensureResolvedForCalls`

---
 .../jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt   | 4 +---
 .../kotlin/fir/scopes/impl/FirAbstractImportingScope.kt       | 4 ++--
 .../kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt     | 2 +-
 .../jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
index 6e09b49dc28..b524815e4dc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt
@@ -16,9 +16,7 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.coneTypeSafe
 
-fun FirBasedSymbol<*>.ensureResolvedForCalls(
-    @Suppress("UNUSED_PARAMETER") useSiteSession: FirSession,
-) {
+fun FirBasedSymbol<*>.ensureResolvedForCalls() {
     if (fir.resolvePhase >= FirResolvePhase.DECLARATIONS) return
 
 //    val requiredPhase = when (fir) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt
index 36d7292be97..c32a4ee037a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt
@@ -106,7 +106,7 @@ abstract class FirAbstractImportingScope(
                 staticsScope.processFunctionsByName(importedName, processor)
             } else if (importedName.isSpecial || importedName.identifier.isNotEmpty()) {
                 for (symbol in provider.getTopLevelFunctionSymbols(import.packageFqName, importedName)) {
-                    symbol.ensureResolvedForCalls(session)
+                    symbol.ensureResolvedForCalls()
                     processor(symbol)
                 }
             }
@@ -122,7 +122,7 @@ abstract class FirAbstractImportingScope(
                 staticsScope.processPropertiesByName(importedName, processor)
             } else if (importedName.isSpecial || importedName.identifier.isNotEmpty()) {
                 for (symbol in provider.getTopLevelPropertySymbols(import.packageFqName, importedName)) {
-                    symbol.ensureResolvedForCalls(session)
+                    symbol.ensureResolvedForCalls()
                     processor(symbol)
                 }
             }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
index 8ba606bd870..b1f8c2a8cbf 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
@@ -68,7 +68,7 @@ class FirClassDeclaredMemberScope(
         val symbols = callablesIndex[name] ?: emptyList()
         for (symbol in symbols) {
             if (symbol is D) {
-                symbol.ensureResolvedForCalls(useSiteSession)
+                symbol.ensureResolvedForCalls()
                 processor(symbol)
             }
         }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt
index 7e17e22c2ed..d99f678cd1a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt
@@ -46,7 +46,7 @@ class FirPackageMemberScope(val fqName: FqName, val session: FirSession) : FirSc
             symbolProvider.getTopLevelFunctionSymbols(fqName, name)
         }
         for (symbol in symbols) {
-            symbol.ensureResolvedForCalls(session)
+            symbol.ensureResolvedForCalls()
             processor(symbol)
         }
     }
@@ -56,7 +56,7 @@ class FirPackageMemberScope(val fqName: FqName, val session: FirSession) : FirSc
             symbolProvider.getTopLevelPropertySymbols(fqName, name)
         }
         for (symbol in symbols) {
-            symbol.ensureResolvedForCalls(session)
+            symbol.ensureResolvedForCalls()
             processor(symbol)
         }
     }