Files
bun.sh/src/defines.zig
pfg 05d0475c6c Update to zig 0.15.2 (#24204)
Fixes ENG-21287

Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`

|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|

Runtime performance:

- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)

Improvements:

- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests

Still an issue:

- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed

Follow-up:

- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully

Files that add lines:

```
649     src/deprecated.zig
167     scripts/pack-codegen-for-zig-team.ts
54      scripts/cleartrace-impl.js
46      scripts/cleartrace.ts
43      src/windows.zig
18      src/fs.zig
17      src/bun.js/ConsoleObject.zig
16      src/output.zig
12      src/bun.js/test/debug.zig
12      src/bun.js/node/node_fs.zig
8       src/env_loader.zig
7       src/css/printer.zig
7       src/cli/init_command.zig
7       src/bun.js/node.zig
6       src/string/escapeRegExp.zig
6       src/install/PnpmMatcher.zig
5       src/bun.js/webcore/Blob.zig
4       src/crash_handler.zig
4       src/bun.zig
3       src/install/lockfile/bun.lock.zig
3       src/cli/update_interactive_command.zig
3       src/cli/pack_command.zig
3       build.zig
2       src/Progress.zig
2       src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2       src/css/small_list.zig
2       src/bun.js/webcore/prompt.zig
1       test/internal/ban-words.test.ts
1       test/internal/ban-limits.json
1       src/watcher/WatcherTrace.zig
1       src/transpiler.zig
1       src/shell/builtin/cp.zig
1       src/js_printer.zig
1       src/io/PipeReader.zig
1       src/install/bin.zig
1       src/css/selectors/selector.zig
1       src/cli/run_command.zig
1       src/bun.js/RuntimeTranspilerStore.zig
1       src/bun.js/bindings/JSRef.zig
1       src/bake/DevServer.zig
```

Files that remove lines:

```
-1      src/test/recover.zig
-1      src/sql/postgres/SocketMonitor.zig
-1      src/sql/mysql/MySQLRequestQueue.zig
-1      src/sourcemap/CodeCoverage.zig
-1      src/css/values/color_js.zig
-1      src/compile_target.zig
-1      src/bundler/linker_context/convertStmtsForChunk.zig
-1      src/bundler/bundle_v2.zig
-1      src/bun.js/webcore/blob/read_file.zig
-1      src/ast/base.zig
-2      src/sql/postgres/protocol/ArrayList.zig
-2      src/shell/builtin/mkdir.zig
-2      src/install/PackageManager/patchPackage.zig
-2      src/install/PackageManager/PackageManagerDirectories.zig
-2      src/fmt.zig
-2      src/css/declaration.zig
-2      src/css/css_parser.zig
-2      src/collections/baby_list.zig
-2      src/bun.js/bindings/ZigStackFrame.zig
-2      src/ast/E.zig
-3      src/StandaloneModuleGraph.zig
-3      src/deps/picohttp.zig
-3      src/deps/libuv.zig
-3      src/btjs.zig
-4      src/threading/Futex.zig
-4      src/shell/builtin/touch.zig
-4      src/meta.zig
-4      src/install/lockfile.zig
-4      src/css/selectors/parser.zig
-5      src/shell/interpreter.zig
-5      src/css/error.zig
-5      src/bun.js/web_worker.zig
-5      src/bun.js.zig
-6      src/cli/test_command.zig
-6      src/bun.js/VirtualMachine.zig
-6      src/bun.js/uuid.zig
-6      src/bun.js/bindings/JSValue.zig
-9      src/bun.js/test/pretty_format.zig
-9      src/bun.js/api/BunObject.zig
-14     src/install/install_binding.zig
-14     src/fd.zig
-14     src/bun.js/node/path.zig
-14     scripts/pack-codegen-for-zig-team.sh
-17     src/bun.js/test/diff_format.zig
```

`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
2025-11-10 14:38:26 -08:00

430 lines
16 KiB
Zig

const Globals = struct {
pub const Undefined = js_ast.E.Undefined{};
pub const UndefinedPtr = &Globals.Undefined;
pub const NaN = js_ast.E.Number{ .value = std.math.nan(f64) };
pub const NanPtr = &Globals.NaN;
pub const Infinity = js_ast.E.Number{ .value = std.math.inf(f64) };
pub const InfinityPtr = &Globals.Infinity;
pub const UndefinedData = js_ast.Expr.Data{ .e_undefined = Globals.UndefinedPtr };
pub const NaNData = js_ast.Expr.Data{ .e_number = Globals.NanPtr };
pub const InfinityData = js_ast.Expr.Data{ .e_number = Globals.InfinityPtr };
};
const defines_path = fs.Path.initWithNamespace("defines.json", "internal");
pub const RawDefines = bun.StringArrayHashMap(string);
pub const UserDefines = bun.StringHashMap(DefineData);
pub const UserDefinesArray = bun.StringArrayHashMap(DefineData);
pub const DefineData = struct {
value: js_ast.Expr.Data,
// Not using a slice here shrinks the size from 48 bytes to 40 bytes.
original_name_ptr: ?[*]const u8 = null,
original_name_len: u32 = 0,
flags: Flags = .{},
pub const Flags = packed struct(u8) {
_padding: u3 = 0,
valueless: bool = false,
can_be_removed_if_unused: bool = false,
call_can_be_unwrapped_if_unused: js_ast.E.CallUnwrap = .never,
method_call_must_be_replaced_with_undefined: bool = false,
};
pub const Options = struct {
original_name: ?[]const u8 = null,
value: js_ast.Expr.Data,
valueless: bool = false,
can_be_removed_if_unused: bool = false,
call_can_be_unwrapped_if_unused: js_ast.E.CallUnwrap = .never,
method_call_must_be_replaced_with_undefined: bool = false,
};
pub fn init(options: Options) DefineData {
return DefineData{
.value = options.value,
.flags = .{
.valueless = options.valueless,
.can_be_removed_if_unused = options.can_be_removed_if_unused,
.call_can_be_unwrapped_if_unused = options.call_can_be_unwrapped_if_unused,
.method_call_must_be_replaced_with_undefined = options.method_call_must_be_replaced_with_undefined,
},
.original_name_ptr = if (options.original_name) |name| name.ptr else null,
.original_name_len = if (options.original_name) |name| @truncate(name.len) else 0,
};
}
pub inline fn original_name(self: *const DefineData) ?[]const u8 {
if (self.original_name_len > 0) {
return self.original_name_ptr.?[0..self.original_name_len];
}
return null;
}
/// True if accessing this value is known to not have any side effects. For
/// example, a bare reference to "Object.create" can be removed because it
/// does not have any observable side effects.
pub inline fn can_be_removed_if_unused(self: *const DefineData) bool {
return self.flags.can_be_removed_if_unused;
}
/// True if a call to this value is known to not have any side effects. For
/// example, a bare call to "Object()" can be removed because it does not
/// have any observable side effects.
pub inline fn call_can_be_unwrapped_if_unused(self: *const DefineData) js_ast.E.CallUnwrap {
return self.flags.call_can_be_unwrapped_if_unused;
}
pub inline fn method_call_must_be_replaced_with_undefined(self: *const DefineData) bool {
return self.flags.method_call_must_be_replaced_with_undefined;
}
pub inline fn valueless(self: *const DefineData) bool {
return self.flags.valueless;
}
pub fn initBoolean(value: bool) DefineData {
return .{
.value = .{ .e_boolean = .{ .value = value } },
.flags = .{ .can_be_removed_if_unused = true },
};
}
pub fn initStaticString(str: *const js_ast.E.String) DefineData {
return .{
.value = .{ .e_string = @constCast(str) },
.flags = .{ .can_be_removed_if_unused = true },
};
}
pub fn merge(a: DefineData, b: DefineData) DefineData {
return DefineData{
.value = b.value,
.flags = .{
.can_be_removed_if_unused = a.can_be_removed_if_unused(),
.call_can_be_unwrapped_if_unused = a.call_can_be_unwrapped_if_unused(),
// TODO: investigate if this is correct. This is what it was before. But that looks strange.
.valueless = a.method_call_must_be_replaced_with_undefined() or b.method_call_must_be_replaced_with_undefined(),
.method_call_must_be_replaced_with_undefined = a.method_call_must_be_replaced_with_undefined() or b.method_call_must_be_replaced_with_undefined(),
},
.original_name_ptr = b.original_name_ptr,
.original_name_len = b.original_name_len,
};
}
pub fn fromMergeableInputEntry(user_defines: *UserDefines, key: []const u8, value_str: []const u8, value_is_undefined: bool, method_call_must_be_replaced_with_undefined_: bool, log: *logger.Log, allocator: std.mem.Allocator) !void {
user_defines.putAssumeCapacity(key, try .parse(
key,
value_str,
value_is_undefined,
method_call_must_be_replaced_with_undefined_,
log,
allocator,
));
}
pub fn parse(
key: []const u8,
value_str: []const u8,
value_is_undefined: bool,
method_call_must_be_replaced_with_undefined_: bool,
log: *logger.Log,
allocator: std.mem.Allocator,
) !DefineData {
var keySplitter = std.mem.splitScalar(u8, key, '.');
while (keySplitter.next()) |part| {
if (!js_lexer.isIdentifier(part)) {
if (strings.eql(part, key)) {
try log.addErrorFmt(null, logger.Loc{}, allocator, "define key \"{s}\" must be a valid identifier", .{key});
} else {
try log.addErrorFmt(null, logger.Loc{}, allocator, "define key \"{s}\" contains invalid identifier \"{s}\"", .{ part, value_str });
}
break;
}
}
// check for nested identifiers
var valueSplitter = std.mem.splitScalar(u8, value_str, '.');
var isIdent = true;
while (valueSplitter.next()) |part| {
if (!js_lexer.isIdentifier(part) or js_lexer.Keywords.has(part)) {
isIdent = false;
break;
}
}
if (isIdent) {
// Special-case undefined. it's not an identifier here
// https://github.com/evanw/esbuild/issues/1407
const value = if (value_is_undefined or strings.eqlComptime(value_str, "undefined"))
js_ast.Expr.Data{ .e_undefined = js_ast.E.Undefined{} }
else
js_ast.Expr.Data{ .e_identifier = .{
.ref = Ref.None,
.can_be_removed_if_unused = true,
} };
return .{
.value = value,
.original_name_ptr = if (value_str.len > 0) value_str.ptr else null,
.original_name_len = @truncate(value_str.len),
.flags = .{
.can_be_removed_if_unused = true,
.valueless = value_is_undefined,
.method_call_must_be_replaced_with_undefined = method_call_must_be_replaced_with_undefined_,
},
};
}
const _log = log;
const source = &logger.Source{
.contents = value_str,
.path = defines_path,
};
const expr = try json_parser.parseEnvJSON(source, _log, allocator);
const cloned = try expr.data.deepClone(allocator);
return .{
.value = cloned,
.original_name_ptr = if (value_str.len > 0) value_str.ptr else null,
.original_name_len = @truncate(value_str.len),
.flags = .{
.can_be_removed_if_unused = expr.isPrimitiveLiteral(),
.valueless = value_is_undefined,
.method_call_must_be_replaced_with_undefined = method_call_must_be_replaced_with_undefined_,
},
};
}
pub fn fromInput(defines: RawDefines, drop: []const []const u8, log: *logger.Log, allocator: std.mem.Allocator) !UserDefines {
var user_defines = UserDefines.init(allocator);
var iterator = defines.iterator();
try user_defines.ensureUnusedCapacity(@truncate(defines.count() + drop.len));
while (iterator.next()) |entry| {
try fromMergeableInputEntry(&user_defines, entry.key_ptr.*, entry.value_ptr.*, false, false, log, allocator);
}
for (drop) |drop_item| {
if (drop_item.len > 0) {
try fromMergeableInputEntry(&user_defines, drop_item, "", true, true, log, allocator);
}
}
return user_defines;
}
};
fn arePartsEqual(a: []const string, b: []const string) bool {
if (a.len != b.len) {
return false;
}
for (0..a.len) |i| {
if (!strings.eql(a[i], b[i])) {
return false;
}
}
return true;
}
pub const IdentifierDefine = DefineData;
pub const DotDefine = struct {
parts: []const string,
data: DefineData,
};
// var nan_val = try allocator.create(js_ast.E.Number);
const nan_val = js_ast.E.Number{ .value = std.math.nan(f64) };
pub const Define = struct {
identifiers: bun.StringHashMap(IdentifierDefine),
dots: bun.StringHashMap([]DotDefine),
drop_debugger: bool,
allocator: std.mem.Allocator,
pub const Data = DefineData;
pub fn forIdentifier(this: *const Define, name: []const u8) ?*const IdentifierDefine {
if (this.identifiers.getPtr(name)) |data| {
return data;
}
if (table.pure_global_identifier_map.get(name)) |id| {
return id.value();
}
return null;
}
pub fn insertFromIterator(define: *Define, allocator: std.mem.Allocator, comptime Iterator: type, iter: Iterator) !void {
while (iter.next()) |user_define| {
try define.insert(allocator, user_define.key_ptr.*, user_define.value_ptr.*);
}
}
pub fn insert(define: *Define, allocator: std.mem.Allocator, key: []const u8, value: DefineData) !void {
// If it has a dot, then it's a DotDefine.
// e.g. process.env.NODE_ENV
if (strings.lastIndexOfChar(key, '.')) |last_dot| {
const tail = key[last_dot + 1 .. key.len];
const remainder = key[0..last_dot];
const count = std.mem.count(u8, remainder, ".") + 1;
var parts = try allocator.alloc(string, count + 1);
var splitter = std.mem.splitScalar(u8, remainder, '.');
var i: usize = 0;
while (splitter.next()) |split| : (i += 1) {
parts[i] = split;
}
parts[i] = tail;
var initial_values: []DotDefine = &([_]DotDefine{});
// "NODE_ENV"
const gpe_entry = try define.dots.getOrPut(tail);
if (gpe_entry.found_existing) {
for (gpe_entry.value_ptr.*) |*part| {
// ["process", "env"] === ["process", "env"] (if that actually worked)
if (arePartsEqual(part.parts, parts)) {
part.data = part.data.merge(value);
return;
}
}
initial_values = gpe_entry.value_ptr.*;
}
var list = try std.array_list.Managed(DotDefine).initCapacity(allocator, initial_values.len + 1);
if (initial_values.len > 0) {
list.appendSliceAssumeCapacity(initial_values);
}
list.appendAssumeCapacity(DotDefine{
.data = value,
// TODO: do we need to allocate this?
.parts = parts,
});
gpe_entry.value_ptr.* = try list.toOwnedSlice();
} else {
// e.g. IS_BROWSER
try define.identifiers.put(key, value);
}
}
fn insertGlobal(define: *Define, allocator: std.mem.Allocator, global: []const string, value_define: *const DefineData) !void {
const key = global[global.len - 1];
const gpe = try define.dots.getOrPut(key);
if (gpe.found_existing) {
var list = try std.array_list.Managed(DotDefine).initCapacity(allocator, gpe.value_ptr.*.len + 1);
list.appendSliceAssumeCapacity(gpe.value_ptr.*);
list.appendAssumeCapacity(DotDefine{
.parts = global[0..global.len],
.data = value_define.*,
});
define.allocator.free(gpe.value_ptr.*);
gpe.value_ptr.* = try list.toOwnedSlice();
} else {
var list = try std.array_list.Managed(DotDefine).initCapacity(allocator, 1);
list.appendAssumeCapacity(DotDefine{
.parts = global[0..global.len],
.data = value_define.*,
});
gpe.value_ptr.* = try list.toOwnedSlice();
}
}
pub fn init(allocator: std.mem.Allocator, _user_defines: ?UserDefines, string_defines: ?UserDefinesArray, drop_debugger: bool, omit_unused_global_calls: bool) bun.OOM!*@This() {
const define = try allocator.create(Define);
errdefer allocator.destroy(define);
define.* = .{
.allocator = allocator,
.identifiers = bun.StringHashMap(IdentifierDefine).init(allocator),
.dots = bun.StringHashMap([]DotDefine).init(allocator),
.drop_debugger = drop_debugger,
};
try define.dots.ensureTotalCapacity(124);
const value_define = &DefineData{
.value = .{ .e_undefined = .{} },
.flags = .{
.valueless = true,
.can_be_removed_if_unused = true,
},
};
// Step 1. Load the globals into the hash tables
for (global_no_side_effect_property_accesses) |global| {
try define.insertGlobal(allocator, global, value_define);
}
const to_string_safe = &DefineData{
.value = .{ .e_undefined = .{} },
.flags = .{
.valueless = true,
.can_be_removed_if_unused = true,
.call_can_be_unwrapped_if_unused = .if_unused_and_toString_safe,
},
};
if (omit_unused_global_calls) {
for (global_no_side_effect_function_calls_safe_for_to_string) |global| {
try define.insertGlobal(allocator, global, to_string_safe);
}
} else {
for (global_no_side_effect_function_calls_safe_for_to_string) |global| {
try define.insertGlobal(allocator, global, value_define);
}
}
// Step 3. Load user data into hash tables
// At this stage, user data has already been validated.
if (_user_defines) |user_defines| {
var iter = user_defines.iterator();
try define.insertFromIterator(allocator, @TypeOf(&iter), &iter);
}
// Step 4. Load environment data into hash tables.
// These are only strings. We do not parse them as JSON.
if (string_defines) |string_defines_| {
var iter = string_defines_.iterator();
try define.insertFromIterator(allocator, @TypeOf(&iter), &iter);
}
return define;
}
pub fn deinit(this: *Define) void {
var diter = this.dots.valueIterator();
while (diter.next()) |key| this.allocator.free(key.*);
this.dots.clearAndFree();
this.identifiers.clearAndFree();
this.allocator.destroy(this);
}
};
const string = []const u8;
const fs = @import("./fs.zig");
const std = @import("std");
const table = @import("./defines-table.zig");
const global_no_side_effect_function_calls_safe_for_to_string = table.global_no_side_effect_function_calls_safe_for_to_string;
const global_no_side_effect_property_accesses = table.global_no_side_effect_property_accesses;
const bun = @import("bun");
const js_lexer = bun.js_lexer;
const json_parser = bun.json;
const logger = bun.logger;
const strings = bun.strings;
const js_ast = bun.ast;
const Ref = bun.ast.Ref;