Sema: Remove usages of AbstractTypeParamDecl::getSuperclass()/getConformedProtocols()

Author: slavapestov

lib/Sema/CSRanking.cpp

@@ -238,33 +238,38 @@ static bool isDeclMoreConstrainedThan(ValueDecl *decl1, ValueDecl *decl2) {
   if (decl1->getKind() != decl2->getKind() || isa<TypeDecl>(decl1))
     return false;
 
-  GenericParamList *gp1 = nullptr, *gp2 = nullptr;
+  bool bothGeneric = false;
+  GenericSignature sig1, sig2;
 
   auto func1 = dyn_cast<FuncDecl>(decl1);
   auto func2 = dyn_cast<FuncDecl>(decl2);
   if (func1 && func2) {
-    gp1 = func1->getGenericParams();
-    gp2 = func2->getGenericParams();
+    bothGeneric = func1->isGeneric() && func2->isGeneric();
+
+    sig1 = func1->getGenericSignature();
+    sig2 = func2->getGenericSignature();
   }
 
   auto subscript1 = dyn_cast<SubscriptDecl>(decl1);
   auto subscript2 = dyn_cast<SubscriptDecl>(decl2);
   if (subscript1 && subscript2) {
-    gp1 = subscript1->getGenericParams();
-    gp2 = subscript2->getGenericParams();
+    bothGeneric = subscript1->isGeneric() && subscript2->isGeneric();
+
+    sig1 = subscript1->getGenericSignature();
+    sig2 = subscript2->getGenericSignature();
   }
 
-  if (gp1 && gp2) {
-    auto params1 = gp1->getParams();
-    auto params2 = gp2->getParams();
+  if (bothGeneric) {
+    auto params1 = sig1.getInnermostGenericParams();
+    auto params2 = sig2.getInnermostGenericParams();
 
     if (params1.size() == params2.size()) {
       for (size_t i = 0; i < params1.size(); i++) {
         auto p1 = params1[i];
         auto p2 = params2[i];
 
-        int np1 = static_cast<int>(p1->getConformingProtocols().size());
-        int np2 = static_cast<int>(p2->getConformingProtocols().size());
+        int np1 = static_cast<int>(sig1->getRequiredProtocols(p1).size());
+        int np2 = static_cast<int>(sig2->getRequiredProtocols(p2).size());
         int aDelta = np1 - np2;
 
         if (aDelta)