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

FIR (rename): candidateOwner -> boundSymbol

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-08-27 16:17:41 +03:00
parent 8633a33108
commit 67a7243361
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+3 -3
View File
@@ -105,9 +105,9 @@ fun FirReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbo
return when (this) { return when (this) {
is FirResolvedCallableReference -> coneSymbol.toSymbol(declarationStorage) is FirResolvedCallableReference -> coneSymbol.toSymbol(declarationStorage)
is FirThisReference -> { is FirThisReference -> {
when (val ownerSymbol = candidateOwner?.toSymbol(declarationStorage)) { when (val boundSymbol = boundSymbol?.toSymbol(declarationStorage)) {
is IrClassSymbol -> ownerSymbol.owner.thisReceiver?.symbol is IrClassSymbol -> boundSymbol.owner.thisReceiver?.symbol
is IrFunctionSymbol -> ownerSymbol.owner.extensionReceiverParameter?.symbol is IrFunctionSymbol -> boundSymbol.owner.extensionReceiverParameter?.symbol
else -> null else -> null
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+1 -1
View File
@@ -203,7 +203,7 @@ open class FirBodyResolveTransformer(
val implicitReceivers = val implicitReceivers =
if (labelName == null) implicitReceiverPerLabel.values() else implicitReceiverPerLabel[Name.identifier(labelName)] if (labelName == null) implicitReceiverPerLabel.values() else implicitReceiverPerLabel[Name.identifier(labelName)]
val implicitReceiver = implicitReceivers.lastOrNull() val implicitReceiver = implicitReceivers.lastOrNull()
callee.candidateOwner = implicitReceiver?.boundSymbol callee.boundSymbol = implicitReceiver?.boundSymbol
qualifiedAccessExpression.resultType = FirResolvedTypeRefImpl( qualifiedAccessExpression.resultType = FirResolvedTypeRefImpl(
null, implicitReceiver?.type ?: ConeKotlinErrorType("Unresolved this@$labelName"), null, implicitReceiver?.type ?: ConeKotlinErrorType("Unresolved this@$labelName"),
emptyList() emptyList()
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+1 -1
View File
@@ -808,7 +808,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
override fun visitThisReference(thisReference: FirThisReference) { override fun visitThisReference(thisReference: FirThisReference) {
print("this") print("this")
val labelName = thisReference.labelName val labelName = thisReference.labelName
val symbol = thisReference.candidateOwner val symbol = thisReference.boundSymbol
when { when {
symbol != null -> print("@R|${symbol.render()}|") symbol != null -> print("@R|${symbol.render()}|")
labelName != null -> print("@$labelName#") labelName != null -> print("@$labelName#")
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor
interface FirThisReference : FirReference { interface FirThisReference : FirReference {
val labelName: String? val labelName: String?
val candidateOwner: AbstractFirBasedSymbol<*>? get() = null val boundSymbol: AbstractFirBasedSymbol<*>? get() = null
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
visitor.visitThisReference(this, data) visitor.visitThisReference(this, data)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt
+1 -1
View File
@@ -11,5 +11,5 @@ import org.jetbrains.kotlin.fir.FirThisReference
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
class FirExplicitThisReference(psi: PsiElement?, override val labelName: String?) : FirAbstractElement(psi), FirThisReference { class FirExplicitThisReference(psi: PsiElement?, override val labelName: String?) : FirAbstractElement(psi), FirThisReference {
override var candidateOwner: AbstractFirBasedSymbol<*>? = null override var boundSymbol: AbstractFirBasedSymbol<*>? = null
} }