From e201268f46dcd60fa0d97b503ef47503a03682cf Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 15 Dec 2015 14:45:10 +0300
Subject: [PATCH] Remove unnecessary scopes

---
 .../lazy/descriptors/ClassResolutionScopesSupport.kt      | 8 +++-----
 .../src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt     | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
index f7333e1ab95..2c24d5a5c7c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt
@@ -45,7 +45,7 @@ class ClassResolutionScopesSupport(
     }
 
     public val scopeForConstructorHeaderResolution: () -> LexicalScope = storageManager.createLazyValue {
-        scopeWithGenerics(if (classDescriptor.kind.isSingleton) scopeForCompanionObjectHeaderResolution() else scopeForStaticMemberDeclarationResolution())
+        scopeWithGenerics(inheritanceScopeWithMe())
     }
 
     private val inheritanceScopeWithoutMe: () -> LexicalScope = storageManager.createLazyValue(onRecursion = createThrowingLexicalScope) {
@@ -59,8 +59,7 @@ class ClassResolutionScopesSupport(
     }
 
     public val scopeForCompanionObjectHeaderResolution: () -> LexicalScope = storageManager.createLazyValue(onRecursion = createThrowingLexicalScope) {
-        val inheritanceScope = createInheritanceScope(inheritanceScopeWithoutMe(), classDescriptor, classDescriptor, withCompanionObject = false)
-        LexicalScopeImpl(inheritanceScope, classDescriptor, false, null, LexicalScopeKind.COMPANION_OBJECT_HEADER)
+        createInheritanceScope(inheritanceScopeWithoutMe(), classDescriptor, classDescriptor, withCompanionObject = false)
     }
 
     public val scopeForMemberDeclarationResolution: () -> LexicalScope = storageManager.createLazyValue {
@@ -73,7 +72,7 @@ class ClassResolutionScopesSupport(
             scopeForMemberDeclarationResolution()
         }
         else {
-            LexicalScopeImpl(inheritanceScopeWithMe(), classDescriptor, false, null, LexicalScopeKind.CLASS_STATIC_SCOPE)
+            inheritanceScopeWithMe()
         }
     }
 
@@ -99,7 +98,6 @@ class ClassResolutionScopesSupport(
         val superClasses = SmartList<ClassDescriptor>()
         var parent: ClassDescriptor? = getSuperClassNotAny()
 
-        // possible recursion in inheritance
         while(parent != null && parent != this) {
             superClasses.add(parent)
             parent = parent.getSuperClassNotAny()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt
index d09c3fe0254..528a261b0cf 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt
@@ -63,7 +63,6 @@ enum class LexicalScopeKind(val withLocalDescriptors: Boolean) {
     CLASS_STATIC_SCOPE(false),
     CLASS_MEMBER_SCOPE(false),
     CLASS_INITIALIZER(true),
-    COMPANION_OBJECT_HEADER(false),
 
     DEFAULT_VALUE(true),