Introduce ClassDescriptor.declaredTypeParameters

Should be a subset of type constructor's parameters

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt

@@ -195,7 +195,7 @@ public class TypeParameterBoundIsNotArrayChecker : DeclarationChecker {
             bindingContext: BindingContext
     ) {
         val typeParameters = (descriptor as? CallableDescriptor)?.typeParameters
-                             ?: (descriptor as? ClassDescriptor)?.typeConstructor?.parameters
+                             ?: (descriptor as? ClassDescriptor)?.declaredTypeParameters
                              ?: return
 
         for (typeParameter in typeParameters) {
@@ -222,7 +222,7 @@ public class ReifiedTypeParameterAnnotationChecker : DeclarationChecker {
         }
 
         if (descriptor is ClassDescriptor) {
-            checkTypeParameterDescriptorsAreNotReified(descriptor.getTypeConstructor().getParameters(), diagnosticHolder)
+            checkTypeParameterDescriptorsAreNotReified(descriptor.declaredTypeParameters, diagnosticHolder)
         }
     }
 

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt

@@ -117,7 +117,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : BaseImportingSc
                 //TODO: non-inner classes
                 for (parent in ownerClass.parentsWithSelf) {
                     if (parent !is ClassDescriptor) break
-                    sourceTypeParams += parent.typeConstructor.parameters
+                    sourceTypeParams += parent.declaredTypeParameters
                 }
                 //TODO: duplicated parameter names