aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bun.js/api/bun.zig2
-rw-r--r--src/bun.js/bindings/bindings.zig1
-rw-r--r--src/bun.js/test/jest.zig8
-rw-r--r--src/bun_js.zig2
-rw-r--r--src/feature_flags.zig4
-rw-r--r--src/http.zig4
-rw-r--r--src/js_ast.zig8
-rw-r--r--src/main.zig1
8 files changed, 17 insertions, 13 deletions
diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
index c5831ed59..7c0d1b32f 100644
--- a/src/bun.js/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -2852,7 +2852,7 @@ pub const EnvironmentVariables = struct {
};
export fn Bun__reportError(_: *JSGlobalObject, err: JSC.JSValue) void {
- JSC.VirtualMachine.vm.defaultErrorHandler(err, null);
+ JSC.VirtualMachine.vm.runErrorHandler(err, null);
}
comptime {
diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index 3a44491e4..0d665c266 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -2246,6 +2246,7 @@ pub const JSValue = enum(JSValueReprInt) {
}
pub fn callWithThis(this: JSValue, globalThis: *JSGlobalObject, thisValue: JSC.JSValue, args: []const JSC.JSValue) JSC.JSValue {
+ JSC.markBinding();
return JSC.C.JSObjectCallAsFunctionReturnValue(
globalThis.ref(),
this.asObjectRef(),
diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index 31141472a..2e95651c0 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -692,7 +692,7 @@ pub const TestScope = struct {
const initial_value = js.JSObjectCallAsFunctionReturnValue(vm.global.ref(), this.callback, null, 0, null);
if (initial_value.isException(vm.global.vm()) or initial_value.isError() or initial_value.isAggregateError(vm.global)) {
- vm.defaultErrorHandler(initial_value, null);
+ vm.runErrorHandler(initial_value, null);
return .{ .fail = this.counter.actual };
}
@@ -709,7 +709,7 @@ pub const TestScope = struct {
vm.waitForPromise(this.promise.?);
switch (this.promise.?.status(vm.global.vm())) {
.Rejected => {
- vm.defaultErrorHandler(this.promise.?.result(vm.global.vm()), null);
+ vm.runErrorHandler(this.promise.?.result(vm.global.vm()), null);
return .{ .fail = this.counter.actual };
},
else => {
@@ -964,7 +964,7 @@ pub const DescribeScope = struct {
if (!beforeEach.isEmpty()) {
Jest.runner.?.reportFailure(test_id, source.path.text, tests[i].label, 0, this);
- ctx.bunVM().defaultErrorHandler(beforeEach, null);
+ ctx.bunVM().runErrorHandler(beforeEach, null);
i += 1;
continue;
}
@@ -986,7 +986,7 @@ pub const DescribeScope = struct {
const afterAll = this.execCallback(ctx, .afterAll);
if (!afterAll.isEmpty()) {
- ctx.bunVM().defaultErrorHandler(afterAll, null);
+ ctx.bunVM().runErrorHandler(afterAll, null);
}
this.tests.deinit(allocator);
diff --git a/src/bun_js.zig b/src/bun_js.zig
index 2ccc3f47f..a2472d864 100644
--- a/src/bun_js.zig
+++ b/src/bun_js.zig
@@ -116,7 +116,7 @@ pub const Run = struct {
var promise = this.vm.loadEntryPoint(this.entry_path) catch return;
if (promise.status(this.vm.global.vm()) == .Rejected) {
- this.vm.defaultErrorHandler(promise.result(this.vm.global.vm()), null);
+ this.vm.runErrorHandler(promise.result(this.vm.global.vm()), null);
Global.exit(1);
}
diff --git a/src/feature_flags.zig b/src/feature_flags.zig
index 4a9a7a776..6fe6da892 100644
--- a/src/feature_flags.zig
+++ b/src/feature_flags.zig
@@ -89,8 +89,10 @@ pub const use_libgit2 = true;
pub const atomic_file_watcher = env.isLinux;
-pub const node_streams = env.isDebug or env.isTest;
+pub const node_streams = false;
pub const simd = true;
// This change didn't seem to make a meaningful difference in microbenchmarks
pub const latin1_is_now_ascii = false;
+
+pub const http_buffer_pooling = false;
diff --git a/src/http.zig b/src/http.zig
index fd30aae8e..78db36f55 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -1271,7 +1271,7 @@ pub const RequestContext = struct {
defer exception_list.deinit();
if (!js_value.isUndefinedOrNull()) {
- javascript_vm.?.defaultErrorHandler(
+ javascript_vm.?.runErrorHandler(
js_value,
&exception_list,
);
@@ -1319,7 +1319,7 @@ pub const RequestContext = struct {
var did_log_messages = false;
if (!js_value.isUndefinedOrNull()) {
var start_count = this.log.msgs.items.len;
- javascript_vm.?.defaultErrorHandler(
+ javascript_vm.?.runErrorHandler(
js_value,
&exception_list,
);
diff --git a/src/js_ast.zig b/src/js_ast.zig
index bacf0cd6d..a34cac452 100644
--- a/src/js_ast.zig
+++ b/src/js_ast.zig
@@ -7684,7 +7684,7 @@ pub const Macro = struct {
var loaded_result = try vm.loadMacroEntryPoint(path.text, function_name, specifier, hash);
if (loaded_result.status(vm.global.vm()) == JSC.JSPromise.Status.Rejected) {
- vm.defaultErrorHandler(loaded_result.result(vm.global.vm()), null);
+ vm.runErrorHandler(loaded_result.result(vm.global.vm()), null);
vm.disableMacroMode();
return error.MacroLoadError;
}
@@ -7798,7 +7798,7 @@ pub const Macro = struct {
) MacroError!Expr {
switch (comptime tag) {
.Error => {
- this.macro.vm.defaultErrorHandler(value, null);
+ this.macro.vm.runErrorHandler(value, null);
return this.caller;
},
.Undefined => if (this.is_top_level)
@@ -7825,7 +7825,7 @@ pub const Macro = struct {
return _entry.value_ptr.*;
},
.ResolveError, .BuildError => {
- this.macro.vm.defaultErrorHandler(value, null);
+ this.macro.vm.runErrorHandler(value, null);
return error.MacroFailed;
},
.Request => {
@@ -8020,7 +8020,7 @@ pub const Macro = struct {
}
if (rejected or promise_result.isError() or promise_result.isAggregateError(this.global) or promise_result.isException(this.global.vm())) {
- this.macro.vm.defaultErrorHandler(promise_result, null);
+ this.macro.vm.runErrorHandler(promise_result, null);
return error.MacroFailed;
}
this.is_top_level = false;
diff --git a/src/main.zig b/src/main.zig
index 6a513805a..fdd93e4a7 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -15,6 +15,7 @@ const Environment = bun.Environment;
const strings = bun.strings;
const MutableString = bun.MutableString;
const stringZ = bun.stringZ;
+pub const JSC = @import("javascript_core");
const default_allocator = bun.default_allocator;
const C = bun.C;
const panicky = @import("panic_handler.zig");