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

FIR: set bound symbol for explicit this references

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-08-26 18:20:59 +03:00
parent aa79064a96
commit 6604539154
35 changed files with 116 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
Vendored
+3 -3
View File
@@ -14,11 +14,11 @@ FILE: these.kt
public? final? val instance: Some
public? get(): Some {
^ this@Some
^ this@Some#
}
public? final? fun String.extension(): Int {
^extension this@Some.bar#().plus#(this#.length#)
^extension this@Some#.bar#().plus#(this#.length#)
}
}
@@ -27,7 +27,7 @@ FILE: these.kt
}
public? final? fun test(some: Some): Int {
^test with#(some#, <L> = with@fun <implicit>.<anonymous>(): <implicit> {
this#.foo#().plus#(this@with.extension#())
this#.foo#().plus#(this@with#.extension#())
}
)
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+1 -1
View File
@@ -39,7 +39,7 @@ class FirCallResolver(
private val transformer: FirBodyResolveTransformer,
private val topLevelScopes: List<FirScope>,
private val localScopes: List<FirLocalScope>,
private val implicitReceiverStack: List<ImplicitReceiverValue>,
private val implicitReceiverStack: List<ImplicitReceiverValue<*>>,
private val qualifiedResolver: FirQualifiedNameResolver
) : BodyResolveComponents by transformer {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
+3 -3
View File
@@ -274,9 +274,9 @@ fun <T : FirResolvable> BodyResolveComponents.typeFromCallee(access: T): FirReso
}
is FirThisReference -> {
val labelName = newCallee.labelName
val types = if (labelName == null) labels.values() else labels[Name.identifier(labelName)]
val type = types.lastOrNull() ?: ConeKotlinErrorType("Unresolved this@$labelName")
FirResolvedTypeRefImpl(null, type, emptyList())
val implicitReceivers = if (labelName == null) implicitReceiverPerLabel.values() else implicitReceiverPerLabel[Name.identifier(labelName)]
val implicitReceiver = implicitReceivers.lastOrNull()
FirResolvedTypeRefImpl(null, implicitReceiver?.type ?: ConeKotlinErrorType("Unresolved this@$labelName"), emptyList())
}
else -> error("Failed to extract type from: $newCallee")
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SessionHolder.kt
+2 -1
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue
import org.jetbrains.kotlin.fir.resolve.calls.InferenceComponents
import org.jetbrains.kotlin.fir.resolve.calls.ResolutionStageRunner
import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
@@ -26,7 +27,7 @@ interface SessionHolder {
interface BodyResolveComponents : SessionHolder {
val returnTypeCalculator: ReturnTypeCalculator
val labels: SetMultimap<Name, ConeKotlinType>
val implicitReceiverPerLabel: SetMultimap<Name, ImplicitReceiverValue<*>>
val noExpectedType: FirTypeRef
val symbolProvider: FirSymbolProvider
val file: FirFile
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
+3 -3
View File
@@ -27,7 +27,7 @@ class CallResolver(
private fun processImplicitReceiver(
towerDataConsumer: TowerDataConsumer,
implicitReceiverValue: ImplicitReceiverValue,
implicitReceiverValue: ImplicitReceiverValue<*>,
oldGroup: Int
): Int {
var group = oldGroup
@@ -147,9 +147,9 @@ class CallResolver(
val collector by lazy { CandidateCollector(components, resolutionStageRunner) }
lateinit var towerDataConsumer: TowerDataConsumer
private lateinit var implicitReceiverValues: List<ImplicitReceiverValue>
private lateinit var implicitReceiverValues: List<ImplicitReceiverValue<*>>
fun runTowerResolver(consumer: TowerDataConsumer, implicitReceiverValues: List<ImplicitReceiverValue>): CandidateCollector {
fun runTowerResolver(consumer: TowerDataConsumer, implicitReceiverValues: List<ImplicitReceiverValue<*>>): CandidateCollector {
this.implicitReceiverValues = implicitReceiverValues
towerDataConsumer = consumer
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
+1 -1
View File
@@ -46,7 +46,7 @@ enum class CandidateApplicability {
class Candidate(
val symbol: AbstractFirBasedSymbol<*>,
val dispatchReceiverValue: ClassDispatchReceiverValue?,
val implicitExtensionReceiverValue: ImplicitReceiverValue?,
val implicitExtensionReceiverValue: ImplicitReceiverValue<*>?,
val explicitReceiverKind: ExplicitReceiverKind,
private val inferenceComponents: InferenceComponents,
private val baseSystem: ConstraintStorage,
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class CandidateFactory(
fun createCandidate(
symbol: AbstractFirBasedSymbol<*>,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?,
explicitReceiverKind: ExplicitReceiverKind
): Candidate {
return Candidate(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
+8 -4
View File
@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.scope
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassTypeImpl
@@ -41,7 +43,8 @@ class ExpressionReceiverValue(
?: ConeKotlinErrorType("No type calculated for: ${explicitReceiverExpression.renderWithType()}") // TODO: assert here
}
abstract class ImplicitReceiverValue(
abstract class ImplicitReceiverValue<S : AbstractFirBasedSymbol<*>>(
val boundSymbol: S,
final override val type: ConeKotlinType,
useSiteSession: FirSession,
scopeSession: ScopeSession
@@ -52,19 +55,20 @@ abstract class ImplicitReceiverValue(
}
class ImplicitDispatchReceiverValue(
val boundSymbol: FirClassSymbol,
boundSymbol: FirClassSymbol,
type: ConeKotlinType,
symbolProvider: FirSymbolProvider,
useSiteSession: FirSession,
scopeSession: ScopeSession
) : ImplicitReceiverValue(type, useSiteSession, scopeSession) {
) : ImplicitReceiverValue<FirClassSymbol>(boundSymbol, type, useSiteSession, scopeSession) {
val implicitCompanionScope: FirScope? = boundSymbol.fir.companionObject?.let { companionObject ->
symbolProvider.getClassUseSiteMemberScope(companionObject.classId, useSiteSession, scopeSession)
}
}
class ImplicitExtensionReceiverValue(
boundSymbol: FirCallableSymbol<*>,
type: ConeKotlinType,
useSiteSession: FirSession,
scopeSession: ScopeSession
) : ImplicitReceiverValue(type, useSiteSession, scopeSession)
) : ImplicitReceiverValue<FirCallableSymbol<*>>(boundSymbol, type, useSiteSession, scopeSession)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerDataConsumers.kt
+4 -4
View File
@@ -64,7 +64,7 @@ class QualifiedReceiverTowerDataConsumer<T : AbstractFirBasedSymbol<*>>(
override fun consumeCandidate(
symbol: T,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?
): ProcessorAction {
assert(dispatchReceiverValue == null)
resultCollector.consumeCandidate(
@@ -191,7 +191,7 @@ class ExplicitReceiverTowerDataConsumer<T : AbstractFirBasedSymbol<*>>(
override fun consumeCandidate(
symbol: T,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?
): ProcessorAction {
resultCollector.consumeCandidate(
group,
@@ -210,7 +210,7 @@ class ExplicitReceiverTowerDataConsumer<T : AbstractFirBasedSymbol<*>>(
override fun consumeCandidate(
symbol: T,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?
): ProcessorAction {
if (symbol is FirNamedFunctionSymbol && symbol.callableId.packageName.startsWith(defaultPackage)) {
val explicitReceiverType = explicitReceiver.type
@@ -280,7 +280,7 @@ class NoExplicitReceiverTowerDataConsumer<T : AbstractFirBasedSymbol<*>>(
override fun consumeCandidate(
symbol: T,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?
): ProcessorAction {
resultCollector.consumeCandidate(
group,
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerLevels.kt
+3 -3
View File
@@ -51,7 +51,7 @@ interface TowerScopeLevel {
fun consumeCandidate(
symbol: T,
dispatchReceiverValue: ClassDispatchReceiverValue?,
implicitExtensionReceiverValue: ImplicitReceiverValue?
implicitExtensionReceiverValue: ImplicitReceiverValue<*>?
): ProcessorAction
}
@@ -90,7 +90,7 @@ abstract class SessionBasedTowerLevel(val session: FirSession) : TowerScopeLevel
class MemberScopeTowerLevel(
session: FirSession,
val dispatchReceiver: ReceiverValue,
val implicitExtensionReceiver: ImplicitReceiverValue? = null,
val implicitExtensionReceiver: ImplicitReceiverValue<*>? = null,
val scopeSession: ScopeSession
) : SessionBasedTowerLevel(session) {
private fun <T : AbstractFirBasedSymbol<*>> processMembers(
@@ -150,7 +150,7 @@ class MemberScopeTowerLevel(
class ScopeTowerLevel(
session: FirSession,
val scope: FirScope,
val implicitExtensionReceiver: ImplicitReceiverValue? = null
val implicitExtensionReceiver: ImplicitReceiverValue<*>? = null
) : SessionBasedTowerLevel(session) {
private fun FirCallableSymbol<*>.hasConsistentReceivers(extensionReceiver: ReceiverValue?): Boolean =
hasConsistentExtensionReceiver(extensionReceiver) && (scope is FirAbstractImportingScope || dispatchReceiverValue() == null)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+26 -12
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor
import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.FirExplicitThisReference
import org.jetbrains.kotlin.fir.references.FirSimpleNamedReference
import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.resolve.calls.*
@@ -48,7 +49,6 @@ open class FirBodyResolveTransformer(
private set
final override val returnTypeCalculator: ReturnTypeCalculator = ReturnTypeCalculatorWithJump(session, scopeSession)
final override val labels: SetMultimap<Name, ConeKotlinType> = LinkedHashMultimap.create()
final override val noExpectedType = FirImplicitTypeRefImpl(null)
private val booleanType = FirImplicitBooleanTypeRef(null)
@@ -67,7 +67,8 @@ open class FirBodyResolveTransformer(
private val localScopes = mutableListOf<FirLocalScope>()
private val topLevelScopes = mutableListOf<FirScope>()
private val implicitReceiverStack = mutableListOf<ImplicitReceiverValue>()
final override val implicitReceiverPerLabel: SetMultimap<Name, ImplicitReceiverValue<*>> = LinkedHashMultimap.create()
private val implicitReceiverStack = mutableListOf<ImplicitReceiverValue<*>>()
final override val inferenceComponents = inferenceComponents(session, returnTypeCalculator, scopeSession)
private var primaryConstructorParametersScope: FirLocalScope? = null
@@ -197,11 +198,16 @@ open class FirBodyResolveTransformer(
): CompositeTransformResult<FirStatement> {
when (val callee = qualifiedAccessExpression.calleeReference) {
is FirThisReference -> {
is FirExplicitThisReference -> {
val labelName = callee.labelName
val types = if (labelName == null) labels.values() else labels[Name.identifier(labelName)]
val type = types.lastOrNull() ?: ConeKotlinErrorType("Unresolved this@$labelName")
qualifiedAccessExpression.resultType = FirResolvedTypeRefImpl(null, type, emptyList())
val implicitReceivers =
if (labelName == null) implicitReceiverPerLabel.values() else implicitReceiverPerLabel[Name.identifier(labelName)]
val implicitReceiver = implicitReceivers.lastOrNull()
callee.candidateOwner = implicitReceiver?.boundSymbol
qualifiedAccessExpression.resultType = FirResolvedTypeRefImpl(
null, implicitReceiver?.type ?: ConeKotlinErrorType("Unresolved this@$labelName"),
emptyList()
)
return qualifiedAccessExpression.compose()
}
is FirSuperReference -> {
@@ -366,7 +372,9 @@ open class FirBodyResolveTransformer(
val label = anonymousFunction.label
return if (label != null && receiverTypeRef != null) {
withLabelAndReceiverType(Name.identifier(label.name), anonymousFunction, receiverTypeRef.coneTypeUnsafe()) { transform() }
withLabelAndReceiverType(Name.identifier(label.name), anonymousFunction, receiverTypeRef.coneTypeUnsafe()) {
transform()
}
} else {
transform()
}
@@ -768,22 +776,28 @@ open class FirBodyResolveTransformer(
// ----------------------- Util functions -----------------------
private inline fun <T> withLabelAndReceiverType(labelName: Name, owner: FirElement, type: ConeKotlinType, block: () -> T): T {
labels.put(labelName, type)
implicitReceiverStack += when (owner) {
private inline fun <T> withLabelAndReceiverType(
labelName: Name,
owner: FirDeclaration,
type: ConeKotlinType,
block: () -> T
): T {
val implicitReceiverValue = when (owner) {
is FirRegularClass -> {
ImplicitDispatchReceiverValue(owner.symbol, type, symbolProvider, session, scopeSession)
}
is FirFunction<*> -> {
ImplicitExtensionReceiverValue(type, session, scopeSession)
ImplicitExtensionReceiverValue(owner.symbol, type, session, scopeSession)
}
else -> {
throw IllegalArgumentException("Incorrect label & receiver owner: ${owner.javaClass}")
}
}
implicitReceiverPerLabel.put(labelName, implicitReceiverValue)
implicitReceiverStack += implicitReceiverValue
val result = block()
implicitReceiverStack.removeAt(implicitReceiverStack.size - 1)
labels.remove(labelName, type)
implicitReceiverPerLabel.remove(labelName, implicitReceiverValue)
return result
}
compiler/fir/resolve/testData/resolve/builtins/lists.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ abstract class MyStringList : List<String>
abstract class MyMutableStringList : MutableList<String>
fun List<String>.convert(): MyStringList = this as MyStringList
fun ret(l: MutableList<String>): MyMutableStringList = this as MyMutableStringList
fun ret(l: MutableList<String>): MyMutableStringList = l as MyMutableStringList
compiler/fir/resolve/testData/resolve/builtins/lists.txt
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@ FILE: lists.kt
}
public final fun R|kotlin/collections/List<kotlin/String>|.convert(): R|MyStringList| {
^convert (this# as R|MyStringList|)
^convert (this@R|/convert| as R|MyStringList|)
}
public final fun ret(l: R|kotlin/collections/MutableList<kotlin/String>|): R|MyMutableStringList| {
^ret (this# as R|MyMutableStringList|)
^ret (R|<local>/l| as R|MyMutableStringList|)
}
compiler/fir/resolve/testData/resolve/expresssions/access.txt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ FILE: access.kt
}
public final fun bar(): R|Bar| {
^bar this#
^bar this@R|/Bar|
}
public final operator fun R|kotlin/String|.plus(bar: R|Bar|): R|kotlin/String| {
compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@ FILE: explicitReceiver.kt
public get(): R|Foo|
public final operator fun invoke(): R|Foo| {
^invoke this#
^invoke this@R|/Foo|
}
public final fun bar(): R|Foo| {
@@ -30,7 +30,7 @@ FILE: explicitReceiver.kt
public get(): R|Bar|
public final operator fun invoke(): R|Bar| {
^invoke this#
^invoke this@R|/Bar|
}
public final fun baz(): R|kotlin/Unit| {
compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ FILE: explicitReceiver2.kt
}
public final operator fun invoke(): R|Foo| {
^invoke this#
^invoke this@R|/Bar|
}
}
@@ -17,7 +17,7 @@ FILE: explicitReceiver2.kt
}
public final operator fun R|Bar|.invoke(): R|Foo| {
^invoke this#
^invoke this@R|/Foo.invoke|
}
public final val x: R|Bar| = R|/Bar.Bar|()
compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ FILE: extension.kt
}
public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
^invoke this@Foo
^invoke this@R|/Foo|
}
public final val x: R|kotlin/Int| = Int(0)
compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ FILE: farInvokeExtension.kt
public final fun x(): R|kotlin/Unit| {
}
public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
^invoke this@Foo
^invoke this@Foo#
}
public final class Foo : R|kotlin/Any| {
public constructor(): R|Foo| {
compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ FILE: implicitTypeOrder.kt
}
public final fun invoke(): R|A| {
^invoke this#
^invoke this@R|/A|
}
}
compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ FILE: threeReceivers.kt
}
public final fun R|FooBar|.invoke(): R|Bar| {
^invoke this#
^invoke this@R|/Bar.invoke|
}
}
compiler/fir/resolve/testData/resolve/expresssions/objects.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ FILE: objects.kt
}
public final fun foo(): R|A| {
^foo this#
^foo this@R|/A|
}
}
compiler/fir/resolve/testData/resolve/expresssions/this.txt
Vendored
+4 -4
View File
@@ -11,19 +11,19 @@ FILE: this.kt
}
public final fun bar(): R|Foo| {
^bar this#
^bar this@R|/Foo|
}
public final fun R|Bar|.buz(): R|Bar| {
^buz this#
^buz this@R|/Foo.buz|
}
public final fun R|Bar|.foo(): R|Foo| {
^foo this@Foo
^foo this@R|/Foo|
}
public final fun R|Bar|.foobar(): R|Bar| {
^foobar this@foobar
^foobar this@R|/Foo.foobar|
}
}
compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ FILE: noPrimaryConstructor.kt
public constructor(x: R|kotlin/String|): R|NoPrimary| {
super<R|kotlin/Any|>()
this#.R|/NoPrimary.x| = R|<local>/x|
this@R|/NoPrimary|.R|/NoPrimary.x| = R|<local>/x|
}
public constructor(): R|NoPrimary| {
compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ FILE: typeParameters.kt
}
public final override fun concat(other: R|List<kotlin/Int>|): R|List<kotlin/Int>| {
^concat this#
^concat this@R|/SomeList|
}
}
compiler/fir/resolve/testData/resolve/genericFunctions.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ FILE: genericFunctions.kt
public abstract interface Any : R|kotlin/Any| {
}
public final inline fun <reified T : R|Any|> R|Any|.safeAs(): R|T?| {
^safeAs (this# as? R|T|)
^safeAs (this@R|/safeAs| as? R|T|)
}
public abstract class Summator : R|kotlin/Any| {
public constructor(): R|Summator| {
compiler/fir/resolve/testData/resolve/nested/inner.txt
Vendored
+4 -4
View File
@@ -6,7 +6,7 @@ FILE: inner.kt
public final fun foo(): R|kotlin/Unit| {
R|/Owner.bar|()
this#.R|/Owner.bar|()
this@R|/Owner|.R|/Owner.bar|()
}
public final fun bar(): R|kotlin/Unit| {
@@ -24,15 +24,15 @@ FILE: inner.kt
public final fun baz(): R|kotlin/Unit| {
R|/Owner.Inner.gau|()
this#.R|/Owner.Inner.gau|()
this@R|/Owner.Inner|.R|/Owner.Inner.gau|()
}
public final fun gau(): R|kotlin/Unit| {
lval o: R|Owner| = R|/Owner.Owner|()
R|<local>/o|.R|/Owner.foo|()
R|/Owner.foo|()
this@Owner.R|/Owner.foo|()
this#.<Unresolved name: err>#()
this@R|/Owner|.R|/Owner.foo|()
this@R|/Owner.Inner|.<Unresolved name: err>#()
}
}
compiler/fir/resolve/testData/resolve/nested/simple.txt
Vendored
+3 -3
View File
@@ -6,7 +6,7 @@ FILE: simple.kt
public final fun foo(): R|kotlin/Unit| {
R|/Owner.bar|()
this#.R|/Owner.bar|()
this@R|/Owner|.R|/Owner.bar|()
}
public final fun bar(): R|kotlin/Unit| {
@@ -21,7 +21,7 @@ FILE: simple.kt
public final fun baz(): R|kotlin/Unit| {
R|/Owner.Nested.gau|()
this#.R|/Owner.Nested.gau|()
this@R|/Owner.Nested|.R|/Owner.Nested.gau|()
}
public final fun gau(): R|kotlin/Unit| {
@@ -31,7 +31,7 @@ FILE: simple.kt
public final fun err(): R|kotlin/Unit| {
<Unresolved name: foo>#()
this#.<Unresolved name: foo>#()
this@R|/Owner.Nested|.<Unresolved name: foo>#()
}
}
compiler/fir/resolve/testData/resolve/overrides/simple.txt
Vendored
+6 -6
View File
@@ -5,15 +5,15 @@ FILE: simple.kt
}
public open fun foo(): R|A| {
^foo this#
^foo this@R|/A|
}
public open fun bar(): R|A| {
^bar this#
^bar this@R|/A|
}
public open fun buz(p: R|A|): R|A| {
^buz this#
^buz this@R|/A|
}
}
@@ -23,15 +23,15 @@ FILE: simple.kt
}
public final override fun foo(): R|B| {
^foo this#
^foo this@R|/B|
}
public final fun bar(): R|B| {
^bar this#
^bar this@R|/B|
}
public final override fun buz(p: R|B|): R|B| {
^buz this#
^buz this@R|/B|
}
public final fun test(): R|kotlin/Unit| {
compiler/fir/resolve/testData/resolve/recursiveCallOnWhenWithSealedClass.txt
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ FILE: recursiveCallOnWhenWithSealedClass.kt
}
public final fun unwrap(): <ERROR TYPE REF: Inapplicable when expression> {
^unwrap when (this#) {
^unwrap when (this@R|/Maybe|) {
($subj$ is R|Maybe.Nope|) -> {
throw R|java/lang/Exception.Exception|(String())
}
compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ FILE: arrayFirstOrNull.kt
Null(null)
}
else -> {
this#.R|FakeOverride<kotlin/Array.get: R|T|>|(Int(0))
this@R|/firstOrNullX|.R|FakeOverride<kotlin/Array.get: R|T|>|(Int(0))
}
}
compiler/fir/resolve/testData/resolve/stdlib/mapList.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FILE: mapList.kt
}
)
R|<local>/u|.R|/applyX|<R|kotlin/collections/List<kotlin/Int>|>(<L> = applyX@fun R|kotlin/collections/List<kotlin/Int>|.<anonymous>(it: R|kotlin/collections/List<kotlin/Int>|): R|kotlin/Unit| {
this#.R|FakeOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
this@R|special/anonymous|.R|FakeOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
R|FakeOverride<kotlin/collections/List.contains: R|kotlin/Boolean|>|(Int(1))
}
)
compiler/fir/resolve/testData/resolve/stdlib/simpleDelegatedToMap.txt
Vendored
+2 -2
View File
@@ -9,10 +9,10 @@ FILE: simpleDelegatedToMap.kt
public final var foo: <ERROR TYPE REF: Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>by R|<local>/map|
public get(): <ERROR TYPE REF: Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]> {
^ D|/C.foo|.<Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>#(this#, ::R|/C.foo|)
^ D|/C.foo|.<Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>#(this@R|/C|, ::R|/C.foo|)
}
public set(<set-?>: <ERROR TYPE REF: Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>): R|kotlin/Unit| {
D|/C.foo|.<Inapplicable(INAPPLICABLE): [kotlin/collections/setValue]>#(this#, ::R|/C.foo|, R|<local>/<set-?>|)
D|/C.foo|.<Inapplicable(INAPPLICABLE): [kotlin/collections/setValue]>#(this@R|/C|, ::R|/C.foo|, R|<local>/<set-?>|)
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+16 -18
View File
@@ -15,10 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
import org.jetbrains.kotlin.fir.expressions.impl.FirLoopJump
import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.symbols.ConeCallableSymbol
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeSymbol
import org.jetbrains.kotlin.fir.symbols.StandardClassIds
import org.jetbrains.kotlin.fir.symbols.*
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.types.*
@@ -755,16 +752,19 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
print("*")
}
private fun ConeSymbol.render(): String {
if (this is ConeCallableSymbol)
return callableId.toString()
else if (this is ConeClassLikeSymbol)
return classId.toString()
return "?"
}
override fun visitNamedReference(namedReference: FirNamedReference) {
val symbol = namedReference.candidateSymbol
when {
symbol != null -> {
print("R?C|")
if (symbol is ConeCallableSymbol)
print(symbol.callableId)
else if (symbol is ConeClassLikeSymbol)
print(symbol.classId)
print("|")
print("R?C|${symbol.render()}|")
}
namedReference is FirErrorNamedReference -> print("<${namedReference.errorReason}>#")
else -> print("${namedReference.name}#")
@@ -791,10 +791,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
print("FakeOverride<")
}
val symbol = resolvedCallableReference.coneSymbol
if (symbol is ConeCallableSymbol)
print(symbol.callableId)
else if (symbol is ConeClassLikeSymbol)
print(symbol.classId)
print(symbol.render())
if (isFakeOverride) {
when (symbol) {
is FirNamedFunctionSymbol -> {
@@ -814,10 +811,11 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
override fun visitThisReference(thisReference: FirThisReference) {
print("this")
val labelName = thisReference.labelName
if (labelName != null) {
print("@$labelName")
} else {
print("#")
val symbol = thisReference.candidateOwner
when {
symbol != null -> print("@R|${symbol.render()}|")
labelName != null -> print("@$labelName#")
else -> print("#")
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirThisReference.kt
+3
View File
@@ -5,11 +5,14 @@
package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import org.jetbrains.kotlin.fir.visitors.FirVisitor
interface FirThisReference : FirReference {
val labelName: String?
val candidateOwner: AbstractFirBasedSymbol<*>? get() = null
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
visitor.visitThisReference(this, data)
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirExplicitThisReference.kt
+4 -1
View File
@@ -8,5 +8,8 @@ package org.jetbrains.kotlin.fir.references
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.FirAbstractElement
import org.jetbrains.kotlin.fir.FirThisReference
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
}