Untangle the dependency on swiftStdlibStubs from swiftRuntime that I introduced

rdar://35525730

Author: aschwaighofer

include/swift/Runtime/Debug.h

@@ -18,6 +18,8 @@
 #define _SWIFT_RUNTIME_DEBUG_HELPERS_
 
 #include <llvm/Support/Compiler.h>
+#include <cstdarg>
+#include <cstdio>
 #include <stdint.h>
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Unreachable.h"
@@ -222,6 +224,39 @@ void _swift_reportToDebugger(uintptr_t flags, const char *message,
 SWIFT_RUNTIME_STDLIB_SPI
 bool _swift_reportFatalErrorsToDebugger;
 
+LLVM_ATTRIBUTE_ALWAYS_INLINE
+inline static int swift_asprintf(char **strp, const char *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+#if defined(_WIN32)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
+  int len = _vscprintf(fmt, args);
+#pragma GCC diagnostic pop
+  if (len < 0) {
+    va_end(args);
+    return -1;
+  }
+  char *buffer = static_cast<char *>(malloc(len + 1));
+  if (!buffer) {
+    va_end(args);
+    return -1;
+  }
+  int result = vsprintf(buffer, fmt, args);
+  if (result < 0) {
+    va_end(args);
+    free(buffer);
+    return -1;
+  }
+  *strp = buffer;
+#else
+  int result = vasprintf(strp, fmt, args);
+#endif
+  va_end(args);
+  return result;
+}
+
+
 // namespace swift
 }
 

stdlib/public/runtime/SwiftObject.mm

@@ -1391,12 +1391,22 @@ static bool usesNativeSwiftReferenceCounting_nonNull(
                                                   int32_t line) {
   bool isEscaping =
       object != nullptr && !object->refCounts.isUniquelyReferenced();
+
+  // Print a message if the closure escaped.
   if (isEscaping) {
-    auto *fatalErr = reinterpret_cast<const unsigned char *>("Fatal error");
-    auto *message = reinterpret_cast<const unsigned char *>(
-        "closure argument was escaped in withoutActuallyEscaping block");
-    _swift_stdlib_reportFatalErrorInFile(fatalErr, 11, message, 62, filename,
-                                         filenameLength, line, 0 /* flags */);
+    auto *message = "Fatal error: closure argument was escaped in "
+                              "withoutActuallyEscaping block";
+    auto messageLength = strlen(message);
+
+    if (_swift_reportFatalErrorsToDebugger)
+      _swift_reportToDebugger(RuntimeErrorFlagFatal, message);
+
+    char *log;
+    swift_asprintf(&log, "%.*s: file %.*s, line %" PRIu32 "\n", messageLength,
+                   message, filenameLength, filename, line);
+
+    swift_reportError(RuntimeErrorFlagFatal, log);
+    free(log);
   }
   return isEscaping;
 }

stdlib/public/stubs/Assert.cpp

@@ -23,37 +23,6 @@ using namespace swift;
 
 bool swift::_swift_reportFatalErrorsToDebugger = true;
 
-static int swift_asprintf(char **strp, const char *fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-#if defined(_WIN32)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-  int len = _vscprintf(fmt, args);
-#pragma GCC diagnostic pop
-  if (len < 0) {
-    va_end(args);
-    return -1;
-  }
-  char *buffer = static_cast<char *>(malloc(len + 1));
-  if (!buffer) {
-    va_end(args);
-    return -1;
-  }
-  int result = vsprintf(buffer, fmt, args);
-  if (result < 0) {
-    va_end(args);
-    free(buffer);
-    return -1;
-  }
-  *strp = buffer;
-#else
-  int result = vasprintf(strp, fmt, args);
-#endif
-  va_end(args);
-  return result;
-}
-
 static void logPrefixAndMessageToDebugger(
     const unsigned char *prefix, int prefixLength,
     const unsigned char *message, int messageLength