AST: PrettyStackTraceConformance doesn't need to take the ASTContext

Author: slavapestov

include/swift/AST/PrettyStackTrace.h

@@ -167,13 +167,12 @@ class PrettyStackTraceTypeRepr : public llvm::PrettyStackTraceEntry {
 /// PrettyStackTraceConformance - Observe that we are processing a
 /// specific protocol conformance.
 class PrettyStackTraceConformance : public llvm::PrettyStackTraceEntry {
-  const ASTContext &Context;
   const ProtocolConformance *Conformance;
   const char *Action;
 public:
-  PrettyStackTraceConformance(const ASTContext &C, const char *action,
+  PrettyStackTraceConformance(const char *action,
                               const ProtocolConformance *conformance)
-    : Context(C), Conformance(conformance), Action(action) {}
+    : Conformance(conformance), Action(action) {}
   virtual void print(llvm::raw_ostream &OS) const override;
 };
 

lib/AST/PrettyStackTrace.cpp

@@ -232,6 +232,7 @@ void PrettyStackTraceTypeRepr::print(llvm::raw_ostream &out) const {
 
 void PrettyStackTraceConformance::print(llvm::raw_ostream &out) const {
   out << "While " << Action << ' ';
+  auto &Context = Conformance->getDeclContext()->getASTContext();
   printConformanceDescription(out, Conformance, Context);
 }
 

lib/ClangImporter/ImportDecl.cpp

@@ -8539,8 +8539,7 @@ void ClangImporter::Implementation::finishNormalConformance(
   (void)unused;
 
   auto *proto = conformance->getProtocol();
-  PrettyStackTraceConformance trace(SwiftContext, "completing import of",
-                                    conformance);
+  PrettyStackTraceConformance trace("completing import of", conformance);
 
   finishTypeWitnesses(conformance);
   conformance->finishSignatureConformances();

lib/IRGen/GenProto.cpp

@@ -2147,7 +2147,7 @@ void IRGenModule::emitSILWitnessTable(SILWitnessTable *wt) {
   IRGen.ensureRelativeSymbolCollocation(*wt);
 
   auto conf = wt->getConformance();
-  PrettyStackTraceConformance _st(Context, "emitting witness table for", conf);
+  PrettyStackTraceConformance _st("emitting witness table for", conf);
 
   unsigned tableSize = 0;
   llvm::GlobalVariable *global = nullptr;

lib/SILGen/SILGenType.cpp

@@ -498,8 +498,7 @@ class SILGenConformance : public SILGenWitnessTable<SILGenConformance> {
     if (!Conformance)
       return nullptr;
 
-    PrettyStackTraceConformance trace(SGM.getASTContext(),
-                                      "generating SIL witness table",
+    PrettyStackTraceConformance trace("generating SIL witness table",
                                       Conformance);
 
     auto *proto = Conformance->getProtocol();
@@ -886,8 +885,7 @@ class SILGenSelfConformanceWitnessTable
   }
 
   void emit() {
-    PrettyStackTraceConformance trace(SGM.getASTContext(),
-                                      "generating SIL witness table",
+    PrettyStackTraceConformance trace("generating SIL witness table",
                                       conformance);
 
     // Add entries for all the requirements.

lib/Sema/TypeCheckProtocol.cpp

@@ -1813,8 +1813,7 @@ static void diagnoseConformanceImpliedByConditionalConformance(
 ProtocolConformance *MultiConformanceChecker::
 checkIndividualConformance(NormalProtocolConformance *conformance,
                            bool issueFixit) {
-  PrettyStackTraceConformance trace(getASTContext(), "type-checking",
-                                    conformance);
+  PrettyStackTraceConformance trace("type-checking", conformance);
 
   std::vector<MissingWitness> revivedMissingWitnesses;
   switch (conformance->getState()) {

lib/Serialization/Deserialization.cpp

@@ -6209,8 +6209,7 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
   using namespace decls_block;
 
   PrettyStackTraceModuleFile traceModule("While reading from", *this);
-  PrettyStackTraceConformance trace(getAssociatedModule()->getASTContext(),
-                                    "finishing conformance for",
+  PrettyStackTraceConformance trace("finishing conformance for",
                                     conformance);
   ++NumNormalProtocolConformancesCompleted;
 

lib/Serialization/DeserializeSIL.cpp

@@ -3437,8 +3437,7 @@ llvm::Expected<SILWitnessTable *>
   auto theConformance = cast<RootProtocolConformance>(
                           maybeConformance.get().getConcrete());
 
-  PrettyStackTraceConformance trace(SILMod.getASTContext(),
-                                    "deserializing SIL witness table for",
+  PrettyStackTraceConformance trace("deserializing SIL witness table for",
                                     theConformance);
 
   if (!existingWt)