Simplify TypeConstructorImpl, extend it from AbstractClassTypeConstructor

2016-03-16 13:08:31 +03:00
parent b95e27fd87
commit 13ae3d96ab
10 changed files with 64 additions and 121 deletions
@@ -151,13 +151,8 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class

    public void createTypeConstructor() {
        assert typeConstructor == null : typeConstructor;
-        this.typeConstructor = TypeConstructorImpl.createForClass(
-                this,
-                Annotations.Companion.getEMPTY(),
-                ModalityKt.isFinalClass(this),
-                getName().asString(),
-                typeParameters,
-                supertypes
+        this.typeConstructor = new TypeConstructorImpl(
+                this, Annotations.Companion.getEMPTY(), ModalityKt.isFinalClass(this), typeParameters, supertypes
        );
        for (FunctionDescriptor functionDescriptor : getConstructors()) {
            ((ConstructorDescriptorImpl) functionDescriptor).setReturnType(getDefaultType());