diff options
| -rw-r--r-- | lib/std/c/darwin.zig | 22 | ||||
| -rw-r--r-- | src/main.zig | 10 |
2 files changed, 19 insertions, 13 deletions
diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig index 4e5bc73c38..eefa68e6a9 100644 --- a/lib/std/c/darwin.zig +++ b/lib/std/c/darwin.zig @@ -3033,16 +3033,18 @@ pub const caddr_t = ?[*]u8; pub extern "c" fn ptrace(request: c_int, pid: pid_t, addr: caddr_t, data: c_int) c_int; -pub const POSIX_SPAWN_RESETIDS = 0x0001; -pub const POSIX_SPAWN_SETPGROUP = 0x0002; -pub const POSIX_SPAWN_SETSIGDEF = 0x0004; -pub const POSIX_SPAWN_SETSIGMASK = 0x0008; -pub const POSIX_SPAWN_SETEXEC = 0x0040; -pub const POSIX_SPAWN_START_SUSPENDED = 0x0080; -pub const _POSIX_SPAWN_DISABLE_ASLR = 0x0100; -pub const POSIX_SPAWN_SETSID = 0x0400; -pub const _POSIX_SPAWN_RESLIDE = 0x0800; -pub const POSIX_SPAWN_CLOEXEC_DEFAULT = 0x4000; +pub const POSIX_SPAWN = struct { + pub const RESETIDS = 0x0001; + pub const SETPGROUP = 0x0002; + pub const SETSIGDEF = 0x0004; + pub const SETSIGMASK = 0x0008; + pub const SETEXEC = 0x0040; + pub const START_SUSPENDED = 0x0080; + pub const DISABLE_ASLR = 0x0100; + pub const SETSID = 0x0400; + pub const RESLIDE = 0x0800; + pub const CLOEXEC_DEFAULT = 0x4000; +}; pub const posix_spawnattr_t = *opaque {}; pub const posix_spawn_file_actions_t = *opaque {}; diff --git a/src/main.zig b/src/main.zig index 551bd55c42..961d649d38 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3852,11 +3852,15 @@ fn runOrTestHotSwap( switch (builtin.target.os.tag) { .macos, .ios, .tvos, .watchos => { const PosixSpawn = std.os.darwin.PosixSpawn; + var attr = try PosixSpawn.Attr.init(); defer attr.deinit(); - const flags: u16 = std.os.darwin.POSIX_SPAWN_SETSIGDEF | - std.os.darwin.POSIX_SPAWN_SETSIGMASK | - std.os.darwin._POSIX_SPAWN_DISABLE_ASLR; + + // ASLR is probably a good default for better debugging experience/programming + // with hot-code updates in mind. However, we can also make it work with ASLR on. + const flags: u16 = std.os.darwin.POSIX_SPAWN.SETSIGDEF | + std.os.darwin.POSIX_SPAWN.SETSIGMASK | + std.os.darwin.POSIX_SPAWN.DISABLE_ASLR; try attr.set(flags); var arena_allocator = std.heap.ArenaAllocator.init(gpa); |