authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2024-01-31 12:06:47+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-02-09 13:51:51-08:00
log731ff120d0ee68f3ce2eb30648eeaf96a283142d
treedf9c78eec99467ce10264bc6d0b81bfb9d682040
parent32f30399e5cd42af2d670321979aa424803b1819

Sema: catch runtime stores to comptime variables through calls

2 files changed, 29 insertions(+), 11 deletions(-)

src/Sema.zig+14-11
......@@ -341,8 +341,8 @@ pub const Block = struct {
341341 label: ?*Label = null,
342342 inlining: ?*Inlining,
343343 /// If runtime_index is not 0 then one of these is guaranteed to be non null.
344 runtime_cond: ?LazySrcLoc = null,
345 runtime_loop: ?LazySrcLoc = null,
344 runtime_cond: ?Module.SrcLoc = null,
345 runtime_loop: ?Module.SrcLoc = null,
346346 /// This Decl is the Decl according to the Zig source code corresponding to this Block.
347347 /// This can vary during inline or comptime function calls. See `Sema.owner_decl`
348348 /// for the one that will be the same for all Block instances.
......@@ -1504,7 +1504,7 @@ fn analyzeBodyInner(
15041504 const msg = try sema.errMsg(block, src, "comptime control flow inside runtime block", .{});
15051505 errdefer msg.destroy(sema.gpa);
15061506
1507 try sema.errNote(block, runtime_src, msg, "runtime control flow here", .{});
1507 try mod.errNoteNonLazy(runtime_src, msg, "runtime control flow here", .{});
15081508 break :msg msg;
15091509 };
15101510 return sema.failWithOwnedErrorMsg(block, msg);
......@@ -5761,7 +5761,7 @@ fn zirLoop(sema: *Sema, parent_block: *Block, inst: Zir.Inst.Index) CompileError
57615761 var child_block = parent_block.makeSubBlock();
57625762 child_block.label = &label;
57635763 child_block.runtime_cond = null;
5764 child_block.runtime_loop = src;
5764 child_block.runtime_loop = src.toSrcLoc(mod.declPtr(child_block.src_decl), mod);
57655765 child_block.runtime_index.increment();
57665766 const merges = &child_block.label.?.merges;
57675767
......@@ -6049,7 +6049,7 @@ fn analyzeBlockBody(
60496049 errdefer msg.destroy(sema.gpa);
60506050
60516051 const runtime_src = child_block.runtime_cond orelse child_block.runtime_loop.?;
6052 try sema.errNote(child_block, runtime_src, msg, "runtime control flow here", .{});
6052 try mod.errNoteNonLazy(runtime_src, msg, "runtime control flow here", .{});
60536053
60546054 const child_src_decl = mod.declPtr(child_block.src_decl);
60556055 try sema.explainWhyTypeIsComptime(msg, type_src.toSrcLoc(child_src_decl, mod), resolved_ty);
......@@ -7458,6 +7458,9 @@ fn analyzeCall(
74587458 .is_comptime = is_comptime_call,
74597459 .comptime_reason = comptime_reason,
74607460 .error_return_trace_index = block.error_return_trace_index,
7461 .runtime_cond = block.runtime_cond,
7462 .runtime_loop = block.runtime_loop,
7463 .runtime_index = block.runtime_index,
74617464 };
74627465
74637466 const merges = &child_block.inlining.?.merges;
......@@ -11533,7 +11536,7 @@ fn zirSwitchBlockErrUnion(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Comp
1153311536
1153411537 var sub_block = child_block.makeSubBlock();
1153511538 sub_block.runtime_loop = null;
11536 sub_block.runtime_cond = main_operand_src;
11539 sub_block.runtime_cond = main_operand_src.toSrcLoc(mod.declPtr(child_block.src_decl), mod);
1153711540 sub_block.runtime_index.increment();
1153811541 defer sub_block.instructions.deinit(gpa);
1153911542
......@@ -12268,7 +12271,7 @@ fn analyzeSwitchRuntimeBlock(
1226812271
1226912272 var case_block = child_block.makeSubBlock();
1227012273 case_block.runtime_loop = null;
12271 case_block.runtime_cond = operand_src;
12274 case_block.runtime_cond = operand_src.toSrcLoc(mod.declPtr(child_block.src_decl), mod);
1227212275 case_block.runtime_index.increment();
1227312276 defer case_block.instructions.deinit(gpa);
1227412277
......@@ -18810,7 +18813,7 @@ fn zirBoolBr(
1881018813
1881118814 var child_block = parent_block.makeSubBlock();
1881218815 child_block.runtime_loop = null;
18813 child_block.runtime_cond = lhs_src;
18816 child_block.runtime_cond = lhs_src.toSrcLoc(mod.declPtr(child_block.src_decl), mod);
1881418817 child_block.runtime_index.increment();
1881518818 defer child_block.instructions.deinit(gpa);
1881618819
......@@ -19004,7 +19007,7 @@ fn zirCondbr(
1900419007 // instructions array in between using it for the then block and else block.
1900519008 var sub_block = parent_block.makeSubBlock();
1900619009 sub_block.runtime_loop = null;
19007 sub_block.runtime_cond = cond_src;
19010 sub_block.runtime_cond = cond_src.toSrcLoc(mod.declPtr(parent_block.src_decl), mod);
1900819011 sub_block.runtime_index.increment();
1900919012 defer sub_block.instructions.deinit(gpa);
1901019013
......@@ -23543,7 +23546,7 @@ fn checkComptimeVarStore(
2354323546 const msg = msg: {
2354423547 const msg = try sema.errMsg(block, src, "store to comptime variable depends on runtime condition", .{});
2354523548 errdefer msg.destroy(sema.gpa);
23546 try sema.errNote(block, cond_src, msg, "runtime condition here", .{});
23549 try sema.mod.errNoteNonLazy(cond_src, msg, "runtime condition here", .{});
2354723550 break :msg msg;
2354823551 };
2354923552 return sema.failWithOwnedErrorMsg(block, msg);
......@@ -23552,7 +23555,7 @@ fn checkComptimeVarStore(
2355223555 const msg = msg: {
2355323556 const msg = try sema.errMsg(block, src, "cannot store to comptime variable in non-inline loop", .{});
2355423557 errdefer msg.destroy(sema.gpa);
23555 try sema.errNote(block, loop_src, msg, "non-inline loop here", .{});
23558 try sema.mod.errNoteNonLazy(loop_src, msg, "non-inline loop here", .{});
2355623559 break :msg msg;
2355723560 };
2355823561 return sema.failWithOwnedErrorMsg(block, msg);
test/cases/compile_errors/store_to_comptime_var_through_call.zig created+15
......@@ -0,0 +1,15 @@
1export fn entry(b: bool) void {
2 comptime var int = 0;
3 if (b) {
4 comptime incr(&int);
5 }
6}
7fn incr(x: *comptime_int) void {
8 x.* += 1;
9}
10
11// error
12//
13// :8:9: error: store to comptime variable depends on runtime condition
14// :3:9: note: runtime condition here
15// :4:22: note: called from here