Skip to content

Commit 0b9747e

Browse files
committed
[Backtracing] Also update the Linux crash handler, now it's merged.
The Linux crash handler should have the same `output-to` behaviour as on macOS. rdar://110371557
1 parent 210ca2a commit 0b9747e

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

stdlib/public/runtime/CrashHandlerLinux.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,8 @@ const char *backtracer_argv[] = {
617617
"preset", // 26
618618
"--cache", // 27
619619
"true", // 28
620+
"--output-to", // 29
621+
"stdout", // 30
620622
NULL
621623
};
622624

@@ -769,6 +771,16 @@ run_backtracer(int memserver_fd)
769771
break;
770772
}
771773

774+
switch (_swift_backtraceSettings.outputTo) {
775+
case OutputTo::Stdout:
776+
backtracer_argv[30] = "stdout";
777+
break;
778+
case OutputTo::Auto: // Shouldn't happen, but if it does pick stderr
779+
case OutputTo::Stderr:
780+
backtracer_argv[30] = "stderr";
781+
break;
782+
}
783+
772784
backtracer_argv[28] = trueOrFalse(_swift_backtraceSettings.cache);
773785

774786
format_unsigned(_swift_backtraceSettings.timeout, timeout_buf);

0 commit comments

Comments
 (0)