authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-28 12:04:09-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-28 12:11:39-04:00
log60cda3713fdc2d8bce01bfc229109a3c8b3efb6f
tree47993bc0cc02340b17cb126a4ff3e61b7faab5af
parentc6f9a4c0445000e59bca16838cc413140d399f35

suspend cancels awaiter when it gets canceled

1 files changed, 28 insertions(+), 9 deletions(-)

src/ir.cpp+28-9
......@@ -6663,13 +6663,7 @@ static IrInstruction *ir_gen_fn_proto(IrBuilder *irb, Scope *parent_scope, AstNo
66636663 async_allocator_type_value, is_var_args);
66646664}
66656665
6666static IrInstruction *ir_gen_cancel(IrBuilder *irb, Scope *scope, AstNode *node) {
6667 assert(node->type == NodeTypeCancel);
6668
6669 IrInstruction *target_inst = ir_gen_node(irb, node->data.cancel_expr.expr, scope);
6670 if (target_inst == irb->codegen->invalid_instruction)
6671 return irb->codegen->invalid_instruction;
6672
6666static IrInstruction *ir_gen_cancel_target(IrBuilder *irb, Scope *scope, AstNode *node, IrInstruction *target_inst) {
66736667 IrBasicBlock *done_block = ir_create_basic_block(irb, scope, "CancelDone");
66746668 IrBasicBlock *not_canceled_block = ir_create_basic_block(irb, scope, "NotCanceled");
66756669 IrBasicBlock *pre_return_block = ir_create_basic_block(irb, scope, "PreReturn");
......@@ -6726,6 +6720,16 @@ static IrInstruction *ir_gen_cancel(IrBuilder *irb, Scope *scope, AstNode *node)
67266720 return ir_build_const_void(irb, scope, node);
67276721}
67286722
6723static IrInstruction *ir_gen_cancel(IrBuilder *irb, Scope *scope, AstNode *node) {
6724 assert(node->type == NodeTypeCancel);
6725
6726 IrInstruction *target_inst = ir_gen_node(irb, node->data.cancel_expr.expr, scope);
6727 if (target_inst == irb->codegen->invalid_instruction)
6728 return irb->codegen->invalid_instruction;
6729
6730 return ir_gen_cancel_target(irb, scope, node, target_inst);
6731}
6732
67296733static IrInstruction *ir_gen_resume(IrBuilder *irb, Scope *scope, AstNode *node) {
67306734 assert(node->type == NodeTypeResume);
67316735
......@@ -6941,14 +6945,19 @@ static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNod
69416945 IrBasicBlock *cleanup_block = ir_create_basic_block(irb, parent_scope, "SuspendCleanup");
69426946 IrBasicBlock *resume_block = ir_create_basic_block(irb, parent_scope, "SuspendResume");
69436947 IrBasicBlock *suspended_block = ir_create_basic_block(irb, parent_scope, "AlreadySuspended");
6948 IrBasicBlock *canceled_block = ir_create_basic_block(irb, parent_scope, "IsCanceled");
69446949 IrBasicBlock *not_canceled_block = ir_create_basic_block(irb, parent_scope, "NotCanceled");
69456950 IrBasicBlock *not_suspended_block = ir_create_basic_block(irb, parent_scope, "NotAlreadySuspended");
6951 IrBasicBlock *cancel_awaiter_block = ir_create_basic_block(irb, parent_scope, "CancelAwaiter");
69466952
6953 IrInstruction *promise_type_val = ir_build_const_type(irb, parent_scope, node, irb->codegen->builtin_types.entry_promise);
69476954 IrInstruction *const_bool_false = ir_build_const_bool(irb, parent_scope, node, false);
69486955 IrInstruction *usize_type_val = ir_build_const_type(irb, parent_scope, node, irb->codegen->builtin_types.entry_usize);
69496956 IrInstruction *is_canceled_mask = ir_build_const_usize(irb, parent_scope, node, 0x1); // 0b001
69506957 IrInstruction *is_suspended_mask = ir_build_const_usize(irb, parent_scope, node, 0x2); // 0b010
69516958 IrInstruction *zero = ir_build_const_usize(irb, parent_scope, node, 0);
6959 IrInstruction *inverted_ptr_mask = ir_build_const_usize(irb, parent_scope, node, 0x7); // 0b111
6960 IrInstruction *ptr_mask = ir_build_un_op(irb, parent_scope, node, IrUnOpBinNot, inverted_ptr_mask); // 0b111...000
69526961
69536962 IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, parent_scope, node,
69546963 usize_type_val, irb->exec->atomic_state_field_ptr, nullptr, is_suspended_mask, nullptr,
......@@ -6956,7 +6965,17 @@ static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNod
69566965
69576966 IrInstruction *is_canceled_value = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, is_canceled_mask, false);
69586967 IrInstruction *is_canceled_bool = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, is_canceled_value, zero, false);
6959 ir_build_cond_br(irb, parent_scope, node, is_canceled_bool, cleanup_block, not_canceled_block, const_bool_false);
6968 ir_build_cond_br(irb, parent_scope, node, is_canceled_bool, canceled_block, not_canceled_block, const_bool_false);
6969
6970 ir_set_cursor_at_end_and_append_block(irb, canceled_block);
6971 IrInstruction *await_handle_addr = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, ptr_mask, false);
6972 IrInstruction *have_await_handle = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, await_handle_addr, zero, false);
6973 ir_build_cond_br(irb, parent_scope, node, have_await_handle, cancel_awaiter_block, cleanup_block, const_bool_false);
6974
6975 ir_set_cursor_at_end_and_append_block(irb, cancel_awaiter_block);
6976 IrInstruction *await_handle = ir_build_int_to_ptr(irb, parent_scope, node, promise_type_val, await_handle_addr);
6977 ir_gen_cancel_target(irb, parent_scope, node, await_handle);
6978 ir_build_br(irb, parent_scope, node, cleanup_block, const_bool_false);
69606979
69616980 ir_set_cursor_at_end_and_append_block(irb, not_canceled_block);
69626981 IrInstruction *is_suspended_value = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, is_suspended_mask, false);
......@@ -6995,7 +7014,7 @@ static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNod
69957014 cases[0].value = ir_mark_gen(ir_build_const_u8(irb, parent_scope, node, 0));
69967015 cases[0].block = resume_block;
69977016 cases[1].value = ir_mark_gen(ir_build_const_u8(irb, parent_scope, node, 1));
6998 cases[1].block = cleanup_block;
7017 cases[1].block = canceled_block;
69997018 ir_mark_gen(ir_build_switch_br(irb, parent_scope, node, suspend_code, irb->exec->coro_suspend_block,
70007019 2, cases, const_bool_false, nullptr));
70017020