Skip to content
Closed

ai slop #28154

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/allocators/MimallocArena.zig
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,14 @@ pub fn deinit(self: *Self) void {
self.* = undefined;
}

/// Use a non-zero heap tag so that mimalloc's _mi_heap_by_tag routes
/// reclaimed pages from dead threads to the backing heap (tag 0) instead
/// of to this arena. Without this, mi_heap_destroy frees those reclaimed
/// pages and their live blocks, corrupting the malloc free-list.
const arena_heap_tag = 111;

pub fn init() Self {
const mimalloc_heap = mimalloc.mi_heap_new() orelse bun.outOfMemory();
const mimalloc_heap = mimalloc.mi_heap_new_ex(arena_heap_tag, true, null) orelse bun.outOfMemory();
if (comptime !safety_checks) return .{ .#heap = mimalloc_heap };
const heap: Owned(*DebugHeap) = .new(.{
.inner = mimalloc_heap,
Expand Down
69 changes: 69 additions & 0 deletions test/regression/issue/28153.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { expect, test } from "bun:test";
import { bunEnv, bunExe, tempDir } from "harness";

// Regression test for https://github.com/oven-sh/bun/issues/28153
// MimallocArena used heap tag 0 (same as the backing heap). When worker
// threads exit, mimalloc routes their abandoned pages to the arena
// instead of the backing heap. mi_heap_destroy then frees live blocks
// from those reclaimed pages, corrupting the malloc free-list.
// The fix uses mi_heap_new_ex with a non-zero tag so abandoned pages
// are routed to the backing heap where they belong.
test("worker threads exiting with concurrent transpiler use does not corrupt heap", async () => {
using dir = tempDir("issue-28153", {
"worker.ts": `
const buffers: Uint8Array[] = [];
for (let i = 0; i < 50; i++) {
buffers.push(new Uint8Array(4096).fill(i & 0xff));
}
postMessage("done");
`,
"index.ts": `
const transpiler = new Bun.Transpiler({ loader: "tsx" });

async function spawnWorker(): Promise<void> {
return new Promise((resolve, reject) => {
const w = new Worker("./worker.ts");
w.onmessage = () => { w.terminate(); resolve(); };
w.onerror = (e) => reject(e);
});
}

// Spawn a few workers sequentially, transpiling between each
for (let i = 0; i < 4; i++) {
await spawnWorker();
transpiler.transformSync("const x" + i + ": number = " + i + ";");
}

// Allocate after workers exited and arenas were destroyed
const results: Uint8Array[] = [];
for (let i = 0; i < 100; i++) {
const buf = new Uint8Array(4096);
buf.fill(0x42);
results.push(buf);
}

let ok = true;
for (const buf of results) {
for (let j = 0; j < buf.length; j++) {
if (buf[j] !== 0x42) { ok = false; break; }
}
if (!ok) break;
}

console.log(ok ? "PASS" : "FAIL");
process.exit(ok ? 0 : 1);
`,
});

await using proc = Bun.spawn({
cmd: [bunExe(), "index.ts"],
env: bunEnv,
cwd: String(dir),
stderr: "pipe",
});

const [stdout, stderr, exitCode] = await Promise.all([proc.stdout.text(), proc.stderr.text(), proc.exited]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

expect(stdout.trim()).toBe("PASS");
expect(exitCode).toBe(0);
Comment thread
robobun marked this conversation as resolved.
});
Loading