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

[FIR] Fix implicit this aliasing in DFA

Browse Source
This commit is contained in:
simon.ogorodnik
2020-01-31 17:25:46 +03:00
committed by Mikhail Glukhikh
parent 645602b675
commit ef5aab374b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.contracts.description.ConeBooleanConstantReferen
import org.jetbrains.kotlin.fir.contracts.description.ConeConstantReference import org.jetbrains.kotlin.fir.contracts.description.ConeConstantReference
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.references.FirThisReference
import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference
import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
@@ -113,7 +114,7 @@ internal val FirElement.symbol: AbstractFirBasedSymbol<*>?
@DfaInternals @DfaInternals
internal val FirResolvable.symbol: AbstractFirBasedSymbol<*>? internal val FirResolvable.symbol: AbstractFirBasedSymbol<*>?
get() = when (val reference = calleeReference) { get() = when (val reference = calleeReference) {
is FirExplicitThisReference -> reference.boundSymbol is FirThisReference -> reference.boundSymbol
is FirResolvedNamedReference -> reference.resolvedSymbol is FirResolvedNamedReference -> reference.resolvedSymbol
is FirNamedReferenceWithCandidate -> reference.candidateSymbol is FirNamedReferenceWithCandidate -> reference.candidateSymbol
else -> null else -> null