Update code to print conformances if SILPrintGenericSpecializationInfo is true

Author: aschwaighofer

include/swift/AST/ProtocolConformanceRef.h

@@ -134,6 +134,8 @@ class ProtocolConformanceRef {
   void dump(llvm::raw_ostream &out, unsigned indent = 0,
             bool details = true) const;
 
+  void print(llvm::raw_ostream &out) const;
+
   bool operator==(ProtocolConformanceRef other) const {
     return Union == other.Union;
   }

lib/AST/ASTDumper.cpp

@@ -3330,6 +3330,13 @@ void ProtocolConformanceRef::dump(llvm::raw_ostream &out, unsigned indent,
 
   dumpProtocolConformanceRefRec(*this, out, indent, visited);
 }
+
+void ProtocolConformanceRef::print(llvm::raw_ostream &out) const {
+  llvm::SmallPtrSet<const ProtocolConformance *, 8> visited;
+  dumpProtocolConformanceRefRec(*this, out, 0, visited);
+
+}
+
 void ProtocolConformance::dump() const {
   auto &out = llvm::errs();
   dump(out);

lib/SIL/IR/SILPrinter.cpp

@@ -375,7 +375,7 @@ static void printGenericSpecializationInfo(
     raw_ostream &OS, StringRef Kind, StringRef Name,
     const GenericSpecializationInformation *SpecializationInfo,
     SubstitutionMap Subs = { }) {
-  if (!SpecializationInfo)
+  if (!SpecializationInfo && Subs.empty())
     return;
 
   auto PrintSubstitutions = [&](SubstitutionMap Subs) {
@@ -384,6 +384,11 @@ static void printGenericSpecializationInfo(
                [&](Type type) { OS << type; },
                [&] { OS << ", "; });
     OS << '>';
+    OS << " conformances <";
+    interleave(Subs.getConformances(),
+               [&](ProtocolConformanceRef conf) { conf.print(OS); },
+               [&] { OS << ", ";});
+    OS << '>';
   };
 
   OS << "// Generic specialization information for " << Kind << " " << Name;
@@ -716,7 +721,9 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       Ctx.printInstructionCallBack(&I);
       if (SILPrintGenericSpecializationInfo) {
         if (auto AI = ApplySite::isa(const_cast<SILInstruction *>(&I)))
-          if (AI.getSpecializationInfo() && AI.getCalleeFunction())
+          if ((AI.getSpecializationInfo() ||
+               !AI.getSubstitutionMap().empty()) &&
+              AI.getCalleeFunction())
             printGenericSpecializationInfo(
                 PrintState.OS, "call-site", AI.getCalleeFunction()->getName(),
                 AI.getSpecializationInfo(), AI.getSubstitutionMap());