Merge pull request #22243 from mlugg/better-imc

Sema: disallow unsafe in-memory coercions
ziglang · Dec 16, 2024 · 32354d1 · 32354d1
2 parents d12c0bf + 512cb22
commit 32354d1
Show file tree

Hide file tree

Showing 11 changed files with 279 additions and 144 deletions.
diff --git a/lib/compiler/build_runner.zig b/lib/compiler/build_runner.zig
@@ -1364,20 +1364,20 @@ fn usage(b: *std.Build, out_stream: anytype) !void {
     );
 }
 
-fn nextArg(args: [][:0]const u8, idx: *usize) ?[:0]const u8 {
+fn nextArg(args: []const [:0]const u8, idx: *usize) ?[:0]const u8 {
     if (idx.* >= args.len) return null;
     defer idx.* += 1;
     return args[idx.*];
 }
 
-fn nextArgOrFatal(args: [][:0]const u8, idx: *usize) [:0]const u8 {
+fn nextArgOrFatal(args: []const [:0]const u8, idx: *usize) [:0]const u8 {
     return nextArg(args, idx) orelse {
         std.debug.print("expected argument after '{s}'\n  access the help menu with 'zig build -h'\n", .{args[idx.* - 1]});
         process.exit(1);
     };
 }
 
-fn argsRest(args: [][:0]const u8, idx: usize) ?[][:0]const u8 {
+fn argsRest(args: []const [:0]const u8, idx: usize) ?[]const [:0]const u8 {
     if (idx >= args.len) return null;
     return args[idx..];
 }

diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig
@@ -1232,16 +1232,16 @@ pub extern "c" fn posix_spawn(
     path: [*:0]const u8,
     actions: ?*const posix_spawn_file_actions_t,
     attr: ?*const posix_spawnattr_t,
-    argv: [*:null]?[*:0]const u8,
-    env: [*:null]?[*:0]const u8,
+    argv: [*:null]const ?[*:0]const u8,
+    env: [*:null]const ?[*:0]const u8,
 ) c_int;
 pub extern "c" fn posix_spawnp(
     pid: *pid_t,
     path: [*:0]const u8,
     actions: ?*const posix_spawn_file_actions_t,
     attr: ?*const posix_spawnattr_t,
-    argv: [*:null]?[*:0]const u8,
-    env: [*:null]?[*:0]const u8,
+    argv: [*:null]const ?[*:0]const u8,
+    env: [*:null]const ?[*:0]const u8,
 ) c_int;
 
 pub const E = enum(u16) {

diff --git a/src/DarwinPosixSpawn.zig b/src/DarwinPosixSpawn.zig
@@ -161,8 +161,8 @@ pub fn spawn(
     path: []const u8,
     actions: ?Actions,
     attr: ?Attr,
-    argv: [*:null]?[*:0]const u8,
-    envp: [*:null]?[*:0]const u8,
+    argv: [*:null]const ?[*:0]const u8,
+    envp: [*:null]const ?[*:0]const u8,
 ) Error!std.c.pid_t {
     const posix_path = try std.posix.toPosixPath(path);
     return spawnZ(&posix_path, actions, attr, argv, envp);
@@ -172,8 +172,8 @@ pub fn spawnZ(
     path: [*:0]const u8,
     actions: ?Actions,
     attr: ?Attr,
-    argv: [*:null]?[*:0]const u8,
-    envp: [*:null]?[*:0]const u8,
+    argv: [*:null]const ?[*:0]const u8,
+    envp: [*:null]const ?[*:0]const u8,
 ) Error!std.c.pid_t {
     var pid: std.c.pid_t = undefined;
     switch (errno(std.c.posix_spawn(