From 9cbde911ce7e5d5aa915a8c0bfced11cf488244b Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 15 Jan 2016 15:39:25 +0300
Subject: [PATCH] Revert of 'Minor. workaround for KT-10679 Wrong outer after
 inline.'

---
 .../jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
index 6cdeb6b3213..4f22ffa99fe 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
@@ -98,7 +98,10 @@ class TowerResolver {
 
         operator fun TowerData.unaryPlus() = result.add(this)
 
-        val localLevels = createLocalLevels()
+        val localLevels = lexicalScope.parentsWithSelf.
+                filterIsInstance<LexicalScope>().filter { it.kind.withLocalDescriptors }.
+                map { ScopeBasedTowerLevel(this@createTowerDataList, it) }
+
         val nonLocalLevels = createNonLocalLevels()
         val syntheticLevel = SyntheticScopeBasedTowerLevel(this, syntheticScopes)