diff options
| author | Linus Groh <mail@linusgroh.de> | 2024-10-07 01:33:42 +0900 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2024-10-07 02:40:01 +0900 |
| commit | f18c71ba73a48b5bf6b5596166114c514a25e026 (patch) | |
| tree | a12774c2c360fefa0b1326a2b50826a340ffb26d /lib/std/debug.zig | |
| parent | 148b5b4c7806a694084f1e6f9514b0333cb75c6a (diff) | |
| download | zig-f18c71ba73a48b5bf6b5596166114c514a25e026.tar.gz zig-f18c71ba73a48b5bf6b5596166114c514a25e026.zip | |
std.debug: Fix defaultPanic() uefi build
lib/std/debug.zig:491:38: error: slice of non-array type 'u16'
utf16_buffer[len_minus_3][0..3].* = .{ '\r', '\n', 0 };
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
lib/std/debug.zig:510:70: error: expected type '?*const anyopaque', found '[]u16'
_ = bs.exit(uefi.handle, .Aborted, exit_msg.len + 1, exit_data);
^~~~~~~~~
Regressed in #21520.
Diffstat (limited to 'lib/std/debug.zig')
| -rw-r--r-- | lib/std/debug.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig index ad43caee59..23b005ad49 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -488,7 +488,7 @@ pub fn defaultPanic( var utf16_buffer: [1000]u16 = undefined; const len_minus_3 = std.unicode.utf8ToUtf16Le(&utf16_buffer, msg) catch 0; - utf16_buffer[len_minus_3][0..3].* = .{ '\r', '\n', 0 }; + utf16_buffer[len_minus_3..][0..3].* = .{ '\r', '\n', 0 }; const len = len_minus_3 + 3; const exit_msg = utf16_buffer[0 .. len - 1 :0]; @@ -507,7 +507,7 @@ pub fn defaultPanic( // ExitData buffer must be allocated using boot_services.allocatePool (spec: page 220) const exit_data: []u16 = uefi.raw_pool_allocator.alloc(u16, exit_msg.len + 1) catch @trap(); @memcpy(exit_data, exit_msg[0..exit_data.len]); // Includes null terminator. - _ = bs.exit(uefi.handle, .Aborted, exit_msg.len + 1, exit_data); + _ = bs.exit(uefi.handle, .Aborted, exit_data.len, exit_data.ptr); } @trap(); }, |