Commit ba137783ed4152ebe8d7b98dca855c551fc924a7 | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-09-23 16:37:53-07:00
committer	GitHub <noreply@github.com> 2025-09-23 23:37:53+00:00
log	ba137783ed4152ebe8d7b98dca855c551fc924a7
tree	2657d21ad497ec9d4e1050803e4f1b1e28063457
parent	7b92d5f4052be651e9bc5cd4ad78a69ccbee865d
signature	Signed by PGP key B5690EEEBB952194

forbid trivial local address returned from functions (#25333)

progress towards #25312

3 files changed, 34 insertions(+), 9 deletions(-)

lib
- std
  - zig
    AstGen.zig
test
- behavior
  - fn.zig
- cases
  - compile_errors
    return_addr_of_local.zig

lib/std/zig/AstGen.zig+23-8

 @@ -383,6 +383,8 @@ const ResultInfo = struct {
         assignment,
         /// No specific operator in particular.
         none,
+        /// The expression is operand to address-of which is the operand to a return expression.
+        return_addrof,
     };
 };
 @@ -955,7 +957,14 @@ fn expr(gz: *GenZir, scope: *Scope, ri: ResultInfo, node: Ast.Node.Index) InnerE
                 _ = try gz.addUnTok(.validate_ref_ty, res_ty_inst, tree.firstToken(node));
                 break :rl .{ .ref_coerced_ty = res_ty_inst };
             } else .ref;
-            const result = try expr(gz, scope, .{ .rl = operand_rl }, tree.nodeData(node).node);
+            const operand_node = tree.nodeData(node).node;
+            const result = try expr(gz, scope, .{
+                .rl = operand_rl,
+                .ctx = switch (ri.ctx) {
+                    .@"return" => .return_addrof,
+                    else => .none,
+                },
+            }, operand_node);
             return rvalue(gz, ri, result, node);
         },
         .optional_type => {
 @@ -8420,13 +8429,19 @@ fn localVarRef(
                     local_ptr.used = .fromToken(ident_token);
                 }
-                // Can't close over a runtime variable
+                if (!local_ptr.maybe_comptime and !gz.is_typeof) {
-                if (num_namespaces_out != 0 and !local_ptr.maybe_comptime and !gz.is_typeof) {
+                    if (num_namespaces_out != 0) {
-                    const ident_name = try astgen.identifierTokenString(ident_token);
+                        const ident_name = try astgen.identifierTokenString(ident_token);
-                    return astgen.failNodeNotes(ident, "mutable '{s}' not accessible from here", .{ident_name}, &.{
+                        return astgen.failNodeNotes(ident, "mutable '{s}' not accessible from here", .{ident_name}, &.{
-                        try astgen.errNoteTok(local_ptr.token_src, "declared mutable here", .{}),
+                            try astgen.errNoteTok(local_ptr.token_src, "declared mutable here", .{}),
-                        try astgen.errNoteNode(capturing_namespace.node, "crosses namespace boundary here", .{}),
+                            try astgen.errNoteNode(capturing_namespace.node, "crosses namespace boundary here", .{}),
-                    });
+                        });
+                    } else if (ri.ctx == .return_addrof) {
+                        const ident_name = try astgen.identifierTokenString(ident_token);
+                        return astgen.failNodeNotes(ident, "returning address of expired local variable '{s}'", .{ident_name}, &.{
+                            try astgen.errNoteTok(local_ptr.token_src, "declared runtime-known here", .{}),
+                        });
+                    }
                 }
                 switch (ri.rl) {

test/behavior/fn.zig+2-1

...	@@ -758,7 +758,8 @@ test "return undefined pointer from function, directly and by expired local" {	...	@@ -758,7 +758,8 @@ test "return undefined pointer from function, directly and by expired local" {
758	/// Semantically equivalent to `returnUndefPointer`.	758	/// Semantically equivalent to `returnUndefPointer`.
759	fn returnStackPointer() *i32 {	759	fn returnStackPointer() *i32 {
760	var stack_allocation: i32 = 1234;	760	var stack_allocation: i32 = 1234;
761	return &stack_allocation;	761	const ptr = &stack_allocation; // defeats ast-check detection
		762	return ptr;
762	}	763	}
763	};	764	};
764		765

test/cases/compile_errors/return_addr_of_local.zig created+9

...	@@ -0,0 +1,9 @@
1	export fn b() void {
2	var x: i32 = 1234;
3	return &x;
4	}
5
6	// error
7	//
8	// :3:13: error: returning address of expired local variable 'x'
9	// :2:9: note: declared runtime-known here