From 3702bdea7065fc8d24735320706407270b1d78ba Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 25 May 2012 23:02:51 +0400
Subject: [PATCH] getTypeConstructor() pushed back down

---
 .../jet/lang/descriptors/ClassDescriptorBase.java         | 7 -------
 .../jet/lang/descriptors/MutableClassDescriptorLite.java  | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
index 452741f6f92..f0f55b92c9a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java
@@ -29,7 +29,6 @@ import java.util.Map;
  */
 public abstract class ClassDescriptorBase implements ClassDescriptor {
 
-    protected TypeConstructor typeConstructor;
     protected JetType defaultType;
 
     protected abstract JetScope getScopeForMemberLookup();
@@ -59,12 +58,6 @@ public abstract class ClassDescriptorBase implements ClassDescriptor {
         return new LazySubstitutingClassDescriptor(this, substitutor);
     }
 
-    @NotNull
-    @Override
-    public TypeConstructor getTypeConstructor() {
-        return typeConstructor;
-    }
-
     @NotNull
     @Override
     public JetType getDefaultType() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
index 741f3826b78..9e9ab59d7ea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
@@ -46,6 +46,8 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
     private List<TypeParameterDescriptor> typeParameters;
     private Collection<JetType> supertypes = Lists.newArrayList();
 
+    private TypeConstructor typeConstructor;
+
     private Modality modality;
     private Visibility visibility;
 
@@ -113,6 +115,12 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
         }
     }
 
+    @NotNull
+    @Override
+    public TypeConstructor getTypeConstructor() {
+        return typeConstructor;
+    }
+
     public void setScopeForMemberLookup(JetScope scopeForMemberLookup) {
         this.scopeForMemberLookup = scopeForMemberLookup;
         this.innerClassesScope = new InnerClassesScopeWrapper(scopeForMemberLookup);