K2: fix internal visibility checks for overrides #KT-53197 Fixed

compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt

@@ -484,3 +484,16 @@ fun FirClassLikeSymbol<*>.getContainingClassLookupTag(): ConeClassLikeLookupTag?
 fun FirBasedSymbol<*>.isVariableOrNamedFunction(): Boolean {
     return this is FirVariableSymbol || this is FirNamedFunctionSymbol || this is FirPropertyAccessorSymbol
 }
+
+
+fun FirCallableDeclaration.isVisibleFromDerivedClass(derivedClassModuleData: FirModuleData): Boolean {
+    return when (visibility) {
+        Visibilities.Private, Visibilities.PrivateToThis ->
+            false
+        Visibilities.Internal ->
+            derivedClassModuleData == this@isVisibleFromDerivedClass.moduleData
+        else ->
+            true
+    }
+}
+

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSessionComponent
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
-import org.jetbrains.kotlin.fir.declarations.utils.classId
 import org.jetbrains.kotlin.fir.declarations.utils.delegateFields
 import org.jetbrains.kotlin.fir.declarations.utils.isExpect
 import org.jetbrains.kotlin.fir.resolve.*
@@ -112,7 +111,7 @@ fun FirClass.scopeForClass(
     scopeSession: ScopeSession
 ): FirTypeScope = scopeForClassImpl(
     substitutor, useSiteSession, scopeSession,
-    skipPrivateMembers = false,
+    skipInvisibleMembers = false,
     classFirDispatchReceiver = this,
     // TODO: why it's always false?
     isFromExpectClass = false
@@ -131,7 +130,7 @@ fun ConeKotlinType.scopeForSupertype(
             substitutor(symbol, this, useSiteSession),
             useSiteSession,
             scopeSession,
-            skipPrivateMembers = true,
+            skipInvisibleMembers = true,
             classFirDispatchReceiver = subClass,
             isFromExpectClass = (subClass as? FirRegularClass)?.isExpect == true
         )
@@ -150,7 +149,7 @@ private fun FirClass.scopeForClassImpl(
     substitutor: ConeSubstitutor,
     useSiteSession: FirSession,
     scopeSession: ScopeSession,
-    skipPrivateMembers: Boolean,
+    skipInvisibleMembers: Boolean,
     classFirDispatchReceiver: FirClass,
     isFromExpectClass: Boolean
 ): FirTypeScope {
@@ -166,7 +165,7 @@ private fun FirClass.scopeForClassImpl(
             basicScope,
             key, substitutor,
             substitutor.substituteOrSelf(classFirDispatchReceiver.defaultType()) as ConeClassLikeType,
-            skipPrivateMembers,
+            skipInvisibleMembers,
             makeExpect = isFromExpectClass
         )
     }

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

@@ -5,15 +5,10 @@
 
 package org.jetbrains.kotlin.fir.scopes.impl
 
-import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSessionComponent
+import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.caches.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
-import org.jetbrains.kotlin.fir.declarations.utils.visibility
-import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
-import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
 import org.jetbrains.kotlin.fir.resolve.ScopeSessionKey
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.chain
@@ -33,7 +28,7 @@ class FirClassSubstitutionScope(
     key: ScopeSessionKey<*, *>,
     private val substitutor: ConeSubstitutor,
     private val dispatchReceiverTypeForSubstitutedMembers: ConeClassLikeType,
-    private val skipPrivateMembers: Boolean,
+    private val skipInvisibleMembers: Boolean,
     private val makeExpect: Boolean = false
 ) : FirTypeScope() {
     companion object {
@@ -124,7 +119,7 @@ class FirClassSubstitutionScope(
     fun createSubstitutionOverrideFunction(original: FirNamedFunctionSymbol): FirNamedFunctionSymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir
-        if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
+        if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
 
         val symbolForOverride = FirFakeOverrideGenerator.createSymbolForSubstitutionOverride(original, newOwnerClassId)
 
@@ -224,7 +219,7 @@ class FirClassSubstitutionScope(
     fun createSubstitutionOverrideProperty(original: FirPropertySymbol): FirPropertySymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir
-        if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
+        if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
 
         val symbolForOverride = FirFakeOverrideGenerator.createSymbolForSubstitutionOverride(original, newOwnerClassId)
 
@@ -310,7 +305,7 @@ class FirClassSubstitutionScope(
     fun createSubstitutionOverrideField(original: FirFieldSymbol): FirFieldSymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir
-        if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
+        if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
 
         member.symbol.ensureResolved(FirResolvePhase.STATUS)
         val returnType = member.returnTypeRef.coneTypeSafe<ConeKotlinType>()
@@ -323,7 +318,7 @@ class FirClassSubstitutionScope(
     fun createSubstitutionOverrideSyntheticProperty(original: FirSyntheticPropertySymbol): FirSyntheticPropertySymbol {
         if (substitutor == ConeSubstitutor.Empty) return original
         val member = original.fir as FirSyntheticProperty
-        if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
+        if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
 
         member.symbol.ensureResolved(FirResolvePhase.STATUS)
         val returnType = member.returnTypeRef.coneTypeSafe<ConeKotlinType>()
@@ -380,6 +375,10 @@ class FirClassSubstitutionScope(
     override fun toString(): String {
         return "Substitution scope for [$useSiteMemberScope] for type $dispatchReceiverTypeForSubstitutedMembers"
     }
+
+    private fun FirCallableDeclaration.isVisibleInThisScope(): Boolean {
+        return isVisibleFromDerivedClass(this@FirClassSubstitutionScope.session.moduleData)
+    }
 }
 
 class FirSubstitutionOverrideStorage(val session: FirSession) : FirSessionComponent {

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt

@@ -5,10 +5,9 @@
 
 package org.jetbrains.kotlin.fir.scopes.impl
 
-import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.utils.visibility
+import org.jetbrains.kotlin.fir.isVisibleFromDerivedClass
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.transformers.ensureResolvedTypeDeclaration
 import org.jetbrains.kotlin.fir.symbols.ensureResolved
@@ -122,8 +121,7 @@ class FirStandardOverrideChecker(private val session: FirSession) : FirAbstractO
     }
 
     override fun isOverriddenFunction(overrideCandidate: FirSimpleFunction, baseDeclaration: FirSimpleFunction): Boolean {
-        if (Visibilities.isPrivate(baseDeclaration.visibility)) return false
-
+        if (!baseDeclaration.isVisibleFromDerivedClass(overrideCandidate.moduleData)) return false
         if (overrideCandidate.valueParameters.size != baseDeclaration.valueParameters.size) return false
 
         val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration) ?: return false
@@ -141,8 +139,7 @@ class FirStandardOverrideChecker(private val session: FirSession) : FirAbstractO
         overrideCandidate: FirCallableDeclaration,
         baseDeclaration: FirProperty
     ): Boolean {
-        if (Visibilities.isPrivate(baseDeclaration.visibility)) return false
-
+        if (!baseDeclaration.isVisibleFromDerivedClass(overrideCandidate.moduleData)) return false
         if (overrideCandidate !is FirProperty) return false
         val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration) ?: return false
         overrideCandidate.ensureResolved(FirResolvePhase.TYPES)