azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 166965e559.
This commit is contained in:
Mikhail Glukhikh
2022-08-05 18:26:59 +02:00
parent 14b13a2f17
commit 2598ecf23f
15 changed files with 33 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -22866,12 +22866,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/override/Generics.kt");
}
@Test
@TestMetadata("InternalPotentialOverride.kt")
public void testInternalPotentialOverride() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt");
}
@Test
@TestMetadata("InvisiblePotentialOverride.kt")
public void testInvisiblePotentialOverride() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
-6
View File
@@ -22866,12 +22866,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/override/Generics.kt");
}
@Test
@TestMetadata("InternalPotentialOverride.kt")
public void testInternalPotentialOverride() throws Exception {
runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt");
}
@Test
@TestMetadata("InvisiblePotentialOverride.kt")
public void testInvisiblePotentialOverride() throws Exception {
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+1 -1
View File
@@ -205,7 +205,7 @@ class FakeOverrideGenerator(
// But they are treated differently in IR (real declarations have already been declared before) and such methods are present among realDeclarationSymbols
if (originalSymbol in realDeclarationSymbols) return
if (!originalDeclaration.isVisibleFromDerivedClass(klass.moduleData)) return
if (originalDeclaration.visibility == Visibilities.Private) return
val origin = IrDeclarationOrigin.FAKE_OVERRIDE
val baseSymbol = originalSymbol.unwrapSubstitutionAndIntersectionOverrides() as S
compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt
+1 -1
View File
@@ -80,7 +80,7 @@ private fun wrapSubstitutionScopeIfNeed(
FirClassSubstitutionScope(
session, useSiteMemberScope, PLATFORM_TYPE_PARAMETERS_SUBSTITUTION_SCOPE_KEY, substitutor,
dispatchReceiverTypeForSubstitutedMembers = derivedClass.defaultType(),
skipInvisibleMembers = true,
skipPrivateMembers = true,
)
}
}
compiler/fir/providers/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt
-13
View File
@@ -484,16 +484,3 @@ 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
+5 -4
View File
@@ -10,6 +10,7 @@ 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.*
@@ -111,7 +112,7 @@ fun FirClass.scopeForClass(
scopeSession: ScopeSession
): FirTypeScope = scopeForClassImpl(
substitutor, useSiteSession, scopeSession,
skipInvisibleMembers = false,
skipPrivateMembers = false,
classFirDispatchReceiver = this,
// TODO: why it's always false?
isFromExpectClass = false
@@ -130,7 +131,7 @@ fun ConeKotlinType.scopeForSupertype(
substitutor(symbol, this, useSiteSession),
useSiteSession,
scopeSession,
skipInvisibleMembers = true,
skipPrivateMembers = true,
classFirDispatchReceiver = subClass,
isFromExpectClass = (subClass as? FirRegularClass)?.isExpect == true
)
@@ -149,7 +150,7 @@ private fun FirClass.scopeForClassImpl(
substitutor: ConeSubstitutor,
useSiteSession: FirSession,
scopeSession: ScopeSession,
skipInvisibleMembers: Boolean,
skipPrivateMembers: Boolean,
classFirDispatchReceiver: FirClass,
isFromExpectClass: Boolean
): FirTypeScope {
@@ -165,7 +166,7 @@ private fun FirClass.scopeForClassImpl(
basicScope,
key, substitutor,
substitutor.substituteOrSelf(classFirDispatchReceiver.defaultType()) as ConeClassLikeType,
skipInvisibleMembers,
skipPrivateMembers,
makeExpect = isFromExpectClass
)
}
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+11 -10
View File
@@ -5,10 +5,15 @@
package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSessionComponent
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
@@ -28,7 +33,7 @@ class FirClassSubstitutionScope(
key: ScopeSessionKey<*, *>,
private val substitutor: ConeSubstitutor,
private val dispatchReceiverTypeForSubstitutedMembers: ConeClassLikeType,
private val skipInvisibleMembers: Boolean,
private val skipPrivateMembers: Boolean,
private val makeExpect: Boolean = false
) : FirTypeScope() {
companion object {
@@ -119,7 +124,7 @@ class FirClassSubstitutionScope(
fun createSubstitutionOverrideFunction(original: FirNamedFunctionSymbol): FirNamedFunctionSymbol {
if (substitutor == ConeSubstitutor.Empty) return original
val member = original.fir
if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
val symbolForOverride = FirFakeOverrideGenerator.createSymbolForSubstitutionOverride(original, newOwnerClassId)
@@ -219,7 +224,7 @@ class FirClassSubstitutionScope(
fun createSubstitutionOverrideProperty(original: FirPropertySymbol): FirPropertySymbol {
if (substitutor == ConeSubstitutor.Empty) return original
val member = original.fir
if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
val symbolForOverride = FirFakeOverrideGenerator.createSymbolForSubstitutionOverride(original, newOwnerClassId)
@@ -305,7 +310,7 @@ class FirClassSubstitutionScope(
fun createSubstitutionOverrideField(original: FirFieldSymbol): FirFieldSymbol {
if (substitutor == ConeSubstitutor.Empty) return original
val member = original.fir
if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
member.symbol.ensureResolved(FirResolvePhase.STATUS)
val returnType = member.returnTypeRef.coneTypeSafe<ConeKotlinType>()
@@ -318,7 +323,7 @@ class FirClassSubstitutionScope(
fun createSubstitutionOverrideSyntheticProperty(original: FirSyntheticPropertySymbol): FirSyntheticPropertySymbol {
if (substitutor == ConeSubstitutor.Empty) return original
val member = original.fir as FirSyntheticProperty
if (skipInvisibleMembers && !member.isVisibleInThisScope()) return original
if (skipPrivateMembers && member.visibility == Visibilities.Private) return original
member.symbol.ensureResolved(FirResolvePhase.STATUS)
val returnType = member.returnTypeRef.coneTypeSafe<ConeKotlinType>()
@@ -375,10 +380,6 @@ 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
+6 -3
View File
@@ -5,9 +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.declarations.*
import org.jetbrains.kotlin.fir.isVisibleFromDerivedClass
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.resolve.transformers.ensureResolvedTypeDeclaration
import org.jetbrains.kotlin.fir.symbols.ensureResolved
@@ -121,7 +122,8 @@ class FirStandardOverrideChecker(private val session: FirSession) : FirAbstractO
}
override fun isOverriddenFunction(overrideCandidate: FirSimpleFunction, baseDeclaration: FirSimpleFunction): Boolean {
if (!baseDeclaration.isVisibleFromDerivedClass(overrideCandidate.moduleData)) return false
if (Visibilities.isPrivate(baseDeclaration.visibility)) return false
if (overrideCandidate.valueParameters.size != baseDeclaration.valueParameters.size) return false
val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration) ?: return false
@@ -139,7 +141,8 @@ class FirStandardOverrideChecker(private val session: FirSession) : FirAbstractO
overrideCandidate: FirCallableDeclaration,
baseDeclaration: FirProperty
): Boolean {
if (!baseDeclaration.isVisibleFromDerivedClass(overrideCandidate.moduleData)) return false
if (Visibilities.isPrivate(baseDeclaration.visibility)) return false
if (overrideCandidate !is FirProperty) return false
val substitutor = buildTypeParametersSubstitutorIfCompatible(overrideCandidate, baseDeclaration) ?: return false
overrideCandidate.ensureResolved(FirResolvePhase.TYPES)