diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-02-26 21:47:22 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-02-26 21:47:22 -0700 |
| commit | 4d658f83ed3893cf950615e9f58c2b533525b71d (patch) | |
| tree | 56c59a4096623f4aa96d119bb4e50cf229f7c68e /src | |
| parent | 2687b8f7f4825c9018af6998e1de140e6185f9cd (diff) | |
| download | zig-4d658f83ed3893cf950615e9f58c2b533525b71d.tar.gz zig-4d658f83ed3893cf950615e9f58c2b533525b71d.zip | |
Sema: handle error.GenericPoison in fieldVal
Brings us 1 crash closer to formatted printing test cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Sema.zig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index dc79310028..8e93d2525b 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -3698,11 +3698,7 @@ fn zirSuspendBlock(sema: *Sema, parent_block: *Block, inst: Zir.Inst.Index) Comp return sema.fail(parent_block, src, "TODO: implement Sema.zirSuspendBlock", .{}); } -fn zirBlock( - sema: *Sema, - parent_block: *Block, - inst: Zir.Inst.Index, -) CompileError!Air.Inst.Ref { +fn zirBlock(sema: *Sema, parent_block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref { const tracy = trace(@src()); defer tracy.end(); @@ -3747,9 +3743,7 @@ fn zirBlock( defer merges.results.deinit(gpa); defer merges.br_list.deinit(gpa); - _ = try sema.analyzeBody(&child_block, body); - - return sema.analyzeBlockBody(parent_block, src, &child_block, merges); + return sema.resolveBlockBody(parent_block, src, &child_block, body, inst, merges); } fn resolveBlockBody( @@ -14000,7 +13994,7 @@ fn fieldVal( var to_type_buffer: Value.ToTypeBuffer = undefined; const child_type = val.toType(&to_type_buffer); - switch (child_type.zigTypeTag()) { + switch (try child_type.zigTypeTagOrPoison()) { .ErrorSet => { const name: []const u8 = if (child_type.castTag(.error_set)) |payload| blk: { if (payload.data.names.getEntry(field_name)) |entry| { |