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

Revert "FIR: make both ImplicitReceiverStack.get implementations consistent"

Browse Source 
This reverts commit b058ca635c.

Change is not necessary anymore since there are no kinds for implicit
receivers
This commit is contained in:
Denis Zharkov
2020-05-08 14:55:39 +03:00
parent 808355d817
commit 288db4fb1c
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt
+2 -8
View File
@@ -51,14 +51,8 @@ class PersistentImplicitReceiverStack private constructor(
} }
override operator fun get(name: String?): ImplicitReceiverValue<*>? { override operator fun get(name: String?): ImplicitReceiverValue<*>? {
if (name == null) { if (name == null) return stack.lastOrNull()
return stack.lastOrNull { return indexesPerLabel[Name.identifier(name)].lastOrNull()?.let { stack[it] }
it !is ImplicitDispatchReceiverValue || !it.inDelegated
}
}
return indexesPerLabel[Name.identifier(name)].lastOrNull()?.let { stack[it] }?.takeIf {
it !is ImplicitDispatchReceiverValue || !it.inDelegated
}
} }
override fun lastDispatchReceiver(): ImplicitDispatchReceiverValue? { override fun lastDispatchReceiver(): ImplicitDispatchReceiverValue? {