From e402adaebf4c0ca1f4ba104e72791a3567d2aa86 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Tue, 17 Jun 2025 17:45:18 -0800 Subject: [PATCH] zig: RefCount: fix assertion found by windows app verifier (#20459) Co-authored-by: nektro <5464072+nektro@users.noreply.github.com> --- src/install/PackageInstaller.zig | 3 --- src/install/hoisted_install.zig | 1 - src/install/install.zig | 2 -- src/ptr/ref_count.zig | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/install/PackageInstaller.zig b/src/install/PackageInstaller.zig index 97bba6a1bc..89f610522a 100644 --- a/src/install/PackageInstaller.zig +++ b/src/install/PackageInstaller.zig @@ -21,7 +21,6 @@ const Global = bun.Global; const invalid_package_id = install.invalid_package_id; const strings = bun.strings; const string = bun.string; -const stringZ = bun.stringZ; const FileSystem = bun.fs.FileSystem; const LifecycleScriptSubprocess = install.LifecycleScriptSubprocess; const PackageID = install.PackageID; @@ -30,11 +29,9 @@ const ExtractData = install.ExtractData; const Task = install.Task; const TaskCallbackContext = install.TaskCallbackContext; const PatchTask = install.PatchTask; -const NetworkTask = install.NetworkTask; const Package = Lockfile.Package; const Path = bun.path; const Syscall = bun.sys; -const ThreadPool = bun.ThreadPool; pub const PackageInstaller = struct { manager: *PackageManager, diff --git a/src/install/hoisted_install.zig b/src/install/hoisted_install.zig index 696eb889c3..79cce4ef2e 100644 --- a/src/install/hoisted_install.zig +++ b/src/install/hoisted_install.zig @@ -1,7 +1,6 @@ const std = @import("std"); const bun = @import("bun"); const strings = bun.strings; -const string = bun.string; const FileSystem = bun.fs.FileSystem; const install = bun.install; const PackageManager = install.PackageManager; diff --git a/src/install/install.zig b/src/install/install.zig index 672cb4058b..3766862d54 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -45,11 +45,9 @@ const HeaderBuilder = HTTP.HeaderBuilder; const ExtractTarball = @import("./extract_tarball.zig"); pub const Npm = @import("./npm.zig"); -const Bitset = bun.bit_set.DynamicBitSetUnmanaged; const Syscall = bun.sys; const RunCommand = @import("../cli/run_command.zig").RunCommand; threadlocal var initialized_store = false; -const Futex = @import("../futex.zig"); pub const Lockfile = @import("./lockfile.zig"); pub const TextLockfile = @import("./lockfile/bun.lock.zig"); diff --git a/src/ptr/ref_count.zig b/src/ptr/ref_count.zig index 0fa0d49d48..127dbfe1c9 100644 --- a/src/ptr/ref_count.zig +++ b/src/ptr/ref_count.zig @@ -494,6 +494,7 @@ pub fn DebugData(thread_safe: bool) type { assertValid(debug); debug.magic = undefined; debug.lock.lock(); + defer debug.lock.unlock(); debug.map.clearAndFree(bun.default_allocator); debug.frees.clearAndFree(bun.default_allocator); if (debug.allocation_scope) |scope| {