From d532c21d890e1aa22cd4c57d6a3f749890256254 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sat, 12 Mar 2022 13:40:47 +0200 Subject: [PATCH] AstGen: fix nosuspendExpr handling result location twice --- lib/std/dwarf.zig | 2 +- src/AstGen.zig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/std/dwarf.zig b/lib/std/dwarf.zig index 12ec357849..93d744ca5f 100644 --- a/lib/std/dwarf.zig +++ b/lib/std/dwarf.zig @@ -822,7 +822,7 @@ pub const DwarfInfo = struct { // in the list itself. // If no starting value is specified use zero. var base_address = compile_unit.die.getAttrAddr(AT.low_pc) catch |err| switch (err) { - error.MissingDebugInfo => 0, + error.MissingDebugInfo => @as(u64, 0), // TODO https://github.com/ziglang/zig/issues/11135 else => return err, }; diff --git a/src/AstGen.zig b/src/AstGen.zig index 97ca9f0a12..f54af8d3fb 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -1035,9 +1035,8 @@ fn nosuspendExpr( }); } gz.nosuspend_node = node; - const result = try expr(gz, scope, rl, body_node); - gz.nosuspend_node = 0; - return rvalue(gz, rl, result, node); + defer gz.nosuspend_node = 0; + return expr(gz, scope, rl, body_node); } fn suspendExpr(