zig

commit 6e5bdb5397b5ec5ff3dd6e3ca6f7f93a9b6bfde9 (tree)
parent ec358d6db5a10989590e11bbbbd3bed9f81cf1f4
Author: David Rubin <87927264+Rexicon226@users.noreply.github.com>
Date:   Wed, 17 Jan 2024 16:46:00 -0800

add type check to `zirSwitchBlockErrUnion`


Diffstat:
M
src/Sema.zig
 | 
14
+++++++++++---
A
test/cases/compile_errors/switch_on_non_err_union.zig
 | 
11
+++++++++++

2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -11255,10 +11255,18 @@ fn zirSwitchBlockErrUnion(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Comp
     defer seen_errors.deinit();
 
     const operand_ty = sema.typeOf(raw_operand_val);
-    const operand_err_set_ty = if (extra.data.bits.payload_is_ref)
-        operand_ty.childType(mod).errorUnionSet(mod)
+    const operand_err_set = if (extra.data.bits.payload_is_ref)
+        operand_ty.childType(mod)
     else
-        operand_ty.errorUnionSet(mod);
+        operand_ty;
+
+    if (operand_err_set.zigTypeTag(mod) != .ErrorUnion) {
+        return sema.fail(block, switch_src, "expected error union type, found '{}'", .{
+            operand_ty.fmt(mod),
+        });
+    }
+
+    const operand_err_set_ty = operand_err_set.errorUnionSet(mod);
 
     const block_inst: Air.Inst.Index = @enumFromInt(sema.air_instructions.len);
     try sema.air_instructions.append(gpa, .{
diff --git a/test/cases/compile_errors/switch_on_non_err_union.zig b/test/cases/compile_errors/switch_on_non_err_union.zig
@@ -0,0 +1,11 @@
+pub fn main() void {
+    false catch |err| switch (err) {
+        else => {},
+    };
+}
+
+// error
+// backend=stage2
+// target=native
+//
+// :2:23: error: expected error union type, found 'bool'