authorgravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-07-01 21:23:45+02:00
committergravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-07-01 21:23:45+02:00
loga1b583dc24cde495656b288de979714dfc15c4a2
treebd417cf66fcf6ce70b76d59a7d7629e6ef4bd44a
parent13c0624f23bbf63b31ae9b8f06aa2e32c1616e94
signaturebadge-check Signed by SSH key SHA256:CQ99aPxq+RueiL9u7z0FEki5Fm7V6T8q4PrEGmINrA4

std: make panic and abort for amdhsa call trap

2 files changed, 2 insertions(+), 2 deletions(-)

lib/std/builtin.zig+1-1
...@@ -806,7 +806,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr...@@ -806,7 +806,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr
806 // Didn't have boot_services, just fallback to whatever.806 // Didn't have boot_services, just fallback to whatever.
807 std.os.abort();807 std.os.abort();
808 },808 },
809 .cuda => std.os.abort(),809 .cuda, .amdhsa => std.os.abort(),
810 else => {810 else => {
811 const first_trace_addr = ret_addr orelse @returnAddress();811 const first_trace_addr = ret_addr orelse @returnAddress();
812 std.debug.panicImpl(error_return_trace, first_trace_addr, msg);812 std.debug.panicImpl(error_return_trace, first_trace_addr, msg);
lib/std/os.zig+1-1
...@@ -613,7 +613,7 @@ pub fn abort() noreturn {...@@ -613,7 +613,7 @@ pub fn abort() noreturn {
613 exit(127); // Pid 1 might not be signalled in some containers.613 exit(127); // Pid 1 might not be signalled in some containers.
614 }614 }
615 switch (builtin.os.tag) {615 switch (builtin.os.tag) {
616 .uefi, .wasi, .cuda => @trap(),616 .uefi, .wasi, .cuda, .amdhsa => @trap(),
617 else => system.abort(),617 else => system.abort(),
618 }618 }
619}619}