more

oven-sh · Jarred-Sumner · Dec 28, 2022 · Nov 29, 2022 · Nov 29, 2022 · Nov 29, 2022
commit 8846e7fbd6460176dcdd728b1d252053e3f7bca6
diff --git a/src/api/schema.zig b/src/api/schema.zig
@@ -58,7 +58,7 @@ pub const Reader = struct {
         return E.InvalidValue;
     }
 
-    pub inline fn readArray(this: *Self, comptime T: type) ![]const T {
+    pub fn readArray(this: *Self, comptime T: type) ![]const T {
         const length = try this.readInt(u32);
         if (length == 0) {
             return &([_]T{});
@@ -156,7 +156,7 @@ pub const Reader = struct {
                             .Packed => {
                                 const sizeof = @sizeOf(T);
                                 var slice = try this.read(sizeof);
-                                return @ptrCast(*T, slice[0..sizeof]).*;
+                                return @ptrCast(*align(1) T, slice[0..sizeof]).*;
                             },
                             else => {},
                         }
@@ -263,7 +263,7 @@ pub fn Writer(comptime WritableStream: type) type {
             }
         }
 
-        pub inline fn writeArray(this: *Self, comptime T: type, slice: anytype) !void {
+        pub fn writeArray(this: *Self, comptime T: type, slice: anytype) !void {
             try this.writeInt(@truncate(u32, slice.len));
 
             switch (T) {

diff --git a/src/baby_list.zig b/src/baby_list.zig
@@ -317,7 +317,7 @@ pub fn BabyList(comptime Type: type) type {
         }
 
         pub fn one(allocator: std.mem.Allocator, value: Type) !ListType {
-            var items = try allocator.allocAdvanced(Type, @alignOf(Type), 1, .exact);
+            var items = try allocator.alloc(Type, 1);
             items[0] = value;
             return ListType{
                 .ptr = @ptrCast([*]Type, items.ptr),

diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
@@ -651,6 +651,7 @@ pub fn readFileAsBytesCallback(
     errdefer VirtualMachine.vm.allocator.free(contents_buf);
     const contents_len = file.readAll(contents_buf) catch |err| {
         JSError(getAllocator(ctx), "{s} reading file (\"{s}\")", .{ @errorName(err), path }, ctx, exception);
+        if (true) @panic("todo??");
         return js.JSValueMakeUndefined(ctx);
     };
 
@@ -3459,7 +3460,7 @@ pub const JSZlib = struct {
             }
             return ZigString.init("Zlib returned an error").toErrorInstance(globalThis);
         };
-        reader.list = .{ .items = try reader.list.toOwnedSlice(allocator) };
+        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
         reader.list.capacity = reader.list.items.len;
         reader.list_ptr = &reader.list;
 
@@ -3491,7 +3492,7 @@ pub const JSZlib = struct {
             }
             return ZigString.init("Zlib returned an error").toErrorInstance(globalThis);
         };
-        reader.list = .{ .items = try reader.list.toOwnedSlice(allocator) };
+        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
         reader.list.capacity = reader.list.items.len;
         reader.list_ptr = &reader.list;
 
@@ -3521,7 +3522,7 @@ pub const JSZlib = struct {
             }
             return ZigString.init("Zlib returned an error").toErrorInstance(globalThis);
         };
-        reader.list = .{ .items = try reader.list.toOwnedSlice(allocator) };
+        reader.list = .{ .items = reader.list.toOwnedSlice(allocator) catch @panic("TODO") };
         reader.list.capacity = reader.list.items.len;
         reader.list_ptr = &reader.list;
 

diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig
@@ -1028,7 +1028,7 @@ pub const Subprocess = struct {
         var cwd = jsc_vm.bundler.fs.top_level_dir;
 
         var stdio = [3]Stdio{
-            .{ .ignore = .{} },
+            .{ .ignore = {} },
             .{ .pipe = null },
             .{ .inherit = {} },
         };
@@ -1762,7 +1762,8 @@ pub const Subprocess = struct {
         } else if (value.as(JSC.WebCore.Response)) |req| {
             req.getBodyValue().toBlobIfPossible();
             return extractStdioBlob(globalThis, req.getBodyValue().useAsAnyBlob(), i, stdio_array);
-        } else if (JSC.WebCore.ReadableStream.fromJS(value, globalThis)) |*req| {
+        } else if (JSC.WebCore.ReadableStream.fromJS(value, globalThis)) |req_const| {
+            var req = req_const;
             if (i == std.os.STDIN_FILENO) {
                 if (req.toAnyBlob(globalThis)) |blob| {
                     return extractStdioBlob(globalThis, blob, i, stdio_array);
@@ -1776,7 +1777,7 @@ pub const Subprocess = struct {
                             return false;
                         }
 
-                        stdio_array[i] = .{ .pipe = req.* };
+                        stdio_array[i] = .{ .pipe = req };
                         return true;
                     },
                     else => {},

diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig
@@ -743,10 +743,10 @@ pub const FFI = struct {
         extern fn pthread_jit_write_protect_np(enable: bool) callconv(.C) void;
 
         const MyFunctionSStructWorkAround = struct {
-            JSVALUE_TO_INT64: fn (JSValue0: JSC.JSValue) callconv(.C) i64,
-            JSVALUE_TO_UINT64: fn (JSValue0: JSC.JSValue) callconv(.C) u64,
-            INT64_TO_JSVALUE: fn (arg0: [*c]JSC.JSGlobalObject, arg1: i64) callconv(.C) JSC.JSValue,
-            UINT64_TO_JSVALUE: fn (arg0: [*c]JSC.JSGlobalObject, arg1: u64) callconv(.C) JSC.JSValue,
+            JSVALUE_TO_INT64: *const fn (JSValue0: JSC.JSValue) callconv(.C) i64,
+            JSVALUE_TO_UINT64: *const fn (JSValue0: JSC.JSValue) callconv(.C) u64,
+            INT64_TO_JSVALUE: *const fn (arg0: [*c]JSC.JSGlobalObject, arg1: i64) callconv(.C) JSC.JSValue,
+            UINT64_TO_JSVALUE: *const fn (arg0: [*c]JSC.JSGlobalObject, arg1: u64) callconv(.C) JSC.JSValue,
             bun_call: *const @TypeOf(JSC.C.JSObjectCallAsFunction),
         };
         const headers = @import("../bindings/headers.zig");
@@ -832,7 +832,7 @@ pub const FFI = struct {
                 return;
             }
 
-            var bytes: []u8 = try allocator.rawAlloc(@intCast(usize, relocation_size), 16, 16, 0);
+            var bytes: []u8 = try allocator.alloc(u8, @intCast(usize, relocation_size));
             defer {
                 if (this.step == .failed) {
                     allocator.free(bytes);
@@ -992,7 +992,7 @@ pub const FFI = struct {
                 return;
             }
 
-            var bytes: []u8 = try allocator.rawAlloc(@intCast(usize, relocation_size), 16, 16, 0);
+            var bytes: []u8 = try allocator.alloc(u8, @intCast(usize, relocation_size));
             defer {
                 if (this.step == .failed) {
                     allocator.free(bytes);

diff --git a/src/bun.js/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig
@@ -476,7 +476,7 @@ pub const HTMLRewriter = struct {
                     if (sink.response.body.value == .Locked and @ptrToInt(sink.response.body.value.Locked.task) == @ptrToInt(sink) and
                         sink.response.body.value.Locked.promise == null)
                     {
-                        sink.response.body.value = .{ .Empty = .{} };
+                        sink.response.body.value = .{ .Empty = {} };
                         // is there a pending promise?
                         // we will need to reject it
                     } else if (sink.response.body.value == .Locked and @ptrToInt(sink.response.body.value.Locked.task) == @ptrToInt(sink) and

diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig
@@ -553,26 +553,33 @@ pub fn NewRequestContextStackAllocator(comptime RequestContext: type, comptime c
 
         pub fn get(this: *@This()) std.mem.Allocator {
             this.unused = Set.initFull();
-            return std.mem.Allocator.init(this, alloc, resize, free);
+            return .{
+                .ptr = this,
+                .vtable = &.{
+                    .alloc = alloc,
+                    .resize = resize,
+                    .free = free,
+                },
+            };
         }
 
-        fn alloc(self: *@This(), a: usize, b: u29, c: u29, d: usize) ![]u8 {
+        fn alloc(self_: *anyopaque, a: usize, b: u8, d: usize) ?[*]u8 {
+            const self = @ptrCast(*@This(), @alignCast(@alignOf(@This()), self_));
             if (self.unused.findFirstSet()) |i| {
                 self.unused.unset(i);
                 return std.mem.asBytes(&self.buf[i]);
             }
 
-            return try self.fallback_allocator.rawAlloc(a, b, c, d);
+            return self.fallback_allocator.rawAlloc(a, b, d);
         }
 
         fn resize(
-            _: *@This(),
+            _: *anyopaque,
             _: []u8,
-            _: u29,
+            _: u8,
             _: usize,
-            _: u29,
             _: usize,
-        ) ?usize {
+        ) bool {
             unreachable;
         }
 
@@ -582,11 +589,12 @@ pub fn NewRequestContextStackAllocator(comptime RequestContext: type, comptime c
         }
 
         fn free(
-            self: *@This(),
+            self_: *anyopaque,
             buf: []u8,
-            buf_align: u29,
+            buf_align: u8,
             return_address: usize,
         ) void {
+            const self = @ptrCast(*@This(), @alignCast(@alignOf(@This()), self_));
             const bytes = std.mem.asBytes(&self.buf);
             if (sliceContainsSlice(bytes, buf)) {
                 const index = if (bytes[0..buf.len].ptr != buf.ptr)
@@ -2085,7 +2093,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 this.renderDefaultError(
                     vm.log,
                     error.ExceptionOcurred,
-                    try exception_list.toOwnedSlice(),
+                    exception_list.toOwnedSlice() catch @panic("TODO"),
                     "<r><red>{s}<r> - <b>{s}<r> failed",
                     .{ @as(string, @tagName(this.method)), this.ensurePathname() },
                 );
@@ -2390,7 +2398,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     if (request.as(Request)) |req| {
                         var old = req.body;
                         old.Locked.onReceiveValue = null;
-                        req.body = .{ .Empty = .{} };
+                        req.body = .{ .Empty = {} };
                         old.resolve(&req.body, this.server.globalThis);
                         return;
                     }
@@ -2401,7 +2409,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                     if (request.as(Request)) |req| {
                         var old = req.body;
                         old.Locked.onReceiveValue = null;
-                        req.body = .{ .Empty = .{} };
+                        req.body = .{ .Empty = {} };
                         old.toError(error.RequestBodyTooLarge, this.server.globalThis);
                         return;
                     }
@@ -2418,7 +2426,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
                 if (request.as(Request)) |req| {
                     var old = req.body;
                     old.Locked.onReceiveValue = null;
-                    req.body = .{ .Empty = .{} };
+                    req.body = .{ .Empty = {} };
                     old.resolve(&req.body, this.server.globalThis);
                     return;
                 }
@@ -4124,7 +4132,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
 
             var url: URL = undefined;
             var first_arg = args.nextEat().?;
-            var body: JSC.WebCore.Body.Value = .{ .Empty = .{} };
+            var body: JSC.WebCore.Body.Value = .{ .Empty = {} };
             var existing_request: ?WebCore.Request = null;
             // TODO: set Host header
             // TODO: set User-Agent header
@@ -4401,7 +4409,8 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
                 if (written > 0) {
                     var message = output_buf[0..written];
                     zig_str = ZigString.init(std.fmt.allocPrint(bun.default_allocator, "OpenSSL {s}", .{message}) catch unreachable);
-                    zig_str.withEncoding().mark();
+                    var encoded_str = zig_str.withEncoding();
+                    encoded_str.mark();
                 }
             }
 
@@ -4516,7 +4525,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
                 .uws_request = req,
                 .https = ssl_enabled,
                 .body = .{
-                    .Empty = .{},
+                    .Empty = {},
                 },
             };
 
@@ -4596,7 +4605,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
                 .upgrader = ctx,
                 .https = ssl_enabled,
                 .body = .{
-                    .Empty = .{},
+                    .Empty = {},
                 },
             };
             ctx.upgrade_context = upgrade_ctx;

diff --git a/src/bun.js/api/transpiler.zig b/src/bun.js/api/transpiler.zig
@@ -384,7 +384,7 @@ fn transformOptionsFromJSC(ctx: JSC.C.JSContextRef, temp_allocator: std.mem.Allo
                     return transpiler;
                 }
 
-                names[define_iter.i] = try prop.toOwnedSlice(allocator) catch unreachable;
+                names[define_iter.i] = prop.toOwnedSlice(allocator) catch unreachable;
                 var val = JSC.ZigString.init("");
                 property_value.toZigString(&val, globalThis);
                 if (val.len == 0) {
@@ -627,7 +627,7 @@ fn transformOptionsFromJSC(ctx: JSC.C.JSContextRef, temp_allocator: std.mem.Allo
                         };
                         buf.items.len += name.len;
                         if (name.len > 0) {
-                            replacements.putAssumeCapacity(name, .{ .delete = .{} });
+                            replacements.putAssumeCapacity(name, .{ .delete = {} });
                         }
                     }
                 }

diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
@@ -3323,7 +3323,7 @@ pub const VM = extern struct {
         return cppFn("deleteAllCode", .{ vm, global_object });
     }
 
-    extern fn Bun__setOnEachMicrotaskTick(vm: *VM, ptr: ?*anyopaque, callback: ?(fn (*anyopaque) callconv(.C) void)) void;
+    extern fn Bun__setOnEachMicrotaskTick(vm: *VM, ptr: ?*anyopaque, callback: ?*const fn (*anyopaque) callconv(.C) void) void;
 
     pub fn onEachMicrotask(vm: *VM, comptime Ptr: type, ptr: *Ptr, comptime callback: *const fn (*Ptr) void) void {
         if (comptime is_bindgen) {