aboutsummaryrefslogtreecommitdiff
path: root/src/Sema.zig
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2022-08-11 22:45:15 +0300
committerVeikka Tuominen <git@vexu.eu>2022-08-12 11:40:37 +0300
commit7c9979a02e830a4383995e66ff623a7d07cac091 (patch)
tree81d0cc15b1c60eaf618ea0d3660f7ca81b7b39de /src/Sema.zig
parentfa50e179f7f8d523ff00be4cac90bf7659394140 (diff)
downloadzig-7c9979a02e830a4383995e66ff623a7d07cac091.tar.gz
zig-7c9979a02e830a4383995e66ff623a7d07cac091.zip
stage2: generate a switch for `@errSetCast` safety
Diffstat (limited to 'src/Sema.zig')
-rw-r--r--src/Sema.zig13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index f9b37f5b49..3e62344a04 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -17359,17 +17359,10 @@ fn zirErrSetCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstDat
}
try sema.requireRuntimeBlock(block, src, operand_src);
- if (block.wantSafety() and !dest_ty.isAnyError()) {
+ if (block.wantSafety() and !dest_ty.isAnyError() and sema.mod.comp.bin_file.options.use_llvm) {
const err_int_inst = try block.addBitCast(Type.u16, operand);
- // TODO: Output a switch instead of chained OR's.
- var found_match: Air.Inst.Ref = undefined;
- for (dest_ty.errorSetNames()) |dest_err_name, i| {
- const dest_err_int = (try sema.mod.getErrorValue(dest_err_name)).value;
- const dest_err_int_inst = try sema.addIntUnsigned(Type.u16, dest_err_int);
- const next_match = try block.addBinOp(.cmp_eq, dest_err_int_inst, err_int_inst);
- found_match = if (i == 0) next_match else try block.addBinOp(.bool_or, found_match, next_match);
- }
- try sema.addSafetyCheck(block, found_match, .invalid_error_code);
+ const ok = try block.addTyOp(.error_set_has_value, dest_ty, err_int_inst);
+ try sema.addSafetyCheck(block, ok, .invalid_error_code);
}
return block.addBitCast(dest_ty, operand);
}