| author |  Andrew Kelley <andrew@ziglang.org> 2020-02-08 15:07:12-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-02-08 15:07:12-05:00 |
| log | d80db3546cf49b8af434005de0e74509d07b4855 |
| tree | ba1c1340830ca852ad74eb4399528b4d311f485a |
| parent | 80ba21b83cd13849c1d1d9cdebfa070b03f334d3 |
| signature |  Commit is signed but in an unrecognized format. |
Revert "properly spill optional payload capture value"
This reverts commit 80ba21b83cd13849c1d1d9cdebfa070b03f334d3.3 files changed, 3 insertions(+), 30 deletions(-)
test- stage1
- behavior
src/analyze.cpp+1-2
| ... | @@ -6104,12 +6104,11 @@ static void mark_suspension_point(Scope *scope) { | ... | @@ -6104,12 +6104,11 @@ 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); | ||
| 6108 | if (!looking_for_exprs) { | 6107 | if (!looking_for_exprs) { |
| 6109 | parent_expr_scope->need_spill = MemoizedBoolTrue; | ||
| 6110 | // Now we're only looking for a block, to see if it's in a loop (see the case ScopeIdBlock) | 6108 | // Now we're only looking for a block, to see if it's in a loop (see the case ScopeIdBlock) |
| 6111 | continue; | 6109 | continue; |
| 6112 | } | 6110 | } |
| 6111 | ScopeExpr *parent_expr_scope = reinterpret_cast<ScopeExpr *>(scope); | ||
| 6113 | if (child_expr_scope != nullptr) { | 6112 | if (child_expr_scope != nullptr) { |
| 6114 | for (size_t i = 0; parent_expr_scope->children_ptr[i] != child_expr_scope; i += 1) { | 6113 | for (size_t i = 0; parent_expr_scope->children_ptr[i] != child_expr_scope; i += 1) { |
| 6115 | assert(i < parent_expr_scope->children_len); | 6114 | assert(i < parent_expr_scope->children_len); |
src/ir.cpp+2-4
| ... | @@ -8874,9 +8874,7 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo | ... | @@ -8874,9 +8874,7 @@ 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; |
| 8876 | 8876 | ||
| 8877 | ScopeExpr *spill_scope = create_expr_scope(irb->codegen, expr_node, scope); | 8877 | IrInstSrc *maybe_val_ptr = ir_gen_node_extra(irb, expr_node, scope, LValPtr, nullptr); |
| 8878 | |||
| 8879 | IrInstSrc *maybe_val_ptr = ir_gen_node_extra(irb, expr_node, &spill_scope->base, LValPtr, nullptr); | ||
| 8880 | if (maybe_val_ptr == irb->codegen->invalid_inst_src) | 8878 | if (maybe_val_ptr == irb->codegen->invalid_inst_src) |
| 8881 | return maybe_val_ptr; | 8879 | return maybe_val_ptr; |
| 8882 | 8880 | ||
| ... | @@ -8901,7 +8899,7 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo | ... | @@ -8901,7 +8899,7 @@ static IrInstSrc *ir_gen_if_optional_expr(IrBuilderSrc *irb, Scope *scope, AstNo |
| 8901 | 8899 | ||
| 8902 | ir_set_cursor_at_end_and_append_block(irb, then_block); | 8900 | ir_set_cursor_at_end_and_append_block(irb, then_block); |
| 8903 | 8901 | ||
| 8904 | Scope *subexpr_scope = create_runtime_scope(irb->codegen, node, &spill_scope->base, is_comptime); | 8902 | Scope *subexpr_scope = create_runtime_scope(irb->codegen, node, scope, is_comptime); |
| 8905 | Scope *var_scope; | 8903 | Scope *var_scope; |
| 8906 | if (var_symbol) { | 8904 | if (var_symbol) { |
| 8907 | bool is_shadowable = false; | 8905 | bool is_shadowable = false; |
test/stage1/behavior/async_fn.zig-24
| ... | @@ -1416,27 +1416,3 @@ test "async function call resolves target fn frame, runtime func" { | ... | @@ -1416,27 +1416,3 @@ 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 | |||
| 1420 | test "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 | } |