Commit 3085e2af4197193f08ea95d80afb2cf982227334 | zig

author	Evin Yulo <yujiri@disroot.org> 2023-05-31 08:05:55-04:00
committer	Veikka Tuominen <git@vexu.eu> 2023-05-31 19:18:36+03:00
log	3085e2af4197193f08ea95d80afb2cf982227334
tree	5bdd8be63ea03f2396e1d35fe5a50697f7ce6710
parent	cd1417dbdf098634641e87dba4c3be2806d76250

add missing note "operation is runtime due to this operand"

3 files changed, 42 insertions(+), 23 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    unable_to_evaluate_comptime_expr.zig
    unable_to_evaluate_comptime_expr_with_inferred_type.zig

src/Sema.zig+16-6

 @@ -17961,20 +17961,21 @@ fn finishStructInit(
         return sema.failWithOwnedErrorMsg(msg);
     }
-    const is_comptime = for (field_inits) |field_init| {
+    // Find which field forces the expression to be runtime, if any.
+    const opt_runtime_index = for (field_inits, 0..) |field_init, i| {
         if (!(try sema.isComptimeKnown(field_init))) {
-            break false;
+            break i;
         }
-    } else true;
+    } else null;
-    if (is_comptime) {
+    const runtime_index = opt_runtime_index orelse {
         const values = try sema.arena.alloc(Value, field_inits.len);
         for (field_inits, 0..) |field_init, i| {
             values[i] = (sema.resolveMaybeUndefVal(field_init) catch unreachable).?;
         }
         const struct_val = try Value.Tag.aggregate.create(sema.arena, values);
         return sema.addConstantMaybeRef(block, struct_ty, struct_val, is_ref);
-    }
+    };
     if (is_ref) {
         try sema.resolveStructLayout(struct_ty);
 @@ -17994,7 +17995,15 @@ fn finishStructInit(
         return sema.makePtrConst(block, alloc);
     }
-    try sema.requireRuntimeBlock(block, dest_src, null);
+    sema.requireRuntimeBlock(block, .unneeded, null) catch |err| switch (err) {
+        error.NeededSourceLocation => {
+            const decl = sema.mod.declPtr(block.src_decl);
+            const field_src = Module.initSrc(dest_src.node_offset.x, sema.gpa, decl, runtime_index);
+            try sema.requireRuntimeBlock(block, dest_src, field_src);
+            unreachable;
+        },
+        else => |e| return e,
+    };
     try sema.queueFullTypeResolution(struct_ty);
     return block.addAggregateInit(struct_ty, field_inits);
 }
 @@ -18014,6 +18023,7 @@ fn zirStructInitAnon(
     defer fields.deinit(sema.gpa);
     try fields.ensureUnusedCapacity(sema.gpa, types.len);
+    // Find which field forces the expression to be runtime, if any.
     const opt_runtime_index = rs: {
         var runtime_index: ?usize = null;
         var extra_index = extra.end;

test/cases/compile_errors/unable_to_evaluate_comptime_expr.zig created+26

...	@@ -0,0 +1,26 @@
1	var n: u8 = 5;
2
3	const S = struct {
4	a: u8,
5	};
6
7	var a: S = .{ .a = n };
8
9	pub export fn entry1() void {
10	_ = a;
11	}
12
13	var b: S = S{ .a = n };
14
15	pub export fn entry2() void {
16	_ = b;
17	}
18
19	// error
20	// backend=stage2
21	// target=native
22	//
23	// :7:13: error: unable to evaluate comptime expression
24	// :7:16: note: operation is runtime due to this operand
25	// :13:13: error: unable to evaluate comptime expression
26	// :13:16: note: operation is runtime due to this operand

test/cases/compile_errors/unable_to_evaluate_comptime_expr_with_inferred_type.zig deleted-17

...	@@ -1,17 +0,0 @@
1	const A = struct {
2	a: u8,
3	};
4
5	var n: u8 = 5;
6	var a: A = .{ .a = n };
7
8	pub export fn entry() void {
9	_ = a;
10	}
11
12	// error
13	// backend=stage2
14	// target=native
15	//
16	// :6:13: error: unable to evaluate comptime expression
17	// :6:16: note: operation is runtime due to this operand