Print a pass number of the current SIL pass when a compiler crashes

It makes it easier to perform a bisection and finding out the reason of the crash.

Author: swiftix

Diff for: include/swift/SILOptimizer/PassManager/PrettyStackTrace.h

@@ -23,17 +23,23 @@ class SILModuleTransform;
 class PrettyStackTraceSILFunctionTransform
     : public llvm::PrettyStackTraceEntry {
   SILFunctionTransform *SFT;
+  unsigned PassNumber;
 
 public:
-  PrettyStackTraceSILFunctionTransform(SILFunctionTransform *SFT) : SFT(SFT) {}
+  PrettyStackTraceSILFunctionTransform(SILFunctionTransform *SFT,
+                                       unsigned PassNumber)
+      : SFT(SFT), PassNumber(PassNumber) {}
   virtual void print(llvm::raw_ostream &OS) const;
 };
 
 class PrettyStackTraceSILModuleTransform : public llvm::PrettyStackTraceEntry {
   SILModuleTransform *SMT;
+  unsigned PassNumber;
 
 public:
-  PrettyStackTraceSILModuleTransform(SILModuleTransform *SMT) : SMT(SMT) {}
+  PrettyStackTraceSILModuleTransform(SILModuleTransform *SMT,
+                                     unsigned PassNumber)
+      : SMT(SMT), PassNumber(PassNumber) {}
   virtual void print(llvm::raw_ostream &OS) const;
 };
 

Diff for: lib/SILOptimizer/PassManager/PassManager.cpp

@@ -216,7 +216,7 @@ void SILPassManager::runPassesOnFunction(PassList FuncTransforms,
   assert(analysesUnlocked() && "Expected all analyses to be unlocked!");
 
   for (auto SFT : FuncTransforms) {
-    PrettyStackTraceSILFunctionTransform X(SFT);
+    PrettyStackTraceSILFunctionTransform X(SFT, NumPassesRun);
     SFT->injectPassManager(this);
     SFT->injectFunction(F);
 
@@ -409,7 +409,7 @@ void SILPassManager::runModulePass(SILModuleTransform *SMT) {
 
   const SILOptions &Options = getOptions();
 
-  PrettyStackTraceSILModuleTransform X(SMT);
+  PrettyStackTraceSILModuleTransform X(SMT, NumPassesRun);
 
   SMT->injectPassManager(this);
   SMT->injectModule(Mod);

Diff for: lib/SILOptimizer/PassManager/PrettyStackTrace.cpp

@@ -18,7 +18,8 @@
 using namespace swift;
 
 void PrettyStackTraceSILFunctionTransform::print(llvm::raw_ostream &out) const {
-  out << "While running SILFunctionTransform \"" << SFT->getName()
+  out << "While running pass #" << PassNumber
+      << " SILFunctionTransform \"" << SFT->getName()
       << "\" on SILFunction ";
   if (!SFT->getFunction()) {
     out << " <<null>>";
@@ -30,5 +31,6 @@ void PrettyStackTraceSILFunctionTransform::print(llvm::raw_ostream &out) const {
 }
 
 void PrettyStackTraceSILModuleTransform::print(llvm::raw_ostream &out) const {
-  out << "While running SILModuleTransform \"" << SMT->getName() << "\".\n";
+  out << "While running pass #" << PassNumber
+      << " SILModuleTransform \"" << SMT->getName() << "\".\n";
 }