aboutsummaryrefslogtreecommitdiff
path: root/src/Sema.zig
diff options
context:
space:
mode:
authorshwqf <vvvv0932313@gmail.com>2022-12-18 10:09:35 +0800
committerVeikka Tuominen <git@vexu.eu>2022-12-18 16:04:33 +0200
commit11a81e1b29ecefd7aad2ebe951743c44272e1817 (patch)
tree63d552572489cee8086e188aac899b41481ae871 /src/Sema.zig
parentf24c77fc48b7272618b48cac7bb15d6997e95c5a (diff)
downloadzig-11a81e1b29ecefd7aad2ebe951743c44272e1817.tar.gz
zig-11a81e1b29ecefd7aad2ebe951743c44272e1817.zip
Call ensureResultUsed before comptime .call is evaluated.
Fixes #12580
Diffstat (limited to 'src/Sema.zig')
-rw-r--r--src/Sema.zig17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index 4e088d9fb1..38a095f898 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -3254,17 +3254,16 @@ fn zirEnsureResultUsed(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Compile
const operand = try sema.resolveInst(inst_data.operand);
const src = inst_data.src();
- return sema.ensureResultUsed(block, operand, src);
+ return sema.ensureResultUsed(block, sema.typeOf(operand), src);
}
fn ensureResultUsed(
sema: *Sema,
block: *Block,
- operand: Air.Inst.Ref,
+ ty: Type,
src: LazySrcLoc,
) CompileError!void {
- const operand_ty = sema.typeOf(operand);
- switch (operand_ty.zigTypeTag()) {
+ switch (ty.zigTypeTag()) {
.Void, .NoReturn => return,
.ErrorSet, .ErrorUnion => {
const msg = msg: {
@@ -3277,7 +3276,7 @@ fn ensureResultUsed(
},
else => {
const msg = msg: {
- const msg = try sema.errMsg(block, src, "value of type '{}' ignored", .{operand_ty.fmt(sema.mod)});
+ const msg = try sema.errMsg(block, src, "value of type '{}' ignored", .{ty.fmt(sema.mod)});
errdefer msg.destroy(sema.gpa);
try sema.errNote(block, src, msg, "all non-void values must be used", .{});
try sema.errNote(block, src, msg, "this error can be suppressed by assigning the value to '_'", .{});
@@ -6641,6 +6640,10 @@ fn analyzeCall(
};
}
+ if (is_comptime_call and ensure_result_used) {
+ try sema.ensureResultUsed(block, fn_ret_ty, call_src);
+ }
+
const result = result: {
sema.analyzeBody(&child_block, fn_info.body) catch |err| switch (err) {
error.ComptimeReturn => break :result inlining.comptime_result,
@@ -6763,7 +6766,7 @@ fn analyzeCall(
};
if (ensure_result_used) {
- try sema.ensureResultUsed(block, result, call_src);
+ try sema.ensureResultUsed(block, sema.typeOf(result), call_src);
}
if (call_tag == .call_always_tail) {
return sema.handleTailCall(block, call_src, func_ty, result);
@@ -7406,7 +7409,7 @@ fn instantiateGenericCall(
sema.appendRefsAssumeCapacity(runtime_args);
if (ensure_result_used) {
- try sema.ensureResultUsed(block, result, call_src);
+ try sema.ensureResultUsed(block, sema.typeOf(result), call_src);
}
if (call_tag == .call_always_tail) {
return sema.handleTailCall(block, call_src, func_ty, result);