authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-03-19 21:03:38+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-03-21 09:54:49+01:00
log128e70ff3a056e5b800c624f7157b00fd624509b
tree06d1c96bdf2d0ed2116bda241bbd6fa937ce0d7f
parent153c6cf92e3459038c4ab8251a463163ac89b116

ir: Allow errdefer with payload

Closes #1265

8 files changed, 135 insertions(+), 35 deletions(-)

lib/std/zig/ast.zig+3-4
...@@ -1032,6 +1032,7 @@ pub const Node = struct {...@@ -1032,6 +1032,7 @@ pub const Node = struct {
1032 pub const Defer = struct {1032 pub const Defer = struct {
1033 base: Node = Node{ .id = .Defer },1033 base: Node = Node{ .id = .Defer },
1034 defer_token: TokenIndex,1034 defer_token: TokenIndex,
1035 payload: ?*Node,
1035 expr: *Node,1036 expr: *Node,
10361037
1037 pub fn iterate(self: *Defer, index: usize) ?*Node {1038 pub fn iterate(self: *Defer, index: usize) ?*Node {
...@@ -1833,8 +1834,7 @@ pub const Node = struct {...@@ -1833,8 +1834,7 @@ pub const Node = struct {
1833 var i = index;1834 var i = index;
18341835
1835 switch (self.kind) {1836 switch (self.kind) {
1836 .Break,1837 .Break, .Continue => |maybe_label| {
1837 .Continue => |maybe_label| {
1838 if (maybe_label) |label| {1838 if (maybe_label) |label| {
1839 if (i < 1) return label;1839 if (i < 1) return label;
1840 i -= 1;1840 i -= 1;
...@@ -1861,8 +1861,7 @@ pub const Node = struct {...@@ -1861,8 +1861,7 @@ pub const Node = struct {
1861 }1861 }
18621862
1863 switch (self.kind) {1863 switch (self.kind) {
1864 .Break,1864 .Break, .Continue => |maybe_label| {
1865 .Continue => |maybe_label| {
1866 if (maybe_label) |label| {1865 if (maybe_label) |label| {
1867 return label.lastToken();1866 return label.lastToken();
1868 }1867 }
lib/std/zig/parse.zig+6-1
...@@ -465,7 +465,7 @@ fn parseContainerField(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*No...@@ -465,7 +465,7 @@ fn parseContainerField(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*No
465/// / KEYWORD_noasync BlockExprStatement465/// / KEYWORD_noasync BlockExprStatement
466/// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)466/// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)
467/// / KEYWORD_defer BlockExprStatement467/// / KEYWORD_defer BlockExprStatement
468/// / KEYWORD_errdefer BlockExprStatement468/// / KEYWORD_errdefer Payload? BlockExprStatement
469/// / IfStatement469/// / IfStatement
470/// / LabeledStatement470/// / LabeledStatement
471/// / SwitchExpr471/// / SwitchExpr
...@@ -526,6 +526,10 @@ fn parseStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!?*No...@@ -526,6 +526,10 @@ fn parseStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!?*No
526526
527 const defer_token = eatToken(it, .Keyword_defer) orelse eatToken(it, .Keyword_errdefer);527 const defer_token = eatToken(it, .Keyword_defer) orelse eatToken(it, .Keyword_errdefer);
528 if (defer_token) |token| {528 if (defer_token) |token| {
529 const payload = if (tree.tokens.at(token).id == .Keyword_errdefer)
530 try parsePayload(arena, it, tree)
531 else
532 null;
529 const expr_node = try expectNode(arena, it, tree, parseBlockExprStatement, .{533 const expr_node = try expectNode(arena, it, tree, parseBlockExprStatement, .{
530 .ExpectedBlockOrExpression = .{ .token = it.index },534 .ExpectedBlockOrExpression = .{ .token = it.index },
531 });535 });
...@@ -533,6 +537,7 @@ fn parseStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!?*No...@@ -533,6 +537,7 @@ fn parseStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!?*No
533 node.* = .{537 node.* = .{
534 .defer_token = token,538 .defer_token = token,
535 .expr = expr_node,539 .expr = expr_node,
540 .payload = payload,
536 };541 };
537 return &node.base;542 return &node.base;
538 }543 }
lib/std/zig/parser_test.zig+13
...@@ -1,3 +1,16 @@...@@ -1,3 +1,16 @@
1test "zig fmt: noasync block" {
2 try testCanonical(
3 \\pub fn main() anyerror!void {
4 \\ errdefer |a| x += 1;
5 \\ errdefer |a| {}
6 \\ errdefer |a| {
7 \\ x += 1;
8 \\ }
9 \\}
10 \\
11 );
12}
13
1test "zig fmt: noasync block" {14test "zig fmt: noasync block" {
2 try testCanonical(15 try testCanonical(
3 \\pub fn main() anyerror!void {16 \\pub fn main() anyerror!void {
lib/std/zig/render.zig+3
...@@ -376,6 +376,9 @@ fn renderExpression(...@@ -376,6 +376,9 @@ fn renderExpression(
376 const defer_node = @fieldParentPtr(ast.Node.Defer, "base", base);376 const defer_node = @fieldParentPtr(ast.Node.Defer, "base", base);
377377
378 try renderToken(tree, stream, defer_node.defer_token, indent, start_col, Space.Space);378 try renderToken(tree, stream, defer_node.defer_token, indent, start_col, Space.Space);
379 if (defer_node.payload) |payload| {
380 try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
381 }
379 return renderExpression(allocator, stream, tree, indent, start_col, defer_node.expr, space);382 return renderExpression(allocator, stream, tree, indent, start_col, defer_node.expr, space);
380 },383 },
381 .Comptime => {384 .Comptime => {
src/all_types.hpp+1
...@@ -744,6 +744,7 @@ struct AstNodeReturnExpr {...@@ -744,6 +744,7 @@ struct AstNodeReturnExpr {
744744
745struct AstNodeDefer {745struct AstNodeDefer {
746 ReturnKind kind;746 ReturnKind kind;
747 AstNode *err_payload;
747 AstNode *expr;748 AstNode *expr;
748749
749 // temporary data used in IR generation750 // temporary data used in IR generation
src/ir.cpp+78-27
...@@ -272,6 +272,10 @@ static ResultLoc *no_result_loc(void);...@@ -272,6 +272,10 @@ static ResultLoc *no_result_loc(void);
272static IrInstGen *ir_analyze_test_non_null(IrAnalyze *ira, IrInst *source_inst, IrInstGen *value);272static IrInstGen *ir_analyze_test_non_null(IrAnalyze *ira, IrInst *source_inst, IrInstGen *value);
273static IrInstGen *ir_error_dependency_loop(IrAnalyze *ira, IrInst *source_instr);273static IrInstGen *ir_error_dependency_loop(IrAnalyze *ira, IrInst *source_instr);
274static IrInstGen *ir_const_undef(IrAnalyze *ira, IrInst *source_instruction, ZigType *ty);274static IrInstGen *ir_const_undef(IrAnalyze *ira, IrInst *source_instruction, ZigType *ty);
275static ZigVar *ir_create_var(IrBuilderSrc *irb, AstNode *node, Scope *scope, Buf *name,
276 bool src_is_const, bool gen_is_const, bool is_shadowable, IrInstSrc *is_comptime);
277static void build_decl_var_and_init(IrBuilderSrc *irb, Scope *scope, AstNode *source_node, ZigVar *var,
278 IrInstSrc *init, const char *name_hint, IrInstSrc *is_comptime);
275279
276static void destroy_instruction_src(IrInstSrc *inst) {280static void destroy_instruction_src(IrInstSrc *inst) {
277 switch (inst->id) {281 switch (inst->id) {
...@@ -5011,39 +5015,73 @@ static IrInstSrc *ir_mark_gen(IrInstSrc *instruction) {...@@ -5011,39 +5015,73 @@ static IrInstSrc *ir_mark_gen(IrInstSrc *instruction) {
5011 return instruction;5015 return instruction;
5012}5016}
50135017
5014static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope *outer_scope, bool gen_error_defers) {5018static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope *outer_scope, bool *is_noreturn, IrInstSrc *err_value) {
5015 Scope *scope = inner_scope;5019 Scope *scope = inner_scope;
5016 bool is_noreturn = false;5020 if (is_noreturn != nullptr) *is_noreturn = false;
5017 while (scope != outer_scope) {5021 while (scope != outer_scope) {
5018 if (!scope)5022 if (!scope)
5019 return is_noreturn;5023 return true;
50205024
5021 switch (scope->id) {5025 switch (scope->id) {
5022 case ScopeIdDefer: {5026 case ScopeIdDefer: {
5023 AstNode *defer_node = scope->source_node;5027 AstNode *defer_node = scope->source_node;
5024 assert(defer_node->type == NodeTypeDefer);5028 assert(defer_node->type == NodeTypeDefer);
5025 ReturnKind defer_kind = defer_node->data.defer.kind;5029 ReturnKind defer_kind = defer_node->data.defer.kind;
5026 if (defer_kind == ReturnKindUnconditional ||5030 AstNode *defer_expr_node = defer_node->data.defer.expr;
5027 (gen_error_defers && defer_kind == ReturnKindError))5031 AstNode *defer_var_node = defer_node->data.defer.err_payload;
5028 {5032
5029 AstNode *defer_expr_node = defer_node->data.defer.expr;5033 if (defer_kind == ReturnKindError && err_value == nullptr) {
5030 Scope *defer_expr_scope = defer_node->data.defer.expr_scope;5034 // This is an `errdefer` but we're generating code for a
5031 IrInstSrc *defer_expr_value = ir_gen_node(irb, defer_expr_node, defer_expr_scope);5035 // `return` that doesn't return an error, skip it
5032 if (defer_expr_value != irb->codegen->invalid_inst_src) {5036 scope = scope->parent;
5033 if (defer_expr_value->is_noreturn) {5037 continue;
5034 is_noreturn = true;5038 }
5035 } else {5039
5036 ir_mark_gen(ir_build_check_statement_is_void(irb, defer_expr_scope, defer_expr_node,5040 Scope *defer_expr_scope = defer_node->data.defer.expr_scope;
5037 defer_expr_value));5041 if (defer_var_node != nullptr) {
5038 }5042 assert(defer_kind == ReturnKindError);
5043 assert(defer_var_node->type == NodeTypeSymbol);
5044 Buf *var_name = defer_var_node->data.symbol_expr.symbol;
5045
5046 if (defer_expr_node->type == NodeTypeUnreachable) {
5047 add_node_error(irb->codegen, defer_var_node,
5048 buf_sprintf("unused variable: '%s'", buf_ptr(var_name)));
5049 return false;
5050 }
5051
5052 IrInstSrc *is_comptime;
5053 if (ir_should_inline(irb->exec, defer_expr_scope)) {
5054 is_comptime = ir_build_const_bool(irb, defer_expr_scope,
5055 defer_expr_node, true);
5056 } else {
5057 is_comptime = ir_build_test_comptime(irb, defer_expr_scope,
5058 defer_expr_node, err_value);
5039 }5059 }
5060
5061 ZigVar *err_var = ir_create_var(irb, defer_var_node, defer_expr_scope,
5062 var_name, true, true, false, is_comptime);
5063 build_decl_var_and_init(irb, defer_expr_scope, defer_var_node, err_var, err_value,
5064 buf_ptr(var_name), is_comptime);
5065
5066 defer_expr_scope = err_var->child_scope;
5067 }
5068
5069 IrInstSrc *defer_expr_value = ir_gen_node(irb, defer_expr_node, defer_expr_scope);
5070 if (defer_expr_value == irb->codegen->invalid_inst_src)
5071 return irb->codegen->invalid_inst_src;
5072
5073 if (defer_expr_value->is_noreturn) {
5074 if (is_noreturn != nullptr) *is_noreturn = true;
5075 } else {
5076 ir_mark_gen(ir_build_check_statement_is_void(irb, defer_expr_scope, defer_expr_node,
5077 defer_expr_value));
5040 }5078 }
5041 scope = scope->parent;5079 scope = scope->parent;
5042 continue;5080 continue;
5043 }5081 }
5044 case ScopeIdDecls:5082 case ScopeIdDecls:
5045 case ScopeIdFnDef:5083 case ScopeIdFnDef:
5046 return is_noreturn;5084 return true;
5047 case ScopeIdBlock:5085 case ScopeIdBlock:
5048 case ScopeIdVarDecl:5086 case ScopeIdVarDecl:
5049 case ScopeIdLoop:5087 case ScopeIdLoop:
...@@ -5060,7 +5098,7 @@ static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope...@@ -5060,7 +5098,7 @@ static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope
5060 zig_unreachable();5098 zig_unreachable();
5061 }5099 }
5062 }5100 }
5063 return is_noreturn;5101 return true;
5064}5102}
50655103
5066static void ir_set_cursor_at_end_gen(IrBuilderGen *irb, IrBasicBlockGen *basic_block) {5104static void ir_set_cursor_at_end_gen(IrBuilderGen *irb, IrBasicBlockGen *basic_block) {
...@@ -5146,7 +5184,8 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,...@@ -5146,7 +5184,8 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,
5146 bool have_err_defers = defer_counts[ReturnKindError] > 0;5184 bool have_err_defers = defer_counts[ReturnKindError] > 0;
5147 if (!have_err_defers && !irb->codegen->have_err_ret_tracing) {5185 if (!have_err_defers && !irb->codegen->have_err_ret_tracing) {
5148 // only generate unconditional defers5186 // only generate unconditional defers
5149 ir_gen_defers_for_block(irb, scope, outer_scope, false);5187 if (!ir_gen_defers_for_block(irb, scope, outer_scope, nullptr, nullptr))
5188 return irb->codegen->invalid_inst_src;
5150 IrInstSrc *result = ir_build_return_src(irb, scope, node, nullptr);5189 IrInstSrc *result = ir_build_return_src(irb, scope, node, nullptr);
5151 result_loc_ret->base.source_instruction = result;5190 result_loc_ret->base.source_instruction = result;
5152 return result;5191 return result;
...@@ -5169,14 +5208,16 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,...@@ -5169,14 +5208,16 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,
5169 IrBasicBlockSrc *ret_stmt_block = ir_create_basic_block(irb, scope, "RetStmt");5208 IrBasicBlockSrc *ret_stmt_block = ir_create_basic_block(irb, scope, "RetStmt");
51705209
5171 ir_set_cursor_at_end_and_append_block(irb, err_block);5210 ir_set_cursor_at_end_and_append_block(irb, err_block);
5172 ir_gen_defers_for_block(irb, scope, outer_scope, true);5211 if (!ir_gen_defers_for_block(irb, scope, outer_scope, nullptr, return_value))
5212 return irb->codegen->invalid_inst_src;
5173 if (irb->codegen->have_err_ret_tracing && !should_inline) {5213 if (irb->codegen->have_err_ret_tracing && !should_inline) {
5174 ir_build_save_err_ret_addr_src(irb, scope, node);5214 ir_build_save_err_ret_addr_src(irb, scope, node);
5175 }5215 }
5176 ir_build_br(irb, scope, node, ret_stmt_block, is_comptime);5216 ir_build_br(irb, scope, node, ret_stmt_block, is_comptime);
51775217
5178 ir_set_cursor_at_end_and_append_block(irb, ok_block);5218 ir_set_cursor_at_end_and_append_block(irb, ok_block);
5179 ir_gen_defers_for_block(irb, scope, outer_scope, false);5219 if (!ir_gen_defers_for_block(irb, scope, outer_scope, nullptr, nullptr))
5220 return irb->codegen->invalid_inst_src;
5180 ir_build_br(irb, scope, node, ret_stmt_block, is_comptime);5221 ir_build_br(irb, scope, node, ret_stmt_block, is_comptime);
51815222
5182 ir_set_cursor_at_end_and_append_block(irb, ret_stmt_block);5223 ir_set_cursor_at_end_and_append_block(irb, ret_stmt_block);
...@@ -5213,7 +5254,12 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,...@@ -5213,7 +5254,12 @@ static IrInstSrc *ir_gen_return(IrBuilderSrc *irb, Scope *scope, AstNode *node,
5213 result_loc_ret->base.id = ResultLocIdReturn;5254 result_loc_ret->base.id = ResultLocIdReturn;
5214 ir_build_reset_result(irb, scope, node, &result_loc_ret->base);5255 ir_build_reset_result(irb, scope, node, &result_loc_ret->base);
5215 ir_build_end_expr(irb, scope, node, err_val, &result_loc_ret->base);5256 ir_build_end_expr(irb, scope, node, err_val, &result_loc_ret->base);
5216 if (!ir_gen_defers_for_block(irb, scope, outer_scope, true)) {5257
5258 bool is_noreturn = false;
5259 if (!ir_gen_defers_for_block(irb, scope, outer_scope, &is_noreturn, err_val)) {
5260 return irb->codegen->invalid_inst_src;
5261 }
5262 if (!is_noreturn) {
5217 if (irb->codegen->have_err_ret_tracing && !should_inline) {5263 if (irb->codegen->have_err_ret_tracing && !should_inline) {
5218 ir_build_save_err_ret_addr_src(irb, scope, node);5264 ir_build_save_err_ret_addr_src(irb, scope, node);
5219 }5265 }
...@@ -5415,7 +5461,8 @@ static IrInstSrc *ir_gen_block(IrBuilderSrc *irb, Scope *parent_scope, AstNode *...@@ -5415,7 +5461,8 @@ static IrInstSrc *ir_gen_block(IrBuilderSrc *irb, Scope *parent_scope, AstNode *
54155461
5416 bool is_return_from_fn = block_node == irb->main_block_node;5462 bool is_return_from_fn = block_node == irb->main_block_node;
5417 if (!is_return_from_fn) {5463 if (!is_return_from_fn) {
5418 ir_gen_defers_for_block(irb, child_scope, outer_block_scope, false);5464 if (!ir_gen_defers_for_block(irb, child_scope, outer_block_scope, nullptr, nullptr))
5465 return irb->codegen->invalid_inst_src;
5419 }5466 }
54205467
5421 IrInstSrc *result;5468 IrInstSrc *result;
...@@ -5440,7 +5487,8 @@ static IrInstSrc *ir_gen_block(IrBuilderSrc *irb, Scope *parent_scope, AstNode *...@@ -5440,7 +5487,8 @@ static IrInstSrc *ir_gen_block(IrBuilderSrc *irb, Scope *parent_scope, AstNode *
5440 result_loc_ret->base.id = ResultLocIdReturn;5487 result_loc_ret->base.id = ResultLocIdReturn;
5441 ir_build_reset_result(irb, parent_scope, block_node, &result_loc_ret->base);5488 ir_build_reset_result(irb, parent_scope, block_node, &result_loc_ret->base);
5442 ir_mark_gen(ir_build_end_expr(irb, parent_scope, block_node, result, &result_loc_ret->base));5489 ir_mark_gen(ir_build_end_expr(irb, parent_scope, block_node, result, &result_loc_ret->base));
5443 ir_gen_defers_for_block(irb, child_scope, outer_block_scope, false);5490 if (!ir_gen_defers_for_block(irb, child_scope, outer_block_scope, nullptr, nullptr))
5491 return irb->codegen->invalid_inst_src;
5444 return ir_mark_gen(ir_build_return_src(irb, child_scope, result->base.source_node, result));5492 return ir_mark_gen(ir_build_return_src(irb, child_scope, result->base.source_node, result));
5445}5493}
54465494
...@@ -9240,7 +9288,8 @@ static IrInstSrc *ir_gen_return_from_block(IrBuilderSrc *irb, Scope *break_scope...@@ -9240,7 +9288,8 @@ static IrInstSrc *ir_gen_return_from_block(IrBuilderSrc *irb, Scope *break_scope
9240 }9288 }
92419289
9242 IrBasicBlockSrc *dest_block = block_scope->end_block;9290 IrBasicBlockSrc *dest_block = block_scope->end_block;
9243 ir_gen_defers_for_block(irb, break_scope, dest_block->scope, false);9291 if (!ir_gen_defers_for_block(irb, break_scope, dest_block->scope, nullptr, nullptr))
9292 return irb->codegen->invalid_inst_src;
92449293
9245 block_scope->incoming_blocks->append(irb->current_basic_block);9294 block_scope->incoming_blocks->append(irb->current_basic_block);
9246 block_scope->incoming_values->append(result_value);9295 block_scope->incoming_values->append(result_value);
...@@ -9314,7 +9363,8 @@ static IrInstSrc *ir_gen_break(IrBuilderSrc *irb, Scope *break_scope, AstNode *n...@@ -9314,7 +9363,8 @@ static IrInstSrc *ir_gen_break(IrBuilderSrc *irb, Scope *break_scope, AstNode *n
9314 }9363 }
93159364
9316 IrBasicBlockSrc *dest_block = loop_scope->break_block;9365 IrBasicBlockSrc *dest_block = loop_scope->break_block;
9317 ir_gen_defers_for_block(irb, break_scope, dest_block->scope, false);9366 if (!ir_gen_defers_for_block(irb, break_scope, dest_block->scope, nullptr, nullptr))
9367 return irb->codegen->invalid_inst_src;
93189368
9319 loop_scope->incoming_blocks->append(irb->current_basic_block);9369 loop_scope->incoming_blocks->append(irb->current_basic_block);
9320 loop_scope->incoming_values->append(result_value);9370 loop_scope->incoming_values->append(result_value);
...@@ -9373,7 +9423,8 @@ static IrInstSrc *ir_gen_continue(IrBuilderSrc *irb, Scope *continue_scope, AstN...@@ -9373,7 +9423,8 @@ static IrInstSrc *ir_gen_continue(IrBuilderSrc *irb, Scope *continue_scope, AstN
9373 }9423 }
93749424
9375 IrBasicBlockSrc *dest_block = loop_scope->continue_block;9425 IrBasicBlockSrc *dest_block = loop_scope->continue_block;
9376 ir_gen_defers_for_block(irb, continue_scope, dest_block->scope, false);9426 if (!ir_gen_defers_for_block(irb, continue_scope, dest_block->scope, nullptr, nullptr))
9427 return irb->codegen->invalid_inst_src;
9377 return ir_mark_gen(ir_build_br(irb, continue_scope, node, dest_block, is_comptime));9428 return ir_mark_gen(ir_build_br(irb, continue_scope, node, dest_block, is_comptime));
9378}9429}
93799430
src/parser.cpp+9-2
...@@ -879,7 +879,7 @@ static AstNode *ast_parse_container_field(ParseContext *pc) {...@@ -879,7 +879,7 @@ static AstNode *ast_parse_container_field(ParseContext *pc) {
879// / KEYWORD_noasync BlockExprStatement879// / KEYWORD_noasync BlockExprStatement
880// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)880// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)
881// / KEYWORD_defer BlockExprStatement881// / KEYWORD_defer BlockExprStatement
882// / KEYWORD_errdefer BlockExprStatement882// / KEYWORD_errdefer Payload? BlockExprStatement
883// / IfStatement883// / IfStatement
884// / LabeledStatement884// / LabeledStatement
885// / SwitchExpr885// / SwitchExpr
...@@ -923,12 +923,18 @@ static AstNode *ast_parse_statement(ParseContext *pc) {...@@ -923,12 +923,18 @@ static AstNode *ast_parse_statement(ParseContext *pc) {
923 if (defer == nullptr)923 if (defer == nullptr)
924 defer = eat_token_if(pc, TokenIdKeywordErrdefer);924 defer = eat_token_if(pc, TokenIdKeywordErrdefer);
925 if (defer != nullptr) {925 if (defer != nullptr) {
926 Token *payload = (defer->id == TokenIdKeywordErrdefer) ?
927 ast_parse_payload(pc) : nullptr;
926 AstNode *statement = ast_expect(pc, ast_parse_block_expr_statement);928 AstNode *statement = ast_expect(pc, ast_parse_block_expr_statement);
927 AstNode *res = ast_create_node(pc, NodeTypeDefer, defer);929 AstNode *res = ast_create_node(pc, NodeTypeDefer, defer);
930
928 res->data.defer.kind = ReturnKindUnconditional;931 res->data.defer.kind = ReturnKindUnconditional;
929 res->data.defer.expr = statement;932 res->data.defer.expr = statement;
930 if (defer->id == TokenIdKeywordErrdefer)933 if (defer->id == TokenIdKeywordErrdefer) {
931 res->data.defer.kind = ReturnKindError;934 res->data.defer.kind = ReturnKindError;
935 if (payload != nullptr)
936 res->data.defer.err_payload = token_symbol(pc, payload);
937 }
932 return res;938 return res;
933 }939 }
934940
...@@ -3032,6 +3038,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont...@@ -3032,6 +3038,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont
3032 break;3038 break;
3033 case NodeTypeDefer:3039 case NodeTypeDefer:
3034 visit_field(&node->data.defer.expr, visit, context);3040 visit_field(&node->data.defer.expr, visit, context);
3041 visit_field(&node->data.defer.err_payload, visit, context);
3035 break;3042 break;
3036 case NodeTypeVariableDeclaration:3043 case NodeTypeVariableDeclaration:
3037 visit_field(&node->data.variable_declaration.type, visit, context);3044 visit_field(&node->data.variable_declaration.type, visit, context);
test/stage1/behavior/defer.zig+22-1
...@@ -1,4 +1,6 @@...@@ -1,4 +1,6 @@
1const expect = @import("std").testing.expect;1const std = @import("std");
2const expect = std.testing.expect;
3const expectEqual = std.testing.expectEqual;
24
3var result: [3]u8 = undefined;5var result: [3]u8 = undefined;
4var index: usize = undefined;6var index: usize = undefined;
...@@ -93,3 +95,22 @@ test "return variable while defer expression in scope to modify it" {...@@ -93,3 +95,22 @@ test "return variable while defer expression in scope to modify it" {
93 S.doTheTest();95 S.doTheTest();
94 comptime S.doTheTest();96 comptime S.doTheTest();
95}97}
98
99test "errdefer with payload" {
100 const S = struct {
101 fn foo() !i32 {
102 errdefer |a| {
103 expectEqual(error.One, a);
104 }
105 return error.One;
106 }
107 fn doTheTest() void {
108 _ = foo() catch |err| switch (err) {
109 error.One => {},
110 else => unreachable,
111 };
112 }
113 };
114 S.doTheTest();
115 comptime S.doTheTest();
116}