From 288db4fb1c7040690646277a1a7acda2a74017e3 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 8 May 2020 14:55:39 +0300
Subject: [PATCH] Revert "FIR: make both ImplicitReceiverStack.get
 implementations consistent"

This reverts commit b058ca635c95f18784f42b3f45ff3c0781e40722.

Change is not necessary anymore since there are no kinds for implicit
receivers
---
 .../fir/resolve/PersistentImplicitReceiverStack.kt     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt
index 5ccc3e2c308..fd99ab93db1 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/PersistentImplicitReceiverStack.kt
@@ -51,14 +51,8 @@ class PersistentImplicitReceiverStack private constructor(
     }
 
     override operator fun get(name: String?): ImplicitReceiverValue<*>? {
-        if (name == null) {
-            return stack.lastOrNull {
-                it !is ImplicitDispatchReceiverValue || !it.inDelegated
-            }
-        }
-        return indexesPerLabel[Name.identifier(name)].lastOrNull()?.let { stack[it] }?.takeIf {
-            it !is ImplicitDispatchReceiverValue || !it.inDelegated
-        }
+        if (name == null) return stack.lastOrNull()
+        return indexesPerLabel[Name.identifier(name)].lastOrNull()?.let { stack[it] }
     }
 
     override fun lastDispatchReceiver(): ImplicitDispatchReceiverValue? {