Commit 9630379a8ec593adc65880e814e4c7161b6d5775 | zig

author	Jacob Young <jacobly@ziglang.org> 2023-08-09 08:01:31-04:00
committer	Jacob Young <jacobly@ziglang.org> 2023-08-09 10:09:01-04:00
log	9630379a8ec593adc65880e814e4c7161b6d5775
tree	d24df5d466fce2251d4ed0ff54d430f0961a3271
parent	cd7998096b624b326dddcbb2752fe4bcdac8df9f

Sema: fix generic method argument source locations

3 files changed, 49 insertions(+), 25 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    generic_method_call_invalid_coercion.zig
    generic_method_call_with_invalid_param.zig

src/Sema.zig+19-4

 @@ -70,6 +70,7 @@ generic_owner: InternPool.Index = .none,
 /// instantiation can point back to the instantiation site in addition to the
 /// declaration site.
 generic_call_src: LazySrcLoc = .unneeded,
+generic_bound_arg_src: ?LazySrcLoc = null,
 /// Corresponds to `generic_call_src`.
 generic_call_decl: Decl.OptionalIndex = .none,
 /// The key is types that must be fully resolved prior to machine code
 @@ -7077,16 +7078,19 @@ fn analyzeCall(
         const parent_fn_ret_ty_ies = sema.fn_ret_ty_ies;
         const parent_generic_owner = sema.generic_owner;
         const parent_generic_call_src = sema.generic_call_src;
+        const parent_generic_bound_arg_src = sema.generic_bound_arg_src;
         const parent_generic_call_decl = sema.generic_call_decl;
         sema.fn_ret_ty = bare_return_type;
         sema.fn_ret_ty_ies = null;
         sema.generic_owner = .none;
         sema.generic_call_src = .unneeded;
+        sema.generic_bound_arg_src = null;
         sema.generic_call_decl = .none;
         defer sema.fn_ret_ty = parent_fn_ret_ty;
         defer sema.fn_ret_ty_ies = parent_fn_ret_ty_ies;
         defer sema.generic_owner = parent_generic_owner;
         defer sema.generic_call_src = parent_generic_call_src;
+        defer sema.generic_bound_arg_src = parent_generic_bound_arg_src;
         defer sema.generic_call_decl = parent_generic_call_decl;
         if (module_fn.analysis(ip).inferred_error_set) {
 @@ -7545,6 +7549,7 @@ fn instantiateGenericCall(
         .comptime_args = comptime_args,
         .generic_owner = generic_owner,
         .generic_call_src = call_src,
+        .generic_bound_arg_src = bound_arg_src,
         .generic_call_decl = block.src_decl.toOptional(),
         .branch_quota = sema.branch_quota,
         .branch_count = sema.branch_count,
 @@ -8583,17 +8588,20 @@ fn resolveGenericBody(
         const prev_no_partial_func_type = sema.no_partial_func_ty;
         const prev_generic_owner = sema.generic_owner;
         const prev_generic_call_src = sema.generic_call_src;
+        const prev_generic_bound_arg_src = sema.generic_bound_arg_src;
         const prev_generic_call_decl = sema.generic_call_decl;
         block.params = .{};
         sema.no_partial_func_ty = true;
         sema.generic_owner = .none;
         sema.generic_call_src = .unneeded;
+        sema.generic_bound_arg_src = null;
         sema.generic_call_decl = .none;
         defer {
             block.params = prev_params;
             sema.no_partial_func_ty = prev_no_partial_func_type;
             sema.generic_owner = prev_generic_owner;
             sema.generic_call_src = prev_generic_call_src;
+            sema.generic_bound_arg_src = prev_generic_bound_arg_src;
             sema.generic_call_decl = prev_generic_call_decl;
         }
 @@ -9235,17 +9243,20 @@ fn zirParam(
             const prev_no_partial_func_type = sema.no_partial_func_ty;
             const prev_generic_owner = sema.generic_owner;
             const prev_generic_call_src = sema.generic_call_src;
+            const prev_generic_bound_arg_src = sema.generic_bound_arg_src;
             const prev_generic_call_decl = sema.generic_call_decl;
             block.params = .{};
             sema.no_partial_func_ty = true;
             sema.generic_owner = .none;
             sema.generic_call_src = .unneeded;
+            sema.generic_bound_arg_src = null;
             sema.generic_call_decl = .none;
             defer {
                 block.params = prev_params;
                 sema.no_partial_func_ty = prev_no_partial_func_type;
                 sema.generic_owner = prev_generic_owner;
                 sema.generic_call_src = prev_generic_call_src;
+                sema.generic_bound_arg_src = prev_generic_bound_arg_src;
                 sema.generic_call_decl = prev_generic_call_decl;
             }
 @@ -9319,10 +9330,12 @@ fn zirParam(
                 sema.comptime_args[param_index] = val.toIntern();
                 return;
             }
-            const arg_src: LazySrcLoc = if (sema.generic_call_src == .node_offset) .{ .call_arg = .{
+            const arg_src: LazySrcLoc = if (param_index == 0 and sema.generic_bound_arg_src != null)
+                sema.generic_bound_arg_src.?
+            else if (sema.generic_call_src == .node_offset) .{ .call_arg = .{
                 .decl = sema.generic_call_decl.unwrap().?,
                 .call_node_offset = sema.generic_call_src.node_offset.x,
-                .arg_index = param_index,
+                .arg_index = param_index - @intFromBool(sema.generic_bound_arg_src != null),
             } } else src;
             const msg = msg: {
                 const src_loc = arg_src.toSrcLoc(mod.declPtr(block.src_decl), mod);
 @@ -9385,10 +9398,12 @@ fn zirParamAnytype(
             sema.comptime_args[param_index] = opv.toIntern();
             return;
         }
-        const arg_src: LazySrcLoc = if (sema.generic_call_src == .node_offset) .{ .call_arg = .{
+        const arg_src: LazySrcLoc = if (param_index == 0 and sema.generic_bound_arg_src != null)
+            sema.generic_bound_arg_src.?
+        else if (sema.generic_call_src == .node_offset) .{ .call_arg = .{
             .decl = sema.generic_call_decl.unwrap().?,
             .call_node_offset = sema.generic_call_src.node_offset.x,
-            .arg_index = param_index,
+            .arg_index = param_index - @intFromBool(sema.generic_bound_arg_src != null),
         } } else src;
         if (comptime_syntax) {

test/cases/compile_errors/generic_method_call_invalid_coercion.zig deleted-21

...	@@ -1,21 +0,0 @@
1	export fn callBoolMethod() void {
2	const s = S{};
3	s.boolMethod({});
4	}
5
6	export fn callVoidMethod() void {
7	const s = S{};
8	s.voidMethod(false);
9	}
10
11	const S = struct {
12	fn boolMethod(comptime _: @This(), _: bool) void {}
13	fn voidMethod(comptime _: @This(), _: void) void {}
14	};
15
16	// error
17	// backend=stage2
18	// target=native
19	//
20	// :3:18: error: expected type 'bool', found 'void'
21	// :8:18: error: expected type 'void', found 'bool'

test/cases/compile_errors/generic_method_call_with_invalid_param.zig created+30

...	@@ -0,0 +1,30 @@
1	export fn callBoolMethodWithVoid() void {
2	const s = S{};
3	s.boolMethod({});
4	}
5
6	export fn callVoidMethodWithBool() void {
7	const s = S{};
8	s.voidMethod(false);
9	}
10
11	export fn callComptimeBoolMethodWithRuntimeBool() void {
12	const s = S{};
13	var arg = true;
14	s.comptimeBoolMethod(arg);
15	}
16
17	const S = struct {
18	fn boolMethod(comptime _: @This(), _: bool) void {}
19	fn voidMethod(comptime _: @This(), _: void) void {}
20	fn comptimeBoolMethod(comptime _: @This(), comptime _: bool) void {}
21	};
22
23	// error
24	// backend=stage2
25	// target=native
26	//
27	// :3:18: error: expected type 'bool', found 'void'
28	// :8:18: error: expected type 'void', found 'bool'
29	// :14:26: error: runtime-known argument passed to comptime parameter
30	// :20:57: note: declared comptime here