motiejus/zig
1
Fork 0
Code Releases Activity

Sema: fix zirStoreNode crash

Browse Source 
when other function's inferred error set is the return type of a
function, it should not try to insert the error set into it.

this implies that this branch fixes a bug in master branch.
This commit is contained in:
Andrew Kelley
2023-07-16 21:16:40 -07:00
parent 7c66bd39be
commit 3a4d565254
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Sema.zig
View File

@@ -5282,12 +5282,10 @@ fn zirStoreNode(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!v
// %b = store(%a, %c)
// Where %c is an error union or error set. In such case we need to add
// to the current function's inferred error set, if any.
if (is_ret and (sema.typeOf(operand).zigTypeTag(mod) == .ErrorUnion or
sema.typeOf(operand).zigTypeTag(mod) == .ErrorSet) and
sema.fn_ret_ty.zigTypeTag(mod) == .ErrorUnion)
{
try sema.addToInferredErrorSet(operand);
}
if (is_ret and sema.fn_ret_ty_ies != null) switch (sema.typeOf(operand).zigTypeTag(mod)) {
.ErrorUnion, .ErrorSet => try sema.addToInferredErrorSet(operand),
else => {},
};
const ptr_src: LazySrcLoc = .{ .node_offset_store_ptr = inst_data.src_node };
const operand_src: LazySrcLoc = .{ .node_offset_store_operand = inst_data.src_node };