[FIR] Add effective visibility to resolved status

This commit includes: - introduce FirResolvedDeclarationStatus.effectiveVisibility - replace FirEffectiveVisibility with EffectiveVisibility - move calculation of effective visibility from FirEffectiveVisibilityResolver (which is deleted) to FirStatusResolver and FirDeserializer
2021-04-02 14:57:30 +03:00
parent a600d18396
commit 3ef87d0265
33 changed files with 327 additions and 679 deletions
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.deserialization
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSignatures
 import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.EffectiveVisibility
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.*
@@ -18,7 +19,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE
 import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID
 import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
-import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
 import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.NameResolver
 import org.jetbrains.kotlin.metadata.deserialization.TypeTable
 import org.jetbrains.kotlin.metadata.deserialization.supertypes
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -58,9 +59,11 @@ fun deserializeClassToSymbol(
    val flags = classProto.flags
    val kind = Flags.CLASS_KIND.get(flags)
    val modality = ProtoEnumFlags.modality(Flags.MODALITY.get(flags))
+    val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags))
    val status = FirResolvedDeclarationStatusImpl(
-        ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
-        modality
+        visibility,
+        modality,
+        visibility.toEffectiveVisibility(parentContext?.outerClassSymbol)
    ).apply {
        isExpect = Flags.IS_EXPECT_CLASS.get(flags)
        isActual = false
@@ -80,13 +83,18 @@ fun deserializeClassToSymbol(
            TypeTable(classProto.typeTable),
            classId.relativeClassName,
            containerSource,
+            symbol,
            annotationDeserializer,
            status.isInner
        ) ?: FirDeserializationContext.createForClass(
-            classId, classProto, nameResolver, session,
+            classId,
+            classProto,
+            nameResolver,
+            session,
            annotationDeserializer,
            FirConstDeserializer(session, (containerSource as? KotlinJvmBinarySourceElement)?.binaryClass),
-            containerSource
+            containerSource,
+            symbol
        )
    if (status.isCompanion) {
        parentContext?.let {
@@ -122,13 +130,13 @@ fun deserializeClassToSymbol(

        addDeclarations(
            classProto.functionList.map {
-                classDeserializer.loadFunction(it, classProto)
+                classDeserializer.loadFunction(it, classProto, symbol)
            }
        )

        addDeclarations(
            classProto.propertyList.map {
-                classDeserializer.loadProperty(it, classProto)
+                classDeserializer.loadProperty(it, classProto, symbol)
            }
        )

@@ -158,7 +166,8 @@ fun deserializeClassToSymbol(
                    this.symbol = FirVariableSymbol(CallableId(classId, enumEntryName))
                    this.status = FirResolvedDeclarationStatusImpl(
                        Visibilities.Public,
-                        Modality.FINAL
+                        Modality.FINAL,
+                        EffectiveVisibility.Public
                    ).apply {
                        isStatic = true
                    }
@@ -265,7 +274,7 @@ private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId, di
                isNullable = false
            )
        }
-        status = FirResolvedDeclarationStatusImpl(Visibilities.Public, Modality.FINAL).apply {
+        status = FirResolvedDeclarationStatusImpl(Visibilities.Public, Modality.FINAL, EffectiveVisibility.Public).apply {
            isOverride = true
        }
        name = CLONE
@@ -15,9 +15,9 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
 import org.jetbrains.kotlin.fir.resolve.defaultType
-import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
+import org.jetbrains.kotlin.fir.toEffectiveVisibility
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.*
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.MessageLite
@@ -43,6 +44,7 @@ class FirDeserializationContext(
    val annotationDeserializer: AbstractAnnotationDeserializer,
    val constDeserializer: FirConstDeserializer,
    val containerSource: DeserializedContainerSource?,
+    val outerClassSymbol: FirRegularClassSymbol?,
    outerTypeParameters: List<FirTypeParameterSymbol>
 ) {
    val allTypeParameters: List<FirTypeParameterSymbol> =
@@ -54,14 +56,21 @@ class FirDeserializationContext(
        typeTable: TypeTable = this.typeTable,
        relativeClassName: FqName? = this.relativeClassName,
        containerSource: DeserializedContainerSource? = this.containerSource,
+        outerClassSymbol: FirRegularClassSymbol? = this.outerClassSymbol,
        annotationDeserializer: AbstractAnnotationDeserializer = this.annotationDeserializer,
        capturesTypeParameters: Boolean = true
    ): FirDeserializationContext = FirDeserializationContext(
-        nameResolver, typeTable, versionRequirementTable, session, packageFqName, relativeClassName,
-        FirTypeDeserializer(
-            session, nameResolver, typeTable, annotationDeserializer, typeParameterProtos, typeDeserializer
-        ),
-        annotationDeserializer, constDeserializer, containerSource,
+        nameResolver,
+        typeTable,
+        versionRequirementTable,
+        session,
+        packageFqName,
+        relativeClassName,
+        FirTypeDeserializer(session, nameResolver, typeTable, annotationDeserializer, typeParameterProtos, typeDeserializer),
+        annotationDeserializer,
+        constDeserializer,
+        containerSource,
+        outerClassSymbol,
        if (capturesTypeParameters) allTypeParameters else emptyList()
    )

@@ -87,7 +96,8 @@ class FirDeserializationContext(
            fqName,
            relativeClassName = null,
            typeParameterProtos = emptyList(),
-            containerSource
+            containerSource,
+            outerClassSymbol = null
        )

        fun createForClass(
@@ -97,7 +107,8 @@ class FirDeserializationContext(
            session: FirSession,
            annotationDeserializer: AbstractAnnotationDeserializer,
            constDeserializer: FirConstDeserializer,
-            containerSource: DeserializedContainerSource?
+            containerSource: DeserializedContainerSource?,
+            outerClassSymbol: FirRegularClassSymbol
        ): FirDeserializationContext = createRootContext(
            nameResolver,
            TypeTable(classProto.typeTable),
@@ -108,7 +119,8 @@ class FirDeserializationContext(
            classId.packageFqName,
            classId.relativeClassName,
            classProto.typeParameterList,
-            containerSource
+            containerSource,
+            outerClassSymbol
        )

        private fun createRootContext(
@@ -121,7 +133,8 @@ class FirDeserializationContext(
            packageFqName: FqName,
            relativeClassName: FqName?,
            typeParameterProtos: List<ProtoBuf.TypeParameter>,
-            containerSource: DeserializedContainerSource?
+            containerSource: DeserializedContainerSource?,
+            outerClassSymbol: FirRegularClassSymbol?,
        ): FirDeserializationContext {
            return FirDeserializationContext(
                nameResolver, typeTable,
@@ -140,6 +153,7 @@ class FirDeserializationContext(
                annotationDeserializer,
                constDeserializer,
                containerSource,
+                outerClassSymbol,
                emptyList()
            )
        }
@@ -164,9 +178,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
            session = c.session
            origin = FirDeclarationOrigin.Library
            this.name = name
+            val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags))
            status = FirResolvedDeclarationStatusImpl(
-                ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
-                Modality.FINAL
+                visibility,
+                Modality.FINAL,
+                visibility.toEffectiveVisibility(owner = null)
            ).apply {
                isExpect = Flags.IS_EXPECT_CLASS.get(flags)
                isActual = false
@@ -185,7 +201,8 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {

    fun loadProperty(
        proto: ProtoBuf.Property,
-        classProto: ProtoBuf.Class? = null
+        classProto: ProtoBuf.Class? = null,
+        classSymbol: FirClassSymbol<*>? = null
    ): FirProperty {
        val flags = if (proto.hasFlags()) proto.flags else loadOldFlags(proto.oldFlags)
        val callableName = c.nameResolver.getName(proto.name)
@@ -224,7 +241,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                    this.returnTypeRef = returnTypeRef
                    resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
                    isGetter = true
-                    status = FirResolvedDeclarationStatusImpl(visibility, modality).apply {
+                    status = FirResolvedDeclarationStatusImpl(
+                        visibility,
+                        modality,
+                        visibility.toEffectiveVisibility(classSymbol)
+                    ).apply {
                        isInline = Flags.IS_INLINE_ACCESSOR.get(getterFlags)
                        isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
                    }
@@ -256,7 +277,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                    this.returnTypeRef = FirImplicitUnitTypeRef(source)
                    resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
                    isGetter = false
-                    status = FirResolvedDeclarationStatusImpl(visibility, modality).apply {
+                    status = FirResolvedDeclarationStatusImpl(
+                        visibility,
+                        modality,
+                        visibility.toEffectiveVisibility(classSymbol)
+                    ).apply {
                        isInline = Flags.IS_INLINE_ACCESSOR.get(setterFlags)
                        isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
                    }
@@ -296,9 +321,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
            this.symbol = symbol
            dispatchReceiverType = c.dispatchReceiver
            isLocal = false
+            val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags))
            status = FirResolvedDeclarationStatusImpl(
-                ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
-                ProtoEnumFlags.modality(Flags.MODALITY.get(flags))
+                visibility,
+                ProtoEnumFlags.modality(Flags.MODALITY.get(flags)),
+                visibility.toEffectiveVisibility(classSymbol)
            ).apply {
                isExpect = Flags.IS_EXPECT_PROPERTY.get(flags)
                isActual = false
@@ -332,7 +359,8 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {

    fun loadFunction(
        proto: ProtoBuf.Function,
-        classProto: ProtoBuf.Class? = null
+        classProto: ProtoBuf.Class? = null,
+        classSymbol: FirClassSymbol<*>? = null
    ): FirSimpleFunction {
        val flags = if (proto.hasFlags()) proto.flags else loadOldFlags(proto.oldFlags)

@@ -357,9 +385,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
                annotations += receiverAnnotations
            }
            name = callableName
+            val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags))
            status = FirResolvedDeclarationStatusImpl(
-                ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
-                ProtoEnumFlags.modality(Flags.MODALITY.get(flags))
+                visibility,
+                ProtoEnumFlags.modality(Flags.MODALITY.get(flags)),
+                visibility.toEffectiveVisibility(classSymbol)
            ).apply {
                isExpect = Flags.IS_EXPECT_FUNCTION.get(flags)
                isActual = false
@@ -429,7 +459,8 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
            val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags))
            status = FirResolvedDeclarationStatusImpl(
                visibility,
-                Modality.FINAL
+                Modality.FINAL,
+                visibility.toEffectiveVisibility(classBuilder.symbol)
            ).apply {
                isExpect = Flags.IS_EXPECT_FUNCTION.get(flags)
                isActual = false
@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl

 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.buildRegularClass
@@ -26,7 +23,6 @@ import org.jetbrains.kotlin.fir.resolve.defaultType
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
 import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
-import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
@@ -36,6 +32,7 @@ import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
 import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -94,7 +91,8 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider
                        name = relativeClassName.shortName()
                        status = FirResolvedDeclarationStatusImpl(
                            Visibilities.Public,
-                            Modality.ABSTRACT
+                            Modality.ABSTRACT,
+                            EffectiveVisibility.Public
                        ).apply {
                            isExpect = false
                            isActual = false
@@ -136,7 +134,8 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider
                        val name = OperatorNameConventions.INVOKE
                        val functionStatus = FirResolvedDeclarationStatusImpl(
                            Visibilities.Public,
-                            Modality.ABSTRACT
+                            Modality.ABSTRACT,
+                            EffectiveVisibility.Public
                        ).apply {
                            isExpect = false
                            isActual = false