Commit 0958d5d7db24222bdcc0fb8e8cdc9838953b9857 | zig

author	Veikka Tuominen <git@vexu.eu> 2023-05-11 12:23:39+03:00
committer	Veikka Tuominen <git@vexu.eu> 2023-05-11 17:23:06+03:00
log	0958d5d7db24222bdcc0fb8e8cdc9838953b9857
tree	21569090326a60c510deaa3fc549237d8b080ffc
parent	c0102ac1c89db1727d7c58d566376a6a79af4e98

Sema: fix crash when generating anon name on invalid code

Closes #15615

3 files changed, 17 insertions(+), 5 deletions(-)

src
- Sema.zig
- print_air.zig
test
- cases
  - compile_errors
    struct_type_returned_from_non-generic_function.zig

src/Sema.zig+7-4

 @@ -2730,9 +2730,13 @@ fn createAnonymousDeclTypeNamed(
             for (fn_info.param_body) |zir_inst| switch (zir_tags[zir_inst]) {
                 .param, .param_comptime, .param_anytype, .param_anytype_comptime => {
                     const arg = sema.inst_map.get(zir_inst).?;
-                    // The comptime call code in analyzeCall already did this, so we're
+                    // If this is being called in a generic function then analyzeCall will
-                    // just repeating it here and it's guaranteed to work.
+                    // have already resolved the args and this will work.
-                    const arg_val = sema.resolveConstMaybeUndefVal(block, .unneeded, arg, "") catch unreachable;
+                    // If not then this is a struct type being returned from a non-generic
+                    // function and the name doesn't matter since it will later
+                    // result in a compile error.
+                    const arg_val = sema.resolveConstMaybeUndefVal(block, .unneeded, arg, "") catch
+                        return sema.createAnonymousDeclTypeNamed(block, src, typed_value, .anon, anon_prefix, null);
                     if (arg_i != 0) try buf.appendSlice(",");
                     try buf.writer().print("{}", .{arg_val.fmtValue(sema.typeOf(arg), sema.mod)});
 @@ -6562,7 +6566,6 @@ fn analyzeCall(
 ) CompileError!Air.Inst.Ref {
     const mod = sema.mod;
     const callee_ty = sema.typeOf(func);
     const func_ty_info = func_ty.fnInfo();
     const fn_params_len = func_ty_info.param_types.len;

src/print_air.zig-1

...	@@ -917,7 +917,6 @@ const Writer = struct {	...	@@ -917,7 +917,6 @@ const Writer = struct {
917		917
918	try s.writeAll("\n");	918	try s.writeAll("\n");
919	try s.writeByteNTimes(' ', old_indent);	919	try s.writeByteNTimes(' ', old_indent);
920	try s.writeAll("}");
921	}	920	}
922		921
923	fn writeWasmMemorySize(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {	922	fn writeWasmMemorySize(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {

test/cases/compile_errors/struct_type_returned_from_non-generic_function.zig created+10

...	@@ -0,0 +1,10 @@
1	pub export fn entry(param: usize) usize {
2	return struct{ param };
3	}
4
5	// error
6	// backend=stage2
7	// target=native
8	//
9	// :2:12: error: expected type 'usize', found 'type'
10	// :1:35: note: function return type declared here