ClangImporter: Missed a few more places where they check for requirements

Author: slavapestov

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -383,10 +383,16 @@ class DeclAndTypePrinter::Implementation
           printMembers(SD->getMembers());
           for (const auto *ed :
                owningPrinter.interopContext.getExtensionsForNominalType(SD)) {
-            auto sign = ed->getGenericSignature();
-            // FIXME: support requirements.
-            if (!sign.getRequirements().empty())
-              continue;
+            SmallVector<Requirement, 2> reqs;
+            SmallVector<InverseRequirement, 2> inverseReqs;
+            if (auto sig = ed->getGenericSignature()) {
+              sig->getRequirementsWithInverses(reqs, inverseReqs);
+              assert(inverseReqs.empty() &&
+                     "Non-copyable generics not supported here!");
+              // FIXME: support requirements.
+              if (!reqs.empty())
+                continue;
+            }
             printMembers(ed->getMembers());
           }
         },

lib/PrintAsClang/PrintClangFunction.cpp

@@ -700,9 +700,14 @@ ClangRepresentation DeclAndTypeClangFunctionPrinter::printFunctionSignature(
   }
   if (FD->isGeneric()) {
     auto Signature = FD->getGenericSignature().getCanonicalSignature();
-    auto Requirements = Signature.getRequirements();
+
     // FIXME: Support generic requirements.
-    if (!Requirements.empty())
+    SmallVector<Requirement, 2> reqs;
+    SmallVector<InverseRequirement, 2> inverseReqs;
+    Signature->getRequirementsWithInverses(reqs, inverseReqs);
+    assert(inverseReqs.empty() && "Non-copyable generics not supported here!");
+
+    if (!reqs.empty())
       return ClangRepresentation::unsupported;
     // Print the template and requires clauses for this function.
     if (kind == FunctionSignatureKind::CxxInlineThunk)