Commit 9f055e2eb0252d872c9111e60ef7c0802d91bea6 | zig

author	Veikka Tuominen <git@vexu.eu> 2022-11-22 17:56:14+02:00
committer	Veikka Tuominen <git@vexu.eu> 2022-11-23 22:16:31+02:00
log	9f055e2eb0252d872c9111e60ef7c0802d91bea6
tree	eff808b42378164a030e946542af1660e5e1c6a1
parent	8eea73fb922c1c7fab4b8bf1717588464691a66e

Sema: improve compile error for tuple coercion mismatch

2 files changed, 12 insertions(+), 4 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    type_mismatch_with_tuple_concatenation.zig

src/Sema.zig+11-3

 @@ -24206,7 +24206,10 @@ fn coerceExtra(
                             inst_ty.childType().isAnonStruct() and
                             sema.checkPtrAttributes(dest_ty, inst_ty, &in_memory_result))
                         {
-                            return sema.coerceAnonStructToStructPtrs(block, dest_ty, dest_ty_src, inst, inst_src);
+                            return sema.coerceAnonStructToStructPtrs(block, dest_ty, dest_ty_src, inst, inst_src) catch |err| switch (err) {
+                                error.NotCoercible => break :pointer,
+                                else => |e| return e,
+                            };
                         }
                     },
                     .Array => {
 @@ -24519,12 +24522,15 @@ fn coerceExtra(
             },
             else => {},
         },
-        .Struct => {
+        .Struct => blk: {
             if (inst == .empty_struct) {
                 return sema.structInitEmpty(block, dest_ty, dest_ty_src, inst_src);
             }
             if (inst_ty.isTupleOrAnonStruct()) {
-                return sema.coerceTupleToStruct(block, dest_ty, inst, inst_src);
+                return sema.coerceTupleToStruct(block, dest_ty, inst, inst_src) catch |err| switch (err) {
+                    error.NotCoercible => break :blk,
+                    else => |e| return e,
+                };
             }
         },
         else => {},
 @@ -27215,6 +27221,8 @@ fn coerceTupleToTuple(
     const inst_ty = sema.typeOf(inst);
     const inst_field_count = inst_ty.structFieldCount();
+    if (inst_field_count > dest_field_count) return error.NotCoercible;
     var runtime_src: ?LazySrcLoc = null;
     var field_i: u32 = 0;
     while (field_i < inst_field_count) : (field_i += 1) {

test/cases/compile_errors/type_mismatch_with_tuple_concatenation.zig+1-1

...	@@ -7,4 +7,4 @@ export fn entry() void {	...	@@ -7,4 +7,4 @@ export fn entry() void {
7	// backend=stage2	7	// backend=stage2
8	// target=native	8	// target=native
9	//	9	//
10	// :3:11: error: index '0' out of bounds of tuple '@TypeOf(.{})'	10	// :3:11: error: expected type '@TypeOf(.{})', found 'tuple{comptime comptime_int = 1, comptime comptime_int = 2, comptime comptime_int = 3}'