FIR: introduce callable member symbols & initial member scopes

Initial member scopes cover top-level, class-level, and supers Ad-hock version of call resolve was introduced to test them NB: after this commit, total Kotlin resolve test cannot finish because of scope problems in type resolve transformer Related to KT-24078 #KT-24083 Fixed
2019-01-25 15:29:21 +03:00
parent 95678a4d64
commit bec62acf5b
58 changed files with 540 additions and 72 deletions
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
 import org.jetbrains.kotlin.name.Name

+@BaseTransformedType
 interface FirNamedReference : FirReference {
    val name: Name

@@ -695,6 +695,12 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
        print("${namedReference.name}#")
    }

+    override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) {
+        print("R|")
+        print(resolvedCallableReference.callableSymbol.callableId)
+        print("|")
+    }
+
    override fun visitThisReference(thisReference: FirThisReference) {
        print("this")
        val labelName = thisReference.labelName
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir
+
+import org.jetbrains.kotlin.fir.symbols.ConeCallableSymbol
+import org.jetbrains.kotlin.fir.visitors.FirVisitor
+
+interface FirResolvedCallableReference : FirNamedReference {
+    val callableSymbol: ConeCallableSymbol
+
+    override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
+        visitor.visitResolvedCallableReference(this, data)
+}
@@ -6,11 +6,14 @@
 package org.jetbrains.kotlin.fir.declarations

 import org.jetbrains.kotlin.fir.VisitedSupertype
+import org.jetbrains.kotlin.fir.symbols.FirSymbolOwner
 import org.jetbrains.kotlin.fir.types.FirType
 import org.jetbrains.kotlin.fir.visitors.FirVisitor

 // Good name needed (something with receiver, type parameters, return type, and name)
-interface FirCallableMember : @VisitedSupertype FirDeclaration, FirMemberDeclaration, FirTypedDeclaration {
+interface FirCallableMember :
+    @VisitedSupertype FirDeclaration, FirMemberDeclaration,
+    FirTypedDeclaration, FirSymbolOwner<FirCallableMember> {
    val isOverride: Boolean get() = status.isOverride

    val receiverType: FirType?
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirCallableMember
+import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.transformSingle
 import org.jetbrains.kotlin.fir.types.FirType
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
@@ -19,6 +20,7 @@ import org.jetbrains.kotlin.name.Name
 abstract class FirAbstractCallableMember(
    session: FirSession,
    psi: PsiElement?,
+    final override val symbol: FirBasedSymbol<FirCallableMember>,
    name: Name,
    visibility: Visibility,
    modality: Modality?,
@@ -30,6 +32,7 @@ abstract class FirAbstractCallableMember(
 ) : FirAbstractMemberDeclaration(session, psi, name, visibility, modality, isExpect, isActual), FirCallableMember {

    init {
+        symbol.bind(this)
        status.isOverride = isOverride
    }

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirValueParameter
 import org.jetbrains.kotlin.fir.expressions.FirBlock
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.transformInplace
 import org.jetbrains.kotlin.fir.transformSingle
 import org.jetbrains.kotlin.fir.types.FirType
@@ -23,13 +24,14 @@ import org.jetbrains.kotlin.name.Name
 open class FirConstructorImpl(
    session: FirSession,
    psi: PsiElement?,
+    symbol: FirFunctionSymbol,
    visibility: Visibility,
    isExpect: Boolean,
    isActual: Boolean,
    delegatedSelfType: FirType,
    final override var delegatedConstructor: FirDelegatedConstructorCall?
 ) : FirAbstractCallableMember(
-    session, psi, NAME, visibility, Modality.FINAL,
+    session, psi, symbol, NAME, visibility, Modality.FINAL,
    isExpect, isActual, isOverride = false, receiverType = null, returnType = delegatedSelfType
 ), FirConstructor {
    override val valueParameters = mutableListOf<FirValueParameter>()
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirNamedFunction
 import org.jetbrains.kotlin.fir.declarations.FirValueParameter
 import org.jetbrains.kotlin.fir.expressions.FirBlock
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.transformInplace
 import org.jetbrains.kotlin.fir.transformSingle
 import org.jetbrains.kotlin.fir.types.FirType
@@ -22,6 +23,7 @@ import org.jetbrains.kotlin.name.Name
 class FirMemberFunctionImpl(
    session: FirSession,
    psi: PsiElement?,
+    symbol: FirFunctionSymbol,
    name: Name,
    visibility: Visibility,
    modality: Modality?,
@@ -37,7 +39,7 @@ class FirMemberFunctionImpl(
    receiverType: FirType?,
    returnType: FirType
 ) : FirAbstractCallableMember(
-    session, psi, name, visibility, modality,
+    session, psi, symbol, name, visibility, modality,
    isExpect, isActual, isOverride, receiverType, returnType
 ), FirNamedFunction, FirModifiableFunction {
    init {
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
 import org.jetbrains.kotlin.fir.expressions.FirExpression
+import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 import org.jetbrains.kotlin.fir.transformSingle
 import org.jetbrains.kotlin.fir.types.FirType
 import org.jetbrains.kotlin.fir.visitors.FirTransformer
@@ -21,6 +22,7 @@ import org.jetbrains.kotlin.name.Name
 class FirMemberPropertyImpl(
    session: FirSession,
    psi: PsiElement?,
+    symbol: FirPropertySymbol,
    name: Name,
    visibility: Visibility,
    modality: Modality?,
@@ -37,7 +39,7 @@ class FirMemberPropertyImpl(
    override var setter: FirPropertyAccessor,
    override var delegate: FirExpression?
 ) : FirAbstractCallableMember(
-    session, psi, name, visibility, modality, isExpect, isActual, isOverride, receiverType, returnType
+    session, psi, symbol, name, visibility, modality, isExpect, isActual, isOverride, receiverType, returnType
 ), FirProperty {
    init {
        status.isConst = isConst
@@ -9,14 +9,16 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
+import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.types.FirType

 class FirPrimaryConstructorImpl(
    session: FirSession,
    psi: PsiElement?,
+    symbol: FirFunctionSymbol,
    visibility: Visibility,
    isExpect: Boolean,
    isActual: Boolean,
    delegatedSelfType: FirType,
    delegatedConstructor: FirDelegatedConstructorCall?
-) : FirConstructorImpl(session, psi, visibility, isExpect, isActual, delegatedSelfType, delegatedConstructor)
+) : FirConstructorImpl(session, psi, symbol, visibility, isExpect, isActual, delegatedSelfType, delegatedConstructor)
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.references
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.fir.FirAbstractElement
+import org.jetbrains.kotlin.fir.FirResolvedCallableReference
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.symbols.ConeCallableSymbol
+import org.jetbrains.kotlin.name.Name
+
+class FirResolvedCallableReferenceImpl(
+    session: FirSession,
+    psi: PsiElement?,
+    override val name: Name,
+    override val callableSymbol: ConeCallableSymbol
+) : FirAbstractElement(session, psi), FirResolvedCallableReference
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.symbols.impl
+
+import org.jetbrains.kotlin.fir.declarations.FirCallableMember
+import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.CallableId
+import org.jetbrains.kotlin.fir.symbols.ConeFunctionSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+
+class FirFunctionSymbol(override val callableId: CallableId) : ConeFunctionSymbol, AbstractFirBasedSymbol<FirCallableMember>() {
+    override val parameters: List<ConeKotlinType>
+        get() = emptyList()
+}
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.symbols.impl
+
+import org.jetbrains.kotlin.fir.declarations.FirCallableMember
+import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
+import org.jetbrains.kotlin.fir.symbols.CallableId
+import org.jetbrains.kotlin.fir.symbols.ConePropertySymbol
+
+class FirPropertySymbol(override val callableId: CallableId) : ConePropertySymbol, AbstractFirBasedSymbol<FirCallableMember>()
@@ -136,10 +136,14 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformElement(reference, data)
    }

-    open fun <E : FirReference> transformNamedReference(namedReference: E, data: D): CompositeTransformResult<E> {
+    open fun transformNamedReference(namedReference: FirNamedReference, data: D): CompositeTransformResult<FirNamedReference> {
        return transformReference(namedReference, data)
    }

+    open fun transformResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult<FirNamedReference> {
+        return transformNamedReference(resolvedCallableReference, data)
+    }
+
    open fun <E : FirReference> transformSuperReference(superReference: E, data: D): CompositeTransformResult<E> {
        return transformReference(superReference, data)
    }
@@ -580,6 +584,10 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
        return transformRegularClass(regularClass, data)
    }

+    final override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult<FirElement> {
+        return transformResolvedCallableReference(resolvedCallableReference, data)
+    }
+
    final override fun visitResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus, data: D): CompositeTransformResult<FirElement> {
        return transformResolvedDeclarationStatus(resolvedDeclarationStatus, data)
    }
@@ -140,6 +140,10 @@ abstract class FirVisitor<out R, in D> {
        return visitReference(namedReference, data)
    }

+    open fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): R {
+        return visitNamedReference(resolvedCallableReference, data)
+    }
+
    open fun visitSuperReference(superReference: FirSuperReference, data: D): R {
        return visitReference(superReference, data)
    }
@@ -140,6 +140,10 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitReference(namedReference, null)
    }

+    open fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) {
+        visitNamedReference(resolvedCallableReference, null)
+    }
+
    open fun visitSuperReference(superReference: FirSuperReference) {
        visitReference(superReference, null)
    }
@@ -580,6 +584,10 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
        visitRegularClass(regularClass)
    }

+    final override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: Nothing?) {
+        visitResolvedCallableReference(resolvedCallableReference)
+    }
+
    final override fun visitResolvedDeclarationStatus(resolvedDeclarationStatus: FirResolvedDeclarationStatus, data: Nothing?) {
        visitResolvedDeclarationStatus(resolvedDeclarationStatus)
    }