| author |  Linus Groh <mail@linusgroh.de> 2024-10-07 01:33:42+09:00 |
| committer | Linus Groh <mail@linusgroh.de> 2024-10-07 02:40:01+09:00 |
| log | f18c71ba73a48b5bf6b5596166114c514a25e026 |
| tree | a12774c2c360fefa0b1326a2b50826a340ffb26d |
| parent | 148b5b4c7806a694084f1e6f9514b0333cb75c6a |
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.1 files changed, 2 insertions(+), 2 deletions(-)
lib- std
lib/std/debug.zig+2-2
| ... | ... | @@ -488,7 +488,7 @@ pub fn defaultPanic( |
| 488 | 488 | |
| 489 | 489 | var utf16_buffer: [1000]u16 = undefined; |
| 490 | 490 | const len_minus_3 = std.unicode.utf8ToUtf16Le(&utf16_buffer, msg) catch 0; |
| 491 | utf16_buffer[len_minus_3][0..3].* = .{ '\r', '\n', 0 }; | |
| 491 | utf16_buffer[len_minus_3..][0..3].* = .{ '\r', '\n', 0 }; | |
| 492 | 492 | const len = len_minus_3 + 3; |
| 493 | 493 | const exit_msg = utf16_buffer[0 .. len - 1 :0]; |
| 494 | 494 | |
| ... | ... | @@ -507,7 +507,7 @@ pub fn defaultPanic( |
| 507 | 507 | // ExitData buffer must be allocated using boot_services.allocatePool (spec: page 220) |
| 508 | 508 | const exit_data: []u16 = uefi.raw_pool_allocator.alloc(u16, exit_msg.len + 1) catch @trap(); |
| 509 | 509 | @memcpy(exit_data, exit_msg[0..exit_data.len]); // Includes null terminator. |
| 510 | _ = bs.exit(uefi.handle, .Aborted, exit_msg.len + 1, exit_data); | |
| 510 | _ = bs.exit(uefi.handle, .Aborted, exit_data.len, exit_data.ptr); | |
| 511 | 511 | } |
| 512 | 512 | @trap(); |
| 513 | 513 | }, |