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

motiejus · Apr 6, 2023 · 9f95718 · 9f95718
2 parents 271f24f + 8853005
commit 9f95718
Showing 1 changed file with 2 additions and 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,