authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-08 14:59:33-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-08 14:59:33-05:00
log80ba21b83cd13849c1d1d9cdebfa070b03f334d3
treec4138d82ba6485317fb025886c33bc7cb5bc5605
parent884804dbc3a066fde06da769994554efe09febd6
signaturelock-open Commit is signed but in an unrecognized format.

properly spill optional payload capture value

3 files changed, 30 insertions(+), 3 deletions(-)

src/analyze.cpp+2-1
...@@ -6104,11 +6104,12 @@ static void mark_suspension_point(Scope *scope) {...@@ -6104,11 +6104,12 @@ static void mark_suspension_point(Scope *scope) {
6104 continue;6104 continue;
6105 }6105 }
6106 case ScopeIdExpr: {6106 case ScopeIdExpr: {
6107 ScopeExpr *parent_expr_scope = reinterpret_cast<ScopeExpr *>(scope);
6107 if (!looking_for_exprs) {6108 if (!looking_for_exprs) {
6109 parent_expr_scope->need_spill = MemoizedBoolTrue;
6108 // Now we're only looking for a block, to see if it's in a loop (see the case ScopeIdBlock)6110 // Now we're only looking for a block, to see if it's in a loop (see the case ScopeIdBlock)
6109 continue;6111 continue;
6110 }6112 }
6111 ScopeExpr *parent_expr_scope = reinterpret_cast<ScopeExpr *>(scope);
6112 if (child_expr_scope != nullptr) {6113 if (child_expr_scope != nullptr) {
6113 for (size_t i = 0; parent_expr_scope->children_ptr[i] != child_expr_scope; i += 1) {6114 for (size_t i = 0; parent_expr_scope->children_ptr[i] != child_expr_scope; i += 1) {
6114 assert(i < parent_expr_scope->children_len);6115 assert(i < parent_expr_scope->children_len);
src/ir.cpp+4-2
...@@ -8874,7 +8874,9 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo...@@ -8874,7 +8874,9 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo
8874 AstNode *else_node = node->data.test_expr.else_node;8874 AstNode *else_node = node->data.test_expr.else_node;
8875 bool var_is_ptr = node->data.test_expr.var_is_ptr;8875 bool var_is_ptr = node->data.test_expr.var_is_ptr;
88768876
8877 IrInstSrc *maybe_val_ptr = ir_gen_node_extra(irb, expr_node, scope, LValPtr, nullptr);8877 ScopeExpr *spill_scope = create_expr_scope(irb->codegen, expr_node, scope);
8878
8879 IrInstSrc *maybe_val_ptr = ir_gen_node_extra(irb, expr_node, &spill_scope->base, LValPtr, nullptr);
8878 if (maybe_val_ptr == irb->codegen->invalid_inst_src)8880 if (maybe_val_ptr == irb->codegen->invalid_inst_src)
8879 return maybe_val_ptr;8881 return maybe_val_ptr;
88808882
...@@ -8899,7 +8901,7 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo...@@ -8899,7 +8901,7 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo
88998901
8900 ir_set_cursor_at_end_and_append_block(irb, then_block);8902 ir_set_cursor_at_end_and_append_block(irb, then_block);
89018903
8902 Scope *subexpr_scope = create_runtime_scope(irb->codegen, node, scope, is_comptime);8904 Scope *subexpr_scope = create_runtime_scope(irb->codegen, node, &spill_scope->base, is_comptime);
8903 Scope *var_scope;8905 Scope *var_scope;
8904 if (var_symbol) {8906 if (var_symbol) {
8905 bool is_shadowable = false;8907 bool is_shadowable = false;
test/stage1/behavior/async_fn.zig+24
...@@ -1416,3 +1416,27 @@ test "async function call resolves target fn frame, runtime func" {...@@ -1416,3 +1416,27 @@ test "async function call resolves target fn frame, runtime func" {
1416 resume S.global_frame;1416 resume S.global_frame;
1417 expect(S.global_int == 10);1417 expect(S.global_int == 10);
1418}1418}
1419
1420test "properly spill optional payload capture value" {
1421 const S = struct {
1422 var global_frame: anyframe = undefined;
1423 var global_int: usize = 2;
1424
1425 fn foo() void {
1426 var opt: ?usize = 1234;
1427 if (opt) |x| {
1428 bar();
1429 global_int += x;
1430 }
1431 }
1432
1433 fn bar() void {
1434 global_frame = @frame();
1435 suspend;
1436 global_int += 1;
1437 }
1438 };
1439 _ = async S.foo();
1440 resume S.global_frame;
1441 expect(S.global_int == 1237);
1442}