Skip to content

process: defer termination across lazy PropertyCallback builders #33966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robobun wants to merge 9 commits into from
Closed

process: defer termination across lazy PropertyCallback builders #33966

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
31238c6
process: fully clear exceptions in lazy PropertyCallback builders
robobun Jul 11, 2026
10cae2e
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 11, 2026
bb6ade6
test: trim regression comment to three lines
robobun Jul 11, 2026
5a3f766
test: make stderr diagnostic-only (shown on failure, not asserted empty)
robobun Jul 11, 2026
21df2e1
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 11, 2026
872748f
Switch to DeferTerminationForAWhile; make the regression test determi…
robobun Jul 11, 2026
21e3bb0
Move regression test to worker-terminate-lifetime.test.ts
robobun Jul 11, 2026
4fc5126
[autofix.ci] apply automated fixes
autofix-ci[bot] Jul 11, 2026
b36f4ed
ci: retrigger
robobun Jul 11, 2026
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
61 changes: 37 additions & 24 deletions src/jsc/bindings/BunProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,27 @@ static JSValue constructPlatform(VM& vm, JSObject* processObject)
#endif
}

// LazyPropertyCallback builders run inside getOwnPropertySlot, which performs no
// exception check; tryClearException() won't clear a TerminationException, so
// clear unconditionally (the VM trap re-throws it at the next safepoint).
static void clearLazyPropertyCallbackException(JSC::VM& vm, JSC::TopExceptionScope& scope, JSC::JSGlobalObject* globalObject, JSC::Exception* exception)
{
scope.clearException();
if (!vm.isTerminationException(exception)) {
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
scope.clearException();
}
}

static JSValue constructVersions(VM& vm, JSObject* processObject)
{
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
auto* globalObject = processObject->globalObject();
JSC::JSObject* object = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 24);
RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]] {
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}

object->putDirect(vm, JSC::Identifier::fromString(vm, "node"_s), JSC::jsOwnedString(vm, makeAtomString(ASCIILiteral::fromLiteralUnsafe(REPORTED_NODEJS_VERSION))));
object->putDirect(vm, JSC::Identifier::fromString(vm, "bun"_s), JSC::jsOwnedString(vm, String(ASCIILiteral::fromLiteralUnsafe(Bun__version)).substring(1)));
Expand Down Expand Up @@ -275,7 +290,8 @@ static JSValue constructProcessReleaseObject(VM& vm, JSObject* processObject)
release->putDirect(vm, Identifier::fromString(vm, "sourceUrl"_s), jsOwnedString(vm, WTF::String(std::span { Bun__githubURL, strlen(Bun__githubURL) })), 0);
release->putDirect(vm, Identifier::fromString(vm, "headersUrl"_s), jsOwnedString(vm, String("https://nodejs.org/download/release/v" REPORTED_NODEJS_VERSION "/node-v" REPORTED_NODEJS_VERSION "-headers.tar.gz"_s)), 0);

RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]]
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return release;
}

Expand Down Expand Up @@ -2513,7 +2529,8 @@ static JSValue constructProcessReportObject(VM& vm, JSObject* processObject)
report->putDirect(vm, JSC::Identifier::fromString(vm, "excludeEnv"_s), JSC::jsBoolean(false), 0);
report->putDirect(vm, JSC::Identifier::fromString(vm, "excludeEnv"_s), JSC::jsString(vm, String("SIGUSR2"_s)), 0);
report->putDirect(vm, JSC::Identifier::fromString(vm, "writeReport"_s), JSC::JSFunction::create(vm, globalObject, 1, String("writeReport"_s), Process_functionWriteReport, ImplementationVisibility::Public), 0);
RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]]
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return report;
}

Expand Down Expand Up @@ -2550,8 +2567,7 @@ static JSValue constructProcessConfigObject(VM& vm, JSObject* processObject)
JSC::JSObject* variables = JSC::constructEmptyObject(globalObject, globalObject->objectPrototype(), 2);
JSC::JSArray* shareableBuiltins = JSC::constructEmptyArray(globalObject, nullptr);
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
variables->putDirect(vm, JSC::Identifier::fromString(vm, "v8_enable_i8n_support"_s), JSC::jsNumber(1), 0);
Expand Down Expand Up @@ -2647,7 +2663,8 @@ static JSValue constructProcessConfigObject(VM& vm, JSObject* processObject)
#endif

config->freeze(vm);
RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]]
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return config;
}

Expand Down Expand Up @@ -2687,8 +2704,7 @@ static JSValue constructStdioWriteStream(JSC::JSGlobalObject* globalObject, JSC:

auto result = JSC::profiledCall(globalObject, ProfilingReason::API, getStdioWriteStream, callData, globalObject->globalThis(), args);
if (auto* exception = scope.exception()) {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return jsUndefined();
}

Expand Down Expand Up @@ -2748,8 +2764,7 @@ static JSValue constructStdin(VM& vm, JSObject* processObject)

auto result = JSC::profiledCall(globalObject, ProfilingReason::API, getStdinStream, callData, globalObject, args);
if (auto* exception = scope.exception()) {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return jsUndefined();
}
return result;
Expand Down Expand Up @@ -2813,8 +2828,7 @@ static JSValue constructProcessChannel(VM& vm, JSObject* processObject)

auto result = JSC::profiledCall(globalObject, ProfilingReason::API, getControl, callData, globalObject->globalThis(), args);
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return jsUndefined();
}
return result;
Expand Down Expand Up @@ -3015,8 +3029,7 @@ static JSValue constructEnv(VM& vm, JSObject* processObject)
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
JSValue env = globalObject->processEnvObject();
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
return env;
Expand Down Expand Up @@ -3884,8 +3897,7 @@ static JSValue Process_stubEmptyArray(VM& vm, JSObject* processObject)
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
JSC::JSArray* array = JSC::constructEmptyArray(processObject->globalObject(), nullptr);
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(processObject->globalObject(), exception);
clearLazyPropertyCallbackException(vm, scope, processObject->globalObject(), exception);
return JSC::jsUndefined();
}
return array;
Expand All @@ -3896,7 +3908,10 @@ static JSValue Process_stubEmptySet(VM& vm, JSObject* processObject)
auto* globalObject = processObject->globalObject();
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
JSSet* result = JSSet::create(vm, globalObject->setStructure());
RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]] {
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
return result;
}

Expand Down Expand Up @@ -4022,15 +4037,13 @@ static JSValue constructMainModuleProperty(VM& vm, JSObject* processObject)
auto& builtinNames = Bun::builtinNames(vm);
JSValue mainValue = bun->get(globalObject, builtinNames.mainPublicName());
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
auto* requireMap = globalObject->requireMap();
JSValue mainModule = requireMap->get(globalObject, mainValue);
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
return mainModule;
Expand Down Expand Up @@ -4059,8 +4072,7 @@ JSValue Process::constructNextTickFn(JSC::VM& vm, Zig::GlobalObject* globalObjec
auto scope = DECLARE_TOP_EXCEPTION_SCOPE(vm);
JSValue nextTickFunction = JSC::profiledCall(globalObject, ProfilingReason::API, initializer, JSC::getCallData(initializer), globalObject->globalThis(), args);
if (auto* exception = scope.exception()) [[unlikely]] {
(void)scope.tryClearException();
Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception);
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return JSC::jsUndefined();
}
if (nextTickFunction && nextTickFunction.isObject()) {
Expand Down Expand Up @@ -4124,7 +4136,8 @@ static JSValue constructFeatures(VM& vm, JSObject* processObject)
object->putDirect(vm, Identifier::fromString(vm, "require_module"_s), jsBoolean(true));
object->putDirect(vm, Identifier::fromString(vm, "typescript"_s), jsString(vm, String("transform"_s)));

RETURN_IF_EXCEPTION(scope, {});
if (auto* exception = scope.exception()) [[unlikely]]
clearLazyPropertyCallbackException(vm, scope, globalObject, exception);
return object;
}

Expand Down
41 changes: 40 additions & 1 deletion test/js/node/worker_threads/worker_threads.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { bunEnv, bunExe, tmpdirSync } from "harness";
import { bunEnv, bunExe, isASAN, isDebug, tmpdirSync } from "harness";
import { once } from "node:events";
import fs from "node:fs";
import { join, relative, resolve } from "node:path";
Expand Down Expand Up @@ -1305,6 +1305,45 @@ test("close(cb) interleaves with other close listeners in registration order", a
expect(order2).toEqual(["B", "C"]);
});

// Amplified test-worker-message-port-transfer-terminate.js: terminate() during the
// worker_threads preload reifies lazy process.stdout/stdin inside getOwnPropertySlot,
// which asserts (debug only) if the builder returns with a termination pending.
test.skipIf(!isASAN && !isDebug)(
"terminate() during worker bootstrap doesn't trip getOwnPropertySlot assert",
async () => {
await using proc = Bun.spawn({
cmd: [
bunExe(),
"-e",
`const { Worker } = require("worker_threads");
const N = 60;
let done = 0;
for (let i = 0; i < N; ++i) {
const w = new Worker("require('worker_threads').parentPort.on('message', () => {})", { eval: true });
setImmediate(() => {
w.terminate().then(() => { if (++done === N) console.log("ok"); });
});
}`,
],
env: bunEnv,
stderr: "pipe",
});
const [stdout, stderr, exitCode] = await Promise.all([proc.stdout.text(), proc.stderr.text(), proc.exited]);
// stderr is diagnostic-only (ASAN/debug can emit benign warnings on success).
expect({
stdout: stdout.trim(),
stderr: exitCode === 0 ? "" : stderr,
exitCode,
signalCode: proc.signalCode,
}).toEqual({
stdout: "ok",
stderr: "",
exitCode: 0,
signalCode: null,
});
},
);

test("getHeapStatistics settles when terminated mid-request", async () => {
const w = new Worker("setInterval(() => {}, 1e6)", { eval: true });
await once(w, "online");
Expand Down
Loading