zig

commit 9f957184a13fd39b74b978a8eb19b4c9eb6afa09 (tree)
parent 271f24f0477ab5d79b803bf895cb75be58571a2e
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu,  6 Apr 2023 13:58:54 -0700

Merge remote-tracking branch 'origin/master' into llvm16

Diffstat:
M
lib/std/process.zig
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/std/process.zig b/lib/std/process.zig
@@ -1164,7 +1164,8 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {
         },
         .windows => {
             var kilobytes: std.os.windows.ULONGLONG = undefined;
-            assert(std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) == std.os.windows.TRUE);
+            if (std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) != std.os.windows.TRUE)
+                return error.UnknownTotalSystemMemory;
             return kilobytes * 1024;
         },
         else => return error.UnknownTotalSystemMemory,