Skip to content

Commit 53ff023

Browse files
authored
[Runtime] Print fatal errors' messages before pausing in the debugger (swiftlang#18374)
The message is available in the debugger (or in Xcode), but it increases the chances that the user will see it if it's also been logged at the time the debugger takes over.
1 parent a7f3607 commit 53ff023

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

stdlib/public/stubs/Assert.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ void swift::_swift_stdlib_reportFatalErrorInFile(
4646
uint32_t line,
4747
uint32_t flags
4848
) {
49-
logPrefixAndMessageToDebugger(prefix, prefixLength, message, messageLength);
50-
5149
char *log;
5250
swift_asprintf(
5351
&log, "%.*s: %.*s%sfile %.*s, line %" PRIu32 "\n",
@@ -59,15 +57,15 @@ void swift::_swift_stdlib_reportFatalErrorInFile(
5957

6058
swift_reportError(flags, log);
6159
free(log);
60+
61+
logPrefixAndMessageToDebugger(prefix, prefixLength, message, messageLength);
6262
}
6363

6464
void swift::_swift_stdlib_reportFatalError(
6565
const unsigned char *prefix, int prefixLength,
6666
const unsigned char *message, int messageLength,
6767
uint32_t flags
6868
) {
69-
logPrefixAndMessageToDebugger(prefix, prefixLength, message, messageLength);
70-
7169
char *log;
7270
swift_asprintf(
7371
&log, "%.*s: %.*s\n",
@@ -76,6 +74,8 @@ void swift::_swift_stdlib_reportFatalError(
7674

7775
swift_reportError(flags, log);
7876
free(log);
77+
78+
logPrefixAndMessageToDebugger(prefix, prefixLength, message, messageLength);
7979
}
8080

8181
void swift::_swift_stdlib_reportUnimplementedInitializerInFile(

0 commit comments

Comments
 (0)