Revert "[Basic] Handle multiline strings in abortWithPrettyStackTraceMessage"

This reverts commit d46aec9.

Author: hamishknight

include/swift/Basic/PrettyStackTrace.h

@@ -51,15 +51,13 @@ class PrettyStackTraceSwiftVersion : public llvm::PrettyStackTraceEntry {
 };
 
 /// Aborts the program, printing a given message to a PrettyStackTrace frame
-/// before exiting. This should be preferred over manually logging to stderr and
-/// aborting since that won't be picked up by the crash reporter.
+/// before exiting.
 [[noreturn]]
 void abortWithPrettyStackTraceMessage(
     llvm::function_ref<void(llvm::raw_ostream &)> message);
 
 /// Aborts the program, printing a given message to a PrettyStackTrace frame
-/// before exiting. This should be preferred over manually logging to stderr and
-/// aborting since that won't be picked up by the crash reporter.
+/// before exiting.
 [[noreturn]]
 void abortWithPrettyStackTraceMessage(llvm::StringRef message);
 

lib/Basic/PrettyStackTrace.cpp

@@ -40,38 +40,17 @@ void PrettyStackTraceSwiftVersion::print(llvm::raw_ostream &out) const {
   out << version::getSwiftFullVersion() << '\n';
 }
 
-namespace {
-/// Similar to PrettyStackTraceString, but formats multi-line strings for
-/// the stack trace.
-class PrettyStackTraceMultilineString : public llvm::PrettyStackTraceEntry {
-  StringRef Str;
-
-public:
-  PrettyStackTraceMultilineString(StringRef str) : Str(str) {}
-  void print(raw_ostream &OS) const override {
-    // For each line, add a leading character and indentation to better match
-    // the formatting of the stack trace.
-    for (auto c : Str.rtrim('\n')) {
-      OS << c;
-      if (c == '\n')
-        OS << "| \t";
-    }
-    OS << '\n';
-  }
-};
-} // end anonymous namespace
-
 void swift::abortWithPrettyStackTraceMessage(
     llvm::function_ref<void(llvm::raw_ostream &)> message) {
   llvm::SmallString<0> errorStr;
   llvm::raw_svector_ostream out(errorStr);
   message(out);
-
-  PrettyStackTraceMultilineString trace(errorStr);
+  llvm::PrettyStackTraceString trace(errorStr.c_str());
   abort();
 }
 
 void swift::abortWithPrettyStackTraceMessage(StringRef message) {
-  PrettyStackTraceMultilineString trace(message);
+  auto messageStr = message.str();
+  llvm::PrettyStackTraceString trace(messageStr.c_str());
   abort();
 }