aboutsummaryrefslogtreecommitdiff
path: root/src/Sema.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2024-01-29 13:07:37 -0800
committerGitHub <noreply@github.com>2024-01-29 13:07:37 -0800
commitf4f8036ec048daa072c7caa72edd320c85bf426c (patch)
treeb0ab4a567d57e1d562c950c98e810b420ea4f723 /src/Sema.zig
parent3e939e61538706f37abb76a97af0ee77c15b24fc (diff)
parent78e982f7c3e8a441259d26a69690d8934dd32bf0 (diff)
downloadzig-f4f8036ec048daa072c7caa72edd320c85bf426c.tar.gz
zig-f4f8036ec048daa072c7caa72edd320c85bf426c.zip
Merge pull request #18729 from Vexu/fixes
Fix some generic{Reader,Writer} related issues
Diffstat (limited to 'src/Sema.zig')
-rw-r--r--src/Sema.zig5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index af3e3700d7..2c404c476e 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -22368,7 +22368,10 @@ fn zirErrorCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData
try sema.requireRuntimeBlock(block, src, operand_src);
const err_int_ty = try mod.errorIntType();
- if (block.wantSafety() and !dest_ty.isAnyError(mod) and sema.mod.backendSupportsFeature(.error_set_has_value)) {
+ if (block.wantSafety() and !dest_ty.isAnyError(mod) and
+ dest_ty.toIntern() != .adhoc_inferred_error_set_type and
+ sema.mod.backendSupportsFeature(.error_set_has_value))
+ {
if (dest_tag == .ErrorUnion) {
const err_code = try sema.analyzeErrUnionCode(block, operand_src, operand);
const err_int = try block.addBitCast(err_int_ty, err_code);