Commit 3c585730f2d259963716684ede87dcfce2607973 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2023-11-17 04:58:49+00:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2023-11-19 11:11:50+00:00
log	3c585730f2d259963716684ede87dcfce2607973
tree	36b5011dde6d6438528e8a8c3d5da2ada5f21c24
parent	38b373bf0b78bfe3b332c9fbb115e2ce3e9768d0
signature	Commit is signed but in an unrecognized format.

AstGen: preserve result type in comptime block

2 files changed, 26 insertions(+), 7 deletions(-)

src
- AstGen.zig
test
- behavior
  - cast.zig

src/AstGen.zig+21-7

 @@ -1971,6 +1971,17 @@ fn comptimeExpr(
         .block_two, .block_two_semicolon, .block, .block_semicolon => {
             const token_tags = tree.tokens.items(.tag);
             const lbrace = main_tokens[node];
+            // Careful! We can't pass in the real result location here, since it may
+            // refer to runtime memory. A runtime-to-comptime boundary has to remove
+            // result location information, compute the result, and copy it to the true
+            // result location at runtime. We do this below as well.
+            const ty_only_ri: ResultInfo = .{
+                .ctx = ri.ctx,
+                .rl = if (try ri.rl.resultType(gz, node)) |res_ty|
+                    .{ .coerced_ty = res_ty }
+                else
+                    .none,
+            };
             if (token_tags[lbrace - 1] == .colon and
                 token_tags[lbrace - 2] == .identifier)
             {
 @@ -1985,17 +1996,13 @@ fn comptimeExpr(
                         else
                             stmts[0..2];
-                        // Careful! We can't pass in the real result location here, since it may
+                        const block_ref = try labeledBlockExpr(gz, scope, ty_only_ri, node, stmt_slice, true);
-                        // refer to runtime memory. A runtime-to-comptime boundary has to remove
-                        // result location information, compute the result, and copy it to the true
-                        // result location at runtime. We do this below as well.
-                        const block_ref = try labeledBlockExpr(gz, scope, .{ .rl = .none }, node, stmt_slice, true);
                         return rvalue(gz, ri, block_ref, node);
                     },
                     .block, .block_semicolon => {
                         const stmts = tree.extra_data[node_datas[node].lhs..node_datas[node].rhs];
                         // Replace result location and copy back later - see above.
-                        const block_ref = try labeledBlockExpr(gz, scope, .{ .rl = .none }, node, stmts, true);
+                        const block_ref = try labeledBlockExpr(gz, scope, ty_only_ri, node, stmts, true);
                         return rvalue(gz, ri, block_ref, node);
                     },
                     else => unreachable,
 @@ -2013,7 +2020,14 @@ fn comptimeExpr(
     const block_inst = try gz.makeBlockInst(.block_comptime, node);
     // Replace result location and copy back later - see above.
-    const block_result = try expr(&block_scope, scope, .{ .rl = .none }, node);
+    const ty_only_ri: ResultInfo = .{
+        .ctx = ri.ctx,
+        .rl = if (try ri.rl.resultType(gz, node)) |res_ty|
+            .{ .coerced_ty = res_ty }
+        else
+            .none,
+    };
+    const block_result = try expr(&block_scope, scope, ty_only_ri, node);
     if (!gz.refIsNoReturn(block_result)) {
         _ = try block_scope.addBreak(.@"break", block_inst, block_result);
     }

test/behavior/cast.zig+5

...	@@ -2522,3 +2522,8 @@ test "@intCast vector of signed integer" {	...	@@ -2522,3 +2522,8 @@ test "@intCast vector of signed integer" {
2522	try expect(y[2] == 3);	2522	try expect(y[2] == 3);
2523	try expect(y[3] == 4);	2523	try expect(y[3] == 4);
2524	}	2524	}
		2525
		2526	test "result type is preserved into comptime block" {
		2527	const x: u32 = comptime @intCast(123);
		2528	try expect(x == 123);
		2529	}