Merge pull request #38641 from apple/add-pretty-line

[Frontend] Always output the version being compiled for

Author: bnbarham

lib/FrontendTool/FrontendTool.cpp

@@ -1969,6 +1969,8 @@ class PrettyStackTraceFrontend : public llvm::PrettyStackTraceEntry {
     auto effective = LangOpts.EffectiveLanguageVersion;
     if (effective != version::Version::getCurrentLanguageVersion()) {
       os << "Compiling with effective version " << effective;
+    } else {
+      os << "Compiling with the current language version";
     }
     os << "\n";
   };

test/Frontend/crash.swift

@@ -16,6 +16,10 @@
 // CHECK-ALLOW: Program arguments: {{.*}} -experimental-allow-module-with-compiler-errors
 // CHECK-ALLOW: Compiling with effective version
 
+// RUN: not --crash %target-swift-frontend -typecheck -debug-crash-after-parse -experimental-allow-module-with-compiler-errors -swift-version 5 %s 2>&1 | %FileCheck -check-prefix CHECK-CURRENT %s
+// CHECK-CURRENT: Program arguments: {{.*}} -experimental-allow-module-with-compiler-errors
+// CHECK-CURRENT: Compiling with the current language version
+
 func anchor() {}
 anchor()