mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 18:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

break out of loop earlier

Browse Source
This commit is contained in:
Dylan Conway
2025-09-04 16:45:30 -07:00
parent 020327f650
commit d93fe4077d
2 changed files with 90 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/bundler/LinkerContext.zig
View File

@@ -401,29 +401,39 @@ pub const LinkerContext = struct {
var changed = true;
while (changed) {
changed = false;
var idx: u32 = 0;
var idx: usize = 0;
while (idx < this.graph.files.len) : (idx += 1) {
// Skip runtime
if (idx == Index.runtime.get()) continue;
if (idx == Index.runtime.get()) {
continue;
}
// Skip if not a JavaScript AST
if (idx >= import_records_list.len) continue;
if (idx >= import_records_list.len) {
continue;
}
// Skip CSS files
if (css_asts[idx] != null) continue;
if (css_asts[idx] != null) {
continue;
}
if (flags[idx].is_async_or_has_async_dependency) {
continue;
}
const import_records = import_records_list[idx].slice();
for (import_records) |record| {
if (Index.isValid(record.source_index) and record.kind == .stmt) {
const dep_index = record.source_index.get();
// If our dependency is async, we should be async too
if (dep_index < flags.len and
flags[dep_index].is_async_or_has_async_dependency and
!flags[idx].is_async_or_has_async_dependency)
{
flags[idx].is_async_or_has_async_dependency = true;
changed = true;
}
const dep_idx = record.source_index;
if (Index.isInvalid(dep_idx) or dep_idx.get() >= flags.len or record.kind != .stmt) {
continue;
}
// If our dependency is async, we should be async too
if (flags[dep_idx.get()].is_async_or_has_async_dependency) {
flags[idx].is_async_or_has_async_dependency = true;
changed = true;
break;
}
}
}
@@ -1191,13 +1201,25 @@ pub const LinkerContext = struct {
}
// Replace the statement with a call to "init()"
// Never use await here - __esm handles async internally
const value = Expr.init(E.Call, .{
.target = Expr.initIdentifier(
wrapper_ref,
loc,
),
}, loc);
const value: Expr = brk: {
const default = Expr.init(E.Call, .{
.target = Expr.initIdentifier(
wrapper_ref,
loc,
),
}, loc);
if (other_flags.is_async_or_has_async_dependency) {
// This currently evaluates sibling dependencies in serial instead of in
// parallel, which is incorrect. This should be changed to store a promise
// and await all stored promises after all imports but before any code.
break :brk Expr.init(E.Await, .{
.value = default,
}, loc);
}
break :brk default;
};
try stmts.inside_wrapper_prefix.append(
Stmt.alloc(S.SExpr, .{

68
src/bundler/linker_context/postProcessJSChunk.zig
View File

@@ -466,27 +466,53 @@ pub fn generateEntryPointTailJS(
},
else => {
if (flags.wrap == .esm and ast.wrapper_ref.isValid()) {
// Never use await at module top level for ESM output
// The __esm wrapper handles async internally
// "init_foo();"
stmts.append(
Stmt.alloc(
S.SExpr,
.{
.value = Expr.init(
E.Call,
E.Call{
.target = Expr.initIdentifier(
ast.wrapper_ref,
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
) catch unreachable;
if (flags.is_async_or_has_async_dependency) {
// "await init_foo();"
stmts.append(
Stmt.alloc(
S.SExpr,
.{
.value = Expr.init(
E.Await,
E.Await{
.value = Expr.init(
E.Call,
E.Call{
.target = Expr.initIdentifier(
ast.wrapper_ref,
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
) catch unreachable;
} else {
// "init_foo();"
stmts.append(
Stmt.alloc(
S.SExpr,
.{
.value = Expr.init(
E.Call,
E.Call{
.target = Expr.initIdentifier(
ast.wrapper_ref,
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
},
Logger.Loc.Empty,
),
) catch unreachable;
}
}
const sorted_and_filtered_export_aliases = c.graph.meta.items(.sorted_and_filtered_export_aliases)[source_index];