From 048c6a68a6c9db6d0e1c3bced5b886dff9884c61 Mon Sep 17 00:00:00 2001 From: Jay Petacat Date: Wed, 27 Sep 2023 17:30:04 -0600 Subject: [PATCH] Tweak `windows.UNWIND_HISTORY_TABLE` for `mem.zeroes` compatibility `mem.zeroes` was not compatible with the structure because it contained non-nullable pointers. Those pointers have been made nullable. --- lib/std/debug.zig | 2 +- lib/std/os/windows.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/std/debug.zig b/lib/std/debug.zig index 38a46317116f..62e3810992ac 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -764,7 +764,7 @@ pub noinline fn walkStackWindows(addresses: []usize, existing_context: ?*const w var i: usize = 0; var image_base: usize = undefined; - var history_table: windows.UNWIND_HISTORY_TABLE = std.mem.zeroes(windows.UNWIND_HISTORY_TABLE); + var history_table = std.mem.zeroes(windows.UNWIND_HISTORY_TABLE); while (i < addresses.len) : (i += 1) { const current_regs = context.getRegs(); diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index d40fee8db241..dad87f941a06 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -4104,7 +4104,7 @@ pub const EXCEPTION_ROUTINE = *const fn ( pub const UNWIND_HISTORY_TABLE_SIZE = 12; pub const UNWIND_HISTORY_TABLE_ENTRY = extern struct { ImageBase: ULONG64, - FunctionEntry: *Self.RUNTIME_FUNCTION, + FunctionEntry: ?*Self.RUNTIME_FUNCTION, }; pub const UNWIND_HISTORY_TABLE = extern struct {