Introduce ClassDescriptor.declaredTypeParameters

Should be a subset of type constructor's parameters

compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java

@@ -302,7 +302,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     private JvmClassSignature signature() {
         BothSignatureWriter sw = new BothSignatureWriter(BothSignatureWriter.Mode.CLASS);
 
-        typeMapper.writeFormalTypeParameters(descriptor.getTypeConstructor().getParameters(), sw);
+        typeMapper.writeFormalTypeParameters(descriptor.getDeclaredTypeParameters(), sw);
 
         sw.writeSuperclass();
         if (superClassType == null) {

compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java

@@ -143,6 +143,12 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
         this.typeParameters = new ArrayList<TypeParameterDescriptor>(typeParameters);
     }
 
+    @NotNull
+    @Override
+    public List<TypeParameterDescriptor> getDeclaredTypeParameters() {
+        return typeParameters;
+    }
+
     public void createTypeConstructor() {
         assert typeConstructor == null : typeConstructor;
         this.typeConstructor = TypeConstructorImpl.createForClass(