Skip to content

bun.ptr.Shared.Lazy fixes cppbind change #22753

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

Merged
taylordotfish merged 10 commits into from
Sep 24, 2025
Merged

bun.ptr.Shared.Lazy fixes cppbind change #22753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5adca95
lazy shared ptr fixes
pfgithub Sep 17, 2025
dd7a524
cppbind output order change
pfgithub Sep 17, 2025
1a551b0
fixes false_is_throw
pfgithub Sep 17, 2025
e81587b
address review
pfgithub Sep 17, 2025
c62d9f9
Update src/ptr/shared.zig
pfgithub Sep 17, 2025
6c07796
Update src/ptr/shared.zig
pfgithub Sep 17, 2025
b6a372f
Update src/ptr/shared.zig
pfgithub Sep 17, 2025
0867822
Update src/ptr/shared.zig
pfgithub Sep 17, 2025
ea4f389
Merge branch 'main' into pfg/changes
pfgithub Sep 18, 2025
cbf92e5
Merge remote-tracking branch 'origin/main' into pfg/changes
pfgithub Sep 22, 2025
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
2 changes: 1 addition & 1 deletion src/bun.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,7 +3768,7 @@ pub const highway = @import("./highway.zig");
pub const mach_port = if (Environment.isMac) std.c.mach_port_t else u32;

/// Automatically generated C++ bindings for functions marked with `[[ZIG_EXPORT(...)]]`
pub const cpp = @import("cpp").bindings;
pub const cpp = @import("cpp");

pub const asan = @import("./asan.zig");

Expand Down
62 changes: 31 additions & 31 deletions src/codegen/cppbind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ function generateZigParameterList(parameters: CppParameter[], globalThisArg?: Cp
function generateZigSourceComment(cfg: Cfg, resultSourceLinks: string[], fn: CppFn): string {
const fileName = relative(cfg.dstDir, fn.position.file);
resultSourceLinks.push(`${fn.name}:${fileName}:${fn.position.start.line}:${fn.position.start.column}`);
return ` /// Source: ${fn.name}`;
return `/// Source: ${fn.name}`;
}

function closest(node: SyntaxNode | null, type: string): SyntaxNode | null {
Expand Down Expand Up @@ -644,7 +644,7 @@ function generateZigFn(
resultBindings.push(generateZigSourceComment(cfg, resultSourceLinks, fn));
if (fn.tag === "nothrow") {
resultBindings.push(
` pub extern fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters)}) ${returnType};`,
`pub extern fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters)}) ${returnType};`,
);
return;
}
Expand All @@ -667,21 +667,21 @@ function generateZigFn(
);
}
resultBindings.push(
` pub inline fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters, globalThisArg)}) bun.JSError!${returnType} {`,
` if (comptime Environment.ci_assert) {`,
` var scope: jsc.CatchScope = undefined;`,
` scope.init(${formatZigName(globalThisArg.name)}, @src());`,
` defer scope.deinit();`,
`pub inline fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters, globalThisArg)}) bun.JSError!${returnType} {`,
` if (comptime Environment.ci_assert) {`,
` var scope: jsc.CatchScope = undefined;`,
` scope.init(${formatZigName(globalThisArg.name)}, @src());`,
` defer scope.deinit();`,
``,
` const result = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` try scope.returnIfException();`,
` return result;`,
` } else {`,
` const result = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` if (Bun__RETURN_IF_EXCEPTION(${formatZigName(globalThisArg.name)})) return error.JSError;`,
` return result;`,
` }`,
` const result = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` try scope.returnIfException();`,
` return result;`,
` } else {`,
` const result = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` if (Bun__RETURN_IF_EXCEPTION(${formatZigName(globalThisArg.name)})) return error.JSError;`,
` return result;`,
` }`,
`}`,
);
return;
}
Expand All @@ -699,21 +699,21 @@ function generateZigFn(
}
} else assertNever(fn.tag);
resultBindings.push(
` pub inline fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters, globalThisArg)}) bun.JSError!${returnType} {`,
` if (comptime Environment.ci_assert) {`,
` var scope: jsc.ExceptionValidationScope = undefined;`,
` scope.init(${formatZigName(globalThisArg.name)}, @src());`,
` defer scope.deinit();`,
`pub inline fn ${formatZigName(fn.name)}(${generateZigParameterList(fn.parameters, globalThisArg)}) bun.JSError!${fn.tag === "false_is_throw" ? "void" : returnType} {`,
` if (comptime Environment.ci_assert) {`,
` var scope: jsc.ExceptionValidationScope = undefined;`,
` scope.init(${formatZigName(globalThisArg.name)}, @src());`,
` defer scope.deinit();`,
``,
` const value = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` scope.assertExceptionPresenceMatches(value == ${equalsValue});`,
` return if (value == ${equalsValue}) error.JSError else value;`,
` } else {`,
` const value = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` if (value == ${equalsValue}) return error.JSError;`,
` return value;`,
` }`,
` const value = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` scope.assertExceptionPresenceMatches(value == ${equalsValue});`,
` return if (value == ${equalsValue}) error.JSError ${fn.tag === "false_is_throw" ? "" : "else value"};`,
` } else {`,
` const value = raw.${formatZigName(fn.name)}(${fn.parameters.map(p => formatZigName(p.name)).join(", ")});`,
` if (value == ${equalsValue}) return error.JSError;`,
...(fn.tag === "false_is_throw" ? [] : [` return value;`]),
` }`,
`}`,
);
return;
}
Expand Down Expand Up @@ -783,10 +783,10 @@ async function main() {
const resultFilePath = join(dstDir, "cpp.zig");
const resultContents =
typeDeclarations +
"\nconst raw = struct {\n" +
resultRaw.join("\n") +
"\n};\n\npub const bindings = struct {\n" +
"\n" +
resultBindings.join("\n") +
"\n\nconst raw = struct {\n" +
resultRaw.join("\n") +
"\n};\n";
if ((await readFileOrEmpty(resultFilePath)) !== resultContents) {
await Bun.write(resultFilePath, resultContents);
Expand Down