ast printer

Author: slavapestov

include/swift/AST/PrintOptions.h

@@ -329,6 +329,11 @@ struct PrintOptions {
   /// Whether to print generic requirements in a where clause.
   bool PrintGenericRequirements = true;
 
+  /// Whether to print generic signatures with inverse requirements (ie,
+  /// ~Copyable noting the absence of Copyable) or the internal desugared form
+  /// (where the implicit Copyable conformance is spelled explicitly).
+  bool PrintInverseRequirements = false;
+
   /// Whether to print the internal layout name instead of AnyObject, etc.
   bool PrintInternalLayoutName = false;
 

lib/AST/ASTPrinter.cpp

@@ -943,6 +943,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
     InnermostOnly = 4,
     SwapSelfAndDependentMemberType = 8,
     PrintInherited = 16,
+    PrintInverseRequirements = 32,
   };
 
   void printInheritedFromRequirementSignature(ProtocolDecl *proto,
@@ -1646,9 +1647,16 @@ void PrintAST::printGenericSignature(
     GenericSignature genericSig,
     unsigned flags,
     llvm::function_ref<bool(const Requirement &)> filter) {
+
   SmallVector<Requirement, 2> requirements;
   SmallVector<InverseRequirement, 2> inverses;
-  genericSig->getRequirementsWithInverses(requirements, inverses);
+
+  if (flags & PrintInverseRequirements) {
+    genericSig->getRequirementsWithInverses(requirements, inverses);
+  } else {
+    requirements.append(genericSig.getRequirements().begin(),
+                        genericSig.getRequirements().end());
+  }
 
   if (flags & InnermostOnly) {
     auto genericParams = genericSig.getInnermostGenericParams();
@@ -2627,7 +2635,7 @@ void PrintAST::printDeclGenericRequirements(GenericContext *decl) {
 
   Printer.printStructurePre(PrintStructureKind::DeclGenericParameterClause);
   printGenericSignature(genericSig,
-                        PrintRequirements,
+                        PrintRequirements | PrintInverseRequirements,
                         [parentSig](const Requirement &req) {
                           if (parentSig)
                             return !parentSig->isRequirementSatisfied(req);
@@ -2886,7 +2894,7 @@ void PrintAST::printExtension(ExtensionDecl *decl) {
       assert(baseGenericSig &&
              "an extension can't be generic if the base type isn't");
       printGenericSignature(genericSig,
-                            PrintRequirements,
+                            PrintRequirements | PrintInverseRequirements,
                             [baseGenericSig](const Requirement &req) -> bool {
         // Only include constraints that are not satisfied by the base type.
         return !baseGenericSig->isRequirementSatisfied(req);
@@ -7160,7 +7168,8 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     printFunctionExtInfo(T);
     printGenericSignature(T->getGenericSignature(),
                           PrintAST::PrintParams |
-                          PrintAST::PrintRequirements);
+                          PrintAST::PrintRequirements |
+                          PrintAST::PrintInverseRequirements);
     Printer << " ";
 
    visitAnyFunctionTypeParams(T->getParams(), /*printLabels*/true);
@@ -7239,7 +7248,8 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     if (GenericSignature sig = T->getInvocationGenericSignature()) {
       printGenericSignature(sig,
                             PrintAST::PrintParams |
-                            PrintAST::PrintRequirements);
+                            PrintAST::PrintRequirements |
+                            PrintAST::PrintInverseRequirements);
       Printer << " ";
     }
 
@@ -7264,7 +7274,8 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       sub->Printer << "@substituted ";
       sub->printGenericSignature(sig,
                                  PrintAST::PrintParams |
-                                 PrintAST::PrintRequirements);
+                                 PrintAST::PrintRequirements |
+                                 PrintAST::PrintInverseRequirements);
       sub->Printer << " ";
     }
 
@@ -7375,7 +7386,9 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       [&sub, T]{
         if (auto sig = T->getLayout()->getGenericSignature()) {
           sub.printGenericSignature(sig,
-                          PrintAST::PrintParams | PrintAST::PrintRequirements);
+                          PrintAST::PrintParams |
+                          PrintAST::PrintRequirements |
+                          PrintAST::PrintInverseRequirements);
           sub.Printer << " ";
         }
         sub.Printer << "{";
@@ -7930,8 +7943,10 @@ void GenericSignature::print(ASTPrinter &Printer,
     return;
   }
 
-  PrintAST(Printer, Opts).printGenericSignature(
-      *this, PrintAST::PrintParams | PrintAST::PrintRequirements);
+  auto flags = PrintAST::PrintParams | PrintAST::PrintRequirements;
+  if (Opts.PrintInverseRequirements)
+    flags |=  PrintAST::PrintInverseRequirements;
+  PrintAST(Printer, Opts).printGenericSignature(*this, flags);
 }
 
 void Requirement::print(raw_ostream &os, const PrintOptions &opts) const {
@@ -8131,7 +8146,8 @@ void ProtocolConformance::printName(llvm::raw_ostream &os,
       typePrinter
           .printGenericSignature(genericSig,
                                  PrintAST::PrintParams |
-                                 PrintAST::PrintRequirements);
+                                 PrintAST::PrintRequirements |
+                                 PrintAST::PrintInverseRequirements);
       os << ' ';
     }
   }