From 4f7d76f19ca2fcb18b47f0d07c3dc1ceaab0b6f2 Mon Sep 17 00:00:00 2001 From: Timon Kruiper Date: Sat, 23 Jan 2021 16:42:34 +0100 Subject: [PATCH] fix windows bug in Progress.zig This bug caused the compiler to deadlock when multiple c objects were build in parallel. Thanks @kprotty for finding this bug! --- lib/std/Progress.zig | 6 +++++- lib/std/os/windows/kernel32.zig | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/std/Progress.zig b/lib/std/Progress.zig index b75ad106a43521459b9263f1b4d9368dfa05244c..4f278e67f6a238903873a13186f7ce1d53e82ace 100644 --- a/lib/std/Progress.zig +++ b/lib/std/Progress.zig @@ -103,7 +103,11 @@ pub const Node = struct { } parent.completeOne(); } else { - self.context.done = true; + { + const held = self.context.update_lock.acquire(); + defer held.release(); + self.context.done = true; + } self.context.refresh(); } } diff --git a/lib/std/os/windows/kernel32.zig b/lib/std/os/windows/kernel32.zig index ec4a75afa9a0b2f570df2fafab7c0e8954f136f5..734059a08ace2dbee6a3d9a0ed40f7aa524838f5 100644 --- a/lib/std/os/windows/kernel32.zig +++ b/lib/std/os/windows/kernel32.zig @@ -299,6 +299,6 @@ pub extern "kernel32" fn SleepConditionVariableSRW( f: ULONG, ) callconv(WINAPI) BOOL; -pub extern "kernel32" fn TryAcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) BOOL; +pub extern "kernel32" fn TryAcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) BOOLEAN; pub extern "kernel32" fn AcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) void; pub extern "kernel32" fn ReleaseSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) void; -- 2.54.0