aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2022-11-25 02:05:58 +0200
committerVeikka Tuominen <git@vexu.eu>2022-11-26 18:05:27 +0200
commitbf62cb453bb1e91cd0ed448de70bd4f076b81906 (patch)
treef889443716b7b02409be001a1f7aa273d741ddc8 /src
parentd0dd0bda1c8773243f98ac1e073afc32c4ce4cf2 (diff)
downloadzig-bf62cb453bb1e91cd0ed448de70bd4f076b81906.tar.gz
zig-bf62cb453bb1e91cd0ed448de70bd4f076b81906.zip
Sema: handle anytype parameter requiring comptime
Closes #13645
Diffstat (limited to 'src')
-rw-r--r--src/Sema.zig19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index d414bfc1ce..65bdf7e1e0 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -7031,16 +7031,21 @@ fn instantiateGenericCall(
}
const arg = uncasted_args[arg_i];
if (is_comptime) {
- if (try sema.resolveMaybeUndefVal(arg)) |arg_val| {
- const child_arg = try child_sema.addConstant(sema.typeOf(arg), arg_val);
- child_sema.inst_map.putAssumeCapacityNoClobber(inst, child_arg);
- } else {
- return sema.failWithNeededComptime(block, .unneeded, "");
- }
+ const arg_val = (try sema.resolveMaybeUndefVal(arg)).?;
+ const child_arg = try child_sema.addConstant(sema.typeOf(arg), arg_val);
+ child_sema.inst_map.putAssumeCapacityNoClobber(inst, child_arg);
} else if (is_anytype) {
const arg_ty = sema.typeOf(arg);
if (try sema.typeRequiresComptime(arg_ty)) {
- const arg_val = try sema.resolveConstValue(block, .unneeded, arg, "");
+ const arg_val = sema.resolveConstValue(block, .unneeded, arg, "") catch |err| switch (err) {
+ error.NeededSourceLocation => {
+ const decl = sema.mod.declPtr(block.src_decl);
+ const arg_src = Module.argSrc(call_src.node_offset.x, sema.gpa, decl, arg_i, bound_arg_src);
+ _ = try sema.resolveConstValue(block, arg_src, arg, "argument to parameter with comptime-only type must be comptime-known");
+ return error.AnalysisFail;
+ },
+ else => |e| return e,
+ };
const child_arg = try child_sema.addConstant(arg_ty, arg_val);
child_sema.inst_map.putAssumeCapacityNoClobber(inst, child_arg);
} else {