ASTPrinter: Apply inverse transform when printing SIL function type generic signatures

Author: slavapestov

lib/AST/ASTPrinter.cpp

@@ -7327,11 +7327,15 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     printFunctionExtInfo(T);
     printCalleeConvention(T->getCalleeConvention());
 
-    if (auto sig = T->getInvocationGenericSignature()) {
+    if (GenericSignature sig = T->getInvocationGenericSignature()) {
+      SmallVector<InverseRequirement, 2> inverses;
+      reconstituteInverses(sig, sig.getGenericParams(), inverses);
+
       printGenericSignature(sig,
-                            /*inverses=*/{},
+                            inverses,
                             PrintAST::PrintParams |
-                            PrintAST::PrintRequirements);
+                            PrintAST::PrintRequirements |
+                            PrintAST::CollapseDefaultReqs);
       Printer << " ";
     }
 
@@ -7351,11 +7355,16 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       subBuffer.emplace(Printer, subOptions);
       sub = &*subBuffer;
 
+      GenericSignature sig = substitutions.getGenericSignature();
+
+      SmallVector<InverseRequirement, 2> inverses;
+      reconstituteInverses(sig, sig.getGenericParams(), inverses);
+
       sub->Printer << "@substituted ";
-      sub->printGenericSignature(substitutions.getGenericSignature(),
-                                 /*inverses=*/{},
+      sub->printGenericSignature(sig, inverses,
                                  PrintAST::PrintParams |
-                                 PrintAST::PrintRequirements);
+                                 PrintAST::PrintRequirements |
+                                 PrintAST::CollapseDefaultReqs);
       sub->Printer << " ";
     }