mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-02 03:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: fix incorrect logic for adding implicit return instruction

Browse Source
This commit is contained in:
Andrew Kelley 2021-05-08 13:46:48 -07:00
parent 3d351c91d8
commit b98a753b52
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AstGen.zig
View File

@ -2864,9 +2864,14 @@ fn fnDecl(
_ = try expr(&fn_gz, params_scope, .none, body_node);
}
if (fn_gz.instructions.items.len == 0 or
!astgen.instructions.items(.tag)[fn_gz.instructions.items.len - 1].isNoReturn())
{
const need_implicit_ret = blk: {
if (fn_gz.instructions.items.len == 0)
break :blk true;
const last = fn_gz.instructions.items[fn_gz.instructions.items.len - 1];
const zir_tags = astgen.instructions.items(.tag);
break :blk !zir_tags[last].isNoReturn();
};
if (need_implicit_ret) {
// Since we are adding the return instruction here, we must handle the coercion.
// We do this by using the `ret_coerce` instruction.
_ = try fn_gz.addUnTok(.ret_coerce, .void_value, tree.lastToken(body_node));