Commit bcf2eb1a003d076c166d4ce9cba20f6ed9b53887 | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-03-24 21:45:22-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-03-24 21:47:18-07:00
log	bcf2eb1a003d076c166d4ce9cba20f6ed9b53887
tree	0703024c1c2d2601cd0eee38ac729d01027c8857
parent	b802a67562cc912213ebfc6ef8a380c775c999fe

Sema: fix closure capture typeof runtime-known parameter

Closures are not necessarily constant values. For example, Zig
code might do something like this:

    fn foo(x: anytype) void {
        const S = struct {field: @TypeOf(x)};
    }

...in which case the closure_capture instruction has access to a
runtime value only. In such case we preserve the type and use a
dummy runtime value.

closes #11292

2 files changed, 27 insertions(+), 3 deletions(-)

src
- Sema.zig
test
- behavior
  - eval.zig

src/Sema.zig+12-3

 @@ -10483,10 +10483,19 @@ fn zirClosureCapture(
 ) CompileError!void {
     // TODO: Compile error when closed over values are modified
     const inst_data = sema.code.instructions.items(.data)[inst].un_tok;
-    const tv = try sema.resolveInstConst(block, inst_data.src(), inst_data.operand);
+    const src = inst_data.src();
+    // Closures are not necessarily constant values. For example, the
+    // code might do something like this:
+    // fn foo(x: anytype) void { const S = struct {field: @TypeOf(x)}; }
+    // ...in which case the closure_capture instruction has access to a runtime
+    // value only. In such case we preserve the type and use a dummy runtime value.
+    const operand = sema.resolveInst(inst_data.operand);
+    const val = (try sema.resolveMaybeUndefValAllowVariables(block, src, operand)) orelse
+        Value.initTag(.generic_poison);
     try block.wip_capture_scope.captures.putNoClobber(sema.gpa, inst, .{
-        .ty = try tv.ty.copy(sema.perm_arena),
+        .ty = try sema.typeOf(operand).copy(sema.perm_arena),
-        .val = try tv.val.copy(sema.perm_arena),
+        .val = try val.copy(sema.perm_arena),
     });
 }

test/behavior/eval.zig+15

...	@@ -878,3 +878,18 @@ test "const local with comptime init through array init" {	...	@@ -878,3 +878,18 @@ test "const local with comptime init through array init" {
878		878
879	try comptime expect(decls[0][0].name[0] == 'a');	879	try comptime expect(decls[0][0].name[0] == 'a');
880	}	880	}
		881
		882	test "closure capture type of runtime-known parameter" {
		883	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
		884	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
		885
		886	const S = struct {
		887	fn b(c: anytype) !void {
		888	const D = struct { c: @TypeOf(c) };
		889	var d = D{ .c = c };
		890	try expect(d.c == 1234);
		891	}
		892	};
		893	var c: i32 = 1234;
		894	try S.b(c);
		895	}