[FIR] Remove scope session from FirClassSubstitutionScope constructor

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SupertypeUtils.kt

@@ -104,13 +104,13 @@ fun ConeClassLikeType.wrapSubstitutionScopeIfNeed(
             val platformTypeParameters = platformClass.typeParameters
             val platformSubstitution = createSubstitution(platformTypeParameters, this, session)
             FirClassSubstitutionScope(
-                session, useSiteMemberScope, builder, originalSubstitution + platformSubstitution,
+                session, useSiteMemberScope, originalSubstitution + platformSubstitution, skipPrivateMembers = true,
-                skipPrivateMembers = true, derivedClassId = derivedClassId
+                derivedClassId = derivedClassId
             )
         } else {
             FirClassSubstitutionScope(
-                session, useSiteMemberScope, builder, originalSubstitution,
+                session, useSiteMemberScope, originalSubstitution, skipPrivateMembers = true,
-                skipPrivateMembers = true, derivedClassId = derivedClassId
+                derivedClassId = derivedClassId
             )
         }
     }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/KotlinScopeProvider.kt

@@ -150,8 +150,8 @@ private fun FirClass<*>.scopeForClassImpl(
         this, ConeSubstitutionScopeKey(containingClassForAdditionalMembers.classId, isFromExpectClass, substitutor)
     ) {
         FirClassSubstitutionScope(
-            useSiteSession, basicScope, scopeSession, substitutor,
+            useSiteSession, basicScope, substitutor, skipPrivateMembers,
-            skipPrivateMembers, containingClassForAdditionalMembers.classId, makeExpect = isFromExpectClass
+            containingClassForAdditionalMembers.classId, makeExpect = isFromExpectClass
         )
     }
 }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt

@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.fir.declarations.builder.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.substitution.ChainedSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.chain
@@ -32,7 +31,6 @@ import org.jetbrains.kotlin.name.Name
 class FirClassSubstitutionScope(
     private val session: FirSession,
     private val useSiteMemberScope: FirTypeScope,
-    scopeSession: ScopeSession,
     private val substitutor: ConeSubstitutor,
     private val skipPrivateMembers: Boolean,
     private val derivedClassId: ClassId? = null,
@@ -44,10 +42,12 @@ class FirClassSubstitutionScope(
     private val fakeOverrideVariables = mutableMapOf<FirVariableSymbol<*>, FirVariableSymbol<*>>()
 
     constructor(
-        session: FirSession, useSiteMemberScope: FirTypeScope, scopeSession: ScopeSession,
+        session: FirSession,
+        useSiteMemberScope: FirTypeScope,
         substitution: Map<FirTypeParameterSymbol, ConeKotlinType>,
-        skipPrivateMembers: Boolean, derivedClassId: ClassId?
+        skipPrivateMembers: Boolean,
-    ) : this(session, useSiteMemberScope, scopeSession, substitutorByMap(substitution), skipPrivateMembers, derivedClassId)
+        derivedClassId: ClassId?
+    ) : this(session, useSiteMemberScope, substitutorByMap(substitution), skipPrivateMembers, derivedClassId)
 
     override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
         useSiteMemberScope.processFunctionsByName(name) process@{ original ->