From 92c83fcd9eef46a3653192b70618b63bbaba97b6 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 26 Jul 2024 03:56:13 -0700 Subject: [PATCH] ipc: make IPCInstance.context void on windows instead of u0 (#12840) --- src/bun.js/javascript.zig | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index 7fd3164931..67efc56c30 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -3683,7 +3683,7 @@ pub const VirtualMachine = struct { pub const IPCInstance = struct { globalThis: ?*JSGlobalObject, - context: if (Environment.isPosix) *uws.SocketContext else u0, + context: if (Environment.isPosix) *uws.SocketContext else void, data: IPC.IPCData, pub usingnamespace bun.New(@This()); @@ -3692,10 +3692,7 @@ pub const VirtualMachine = struct { return &this.data; } - pub fn handleIPCMessage( - this: *IPCInstance, - message: IPC.DecodedIPCMessage, - ) void { + pub fn handleIPCMessage(this: *IPCInstance, message: IPC.DecodedIPCMessage) void { JSC.markBinding(@src()); switch (message) { // In future versions we can read this in order to detect version mismatches, @@ -3730,9 +3727,7 @@ pub const VirtualMachine = struct { const IPCInfoType = if (Environment.isWindows) []const u8 else bun.FileDescriptor; pub fn initIPCInstance(this: *VirtualMachine, info: IPCInfoType, mode: IPC.Mode) void { IPC.log("initIPCInstance {" ++ (if (Environment.isWindows) "s" else "") ++ "}", .{info}); - this.ipc = .{ - .waiting = .{ .info = info, .mode = mode }, - }; + this.ipc = .{ .waiting = .{ .info = info, .mode = mode } }; } pub fn getIPCInstance(this: *VirtualMachine) ?*IPCInstance { @@ -3770,7 +3765,7 @@ pub const VirtualMachine = struct { .windows => instance: { var instance = IPCInstance.new(.{ .globalThis = this.global, - .context = 0, + .context = {}, .data = .{ .mode = opts.mode }, });