Obtain type parameters of constructor from containing class

Effectively this commit is just inlining of 'typeParameters' parameter

compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java

@@ -227,7 +227,7 @@ public class SingleAbstractMethodUtils {
                     @NotNull List<ValueParameterDescriptor> valueParameters,
                     @NotNull KotlinType returnType
             ) {
-                result.initialize(typeParameters, valueParameters, original.getVisibility());
+                result.initialize(valueParameters, original.getVisibility());
                 result.setReturnType(returnType);
             }
         });

compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt

@@ -241,7 +241,6 @@ class FunctionDescriptorResolver(
                 true,
                 classElement.getPrimaryConstructorModifierList(),
                 classElement.getPrimaryConstructor() ?: classElement,
-                classDescriptor.getTypeConstructor().getParameters(),
                 classElement.getPrimaryConstructorParameters(),
                 trace
         )
@@ -259,7 +258,6 @@ class FunctionDescriptorResolver(
                 false,
                 constructor.getModifierList(),
                 constructor,
-                classDescriptor.getTypeConstructor().getParameters(),
                 constructor.getValueParameters(),
                 trace
         )
@@ -271,7 +269,6 @@ class FunctionDescriptorResolver(
             isPrimary: Boolean,
             modifierList: KtModifierList?,
             declarationToTrace: KtDeclaration,
-            typeParameters: List<TypeParameterDescriptor>,
             valueParameters: List<KtParameter>,
             trace: BindingTrace
     ): ConstructorDescriptorImpl {
@@ -291,7 +288,6 @@ class FunctionDescriptorResolver(
         )
         parameterScope.changeLockLevel(LexicalWritableScope.LockLevel.BOTH)
         val constructor = constructorDescriptor.initialize(
-                typeParameters,
                 resolveValueParameters(constructorDescriptor, parameterScope, valueParameters, trace, null),
                 resolveVisibilityFromModifiers(
                         modifierList,

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt

@@ -118,7 +118,6 @@ public class LazyScriptClassMemberScope protected constructor(
                 true,
                 SourceElement.NO_SOURCE
         ).initialize(
-                listOf(),
                 valueParameters,
                 Visibilities.PUBLIC
         )

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -480,7 +480,6 @@ public class LazyJavaClassMemberScope(
                 constructor, false, null, null, valueParameters.descriptors, Collections.emptyList(), false)
 
         constructorDescriptor.initialize(
-                classDescriptor.getTypeConstructor().getParameters(),
                 effectiveSignature.getValueParameters(),
                 constructor.getVisibility()
         )
@@ -508,12 +507,11 @@ public class LazyJavaClassMemberScope(
         val constructorDescriptor = JavaConstructorDescriptor.createJavaConstructor(
                 classDescriptor, Annotations.EMPTY, /* isPrimary = */ true, c.components.sourceElementFactory.source(jClass)
         )
-        val typeParameters = classDescriptor.getTypeConstructor().getParameters()
         val valueParameters = if (isAnnotation) createAnnotationConstructorParameters(constructorDescriptor)
                               else Collections.emptyList<ValueParameterDescriptor>()
         constructorDescriptor.setHasSynthesizedParameterNames(false)
 
-        constructorDescriptor.initialize(typeParameters, valueParameters, getConstructorVisibility(classDescriptor))
+        constructorDescriptor.initialize(valueParameters, getConstructorVisibility(classDescriptor))
         constructorDescriptor.setHasStableParameterNames(true)
         constructorDescriptor.setReturnType(classDescriptor.getDefaultType())
         c.components.javaResolverCache.recordConstructor(jClass, constructorDescriptor);

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ConstructorDescriptorImpl.java

@@ -55,12 +55,14 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
     }
 
     public ConstructorDescriptorImpl initialize(
-            @NotNull List<TypeParameterDescriptor> typeParameters,
             @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters,
             @NotNull Visibility visibility
     ) {
-        super.initialize(null, calculateDispatchReceiverParameter(), typeParameters, unsubstitutedValueParameters, null,
+        super.initialize(
-                         Modality.FINAL, visibility);
+                null, calculateDispatchReceiverParameter(),
+                getContainingDeclaration().getDeclaredTypeParameters(),
+                unsubstitutedValueParameters, null,
+                Modality.FINAL, visibility);
         return this;
     }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java

@@ -37,7 +37,7 @@ public class DescriptorFactory {
     private static class DefaultConstructorDescriptor extends ConstructorDescriptorImpl {
         public DefaultConstructorDescriptor(@NotNull ClassDescriptor containingClass, @NotNull SourceElement source) {
             super(containingClass, null, Annotations.Companion.getEMPTY(), true, Kind.DECLARATION, source);
-            initialize(Collections.<TypeParameterDescriptor>emptyList(), Collections.<ValueParameterDescriptor>emptyList(),
+            initialize(Collections.<ValueParameterDescriptor>emptyList(),
                        getDefaultConstructorVisibility(containingClass));
         }
     }

core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java

@@ -269,7 +269,7 @@ public class ErrorUtils {
                   Modality.OPEN, Collections.<KotlinType>emptyList(), SourceElement.NO_SOURCE);
 
             ConstructorDescriptorImpl errorConstructor = ConstructorDescriptorImpl.create(this, Annotations.Companion.getEMPTY(), true, SourceElement.NO_SOURCE);
-            errorConstructor.initialize(Collections.<TypeParameterDescriptor>emptyList(), Collections.<ValueParameterDescriptor>emptyList(),
+            errorConstructor.initialize(Collections.<ValueParameterDescriptor>emptyList(),
                                         Visibilities.INTERNAL);
             MemberScope memberScope = createErrorScope(getName().asString());
             errorConstructor.setReturnType(

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt

@@ -170,7 +170,6 @@ public class MemberDeserializer(private val c: DeserializationContext) {
         )
         val local = c.childContext(descriptor, listOf())
         descriptor.initialize(
-                classDescriptor.typeConstructor.parameters,
                 local.memberDeserializer.valueParameters(proto.valueParameterList, proto, AnnotatedCallableKind.FUNCTION),
                 Deserialization.visibility(Flags.VISIBILITY.get(proto.flags))
         )

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt

@@ -69,7 +69,7 @@ private class MissingDependencyErrorClassDescriptor(
 
     init {
         val emptyConstructor = ConstructorDescriptorImpl.create(this, Annotations.EMPTY, true, SourceElement.NO_SOURCE)
-        emptyConstructor.initialize(listOf(), listOf(), Visibilities.DEFAULT_VISIBILITY)
+        emptyConstructor.initialize(listOf(), Visibilities.DEFAULT_VISIBILITY)
         emptyConstructor.setReturnType(createErrorType("<ERROR RETURN TYPE>"))
         initialize(MemberScope.Empty, setOf(emptyConstructor), emptyConstructor)
     }