resume clears suspend bit
This commit is contained in:
parent
7113f109a4
commit
10764ee0e6
137
src/ir.cpp
137
src/ir.cpp
@ -6686,20 +6686,53 @@ static IrInstruction *ir_gen_cancel(IrBuilder *irb, Scope *parent_scope, AstNode
|
||||
return ir_build_cancel(irb, parent_scope, node, target_inst);
|
||||
}
|
||||
|
||||
static IrInstruction *ir_gen_resume(IrBuilder *irb, Scope *parent_scope, AstNode *node) {
|
||||
static IrInstruction *ir_gen_resume(IrBuilder *irb, Scope *scope, AstNode *node) {
|
||||
assert(node->type == NodeTypeResume);
|
||||
|
||||
IrInstruction *target_inst = ir_gen_node(irb, node->data.resume_expr.expr, parent_scope);
|
||||
IrInstruction *target_inst = ir_gen_node(irb, node->data.resume_expr.expr, scope);
|
||||
if (target_inst == irb->codegen->invalid_instruction)
|
||||
return irb->codegen->invalid_instruction;
|
||||
|
||||
return ir_build_coro_resume(irb, parent_scope, node, target_inst);
|
||||
IrBasicBlock *done_block = ir_create_basic_block(irb, scope, "ResumeDone");
|
||||
IrBasicBlock *not_canceled_block = ir_create_basic_block(irb, scope, "NotCanceled");
|
||||
|
||||
IrInstruction *inverted_mask = ir_build_const_usize(irb, scope, node, 0x2); // 0b010
|
||||
IrInstruction *mask = ir_build_un_op(irb, scope, node, IrUnOpBinNot, inverted_mask);
|
||||
IrInstruction *is_canceled_mask = ir_build_const_usize(irb, scope, node, 0x1); // 0b001
|
||||
IrInstruction *is_comptime = ir_build_const_bool(irb, scope, node, false);
|
||||
IrInstruction *usize_type_val = ir_build_const_type(irb, scope, node, irb->codegen->builtin_types.entry_usize);
|
||||
IrInstruction *zero = ir_build_const_usize(irb, scope, node, 0);
|
||||
IrInstruction *promise_T_type_val = ir_build_const_type(irb, scope, node,
|
||||
get_promise_type(irb->codegen, irb->codegen->builtin_types.entry_void));
|
||||
|
||||
// TODO relies on Zig not re-ordering fields
|
||||
IrInstruction *casted_target_inst = ir_build_ptr_cast(irb, scope, node, promise_T_type_val, target_inst);
|
||||
IrInstruction *coro_promise_ptr = ir_build_coro_promise(irb, scope, node, casted_target_inst);
|
||||
Buf *atomic_state_field_name = buf_create_from_str(ATOMIC_STATE_FIELD_NAME);
|
||||
IrInstruction *atomic_state_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr,
|
||||
atomic_state_field_name);
|
||||
|
||||
// clear the is_suspended bit
|
||||
IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, scope, node,
|
||||
usize_type_val, atomic_state_ptr, nullptr, mask, nullptr,
|
||||
AtomicRmwOp_and, AtomicOrderSeqCst);
|
||||
|
||||
IrInstruction *is_canceled_value = ir_build_bin_op(irb, scope, node, IrBinOpBinAnd, prev_atomic_value, is_canceled_mask, false);
|
||||
IrInstruction *is_canceled_bool = ir_build_bin_op(irb, scope, node, IrBinOpCmpNotEq, is_canceled_value, zero, false);
|
||||
ir_build_cond_br(irb, scope, node, is_canceled_bool, done_block, not_canceled_block, is_comptime);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, not_canceled_block);
|
||||
ir_build_coro_resume(irb, scope, node, target_inst);
|
||||
ir_build_br(irb, scope, node, done_block, is_comptime);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, done_block);
|
||||
return ir_build_const_void(irb, scope, node);
|
||||
}
|
||||
|
||||
static IrInstruction *ir_gen_await_expr(IrBuilder *irb, Scope *parent_scope, AstNode *node) {
|
||||
static IrInstruction *ir_gen_await_expr(IrBuilder *irb, Scope *scope, AstNode *node) {
|
||||
assert(node->type == NodeTypeAwaitExpr);
|
||||
|
||||
IrInstruction *target_inst = ir_gen_node(irb, node->data.await_expr.expr, parent_scope);
|
||||
IrInstruction *target_inst = ir_gen_node(irb, node->data.await_expr.expr, scope);
|
||||
if (target_inst == irb->codegen->invalid_instruction)
|
||||
return irb->codegen->invalid_instruction;
|
||||
|
||||
@ -6713,7 +6746,7 @@ static IrInstruction *ir_gen_await_expr(IrBuilder *irb, Scope *parent_scope, Ast
|
||||
return irb->codegen->invalid_instruction;
|
||||
}
|
||||
|
||||
ScopeDeferExpr *scope_defer_expr = get_scope_defer_expr(parent_scope);
|
||||
ScopeDeferExpr *scope_defer_expr = get_scope_defer_expr(scope);
|
||||
if (scope_defer_expr) {
|
||||
if (!scope_defer_expr->reported_err) {
|
||||
add_node_error(irb->codegen, node, buf_sprintf("cannot await inside defer expression"));
|
||||
@ -6724,85 +6757,85 @@ static IrInstruction *ir_gen_await_expr(IrBuilder *irb, Scope *parent_scope, Ast
|
||||
|
||||
Scope *outer_scope = irb->exec->begin_scope;
|
||||
|
||||
IrInstruction *coro_promise_ptr = ir_build_coro_promise(irb, parent_scope, node, target_inst);
|
||||
IrInstruction *coro_promise_ptr = ir_build_coro_promise(irb, scope, node, target_inst);
|
||||
Buf *result_ptr_field_name = buf_create_from_str(RESULT_PTR_FIELD_NAME);
|
||||
IrInstruction *result_ptr_field_ptr = ir_build_field_ptr(irb, parent_scope, node, coro_promise_ptr, result_ptr_field_name);
|
||||
IrInstruction *result_ptr_field_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr, result_ptr_field_name);
|
||||
|
||||
if (irb->codegen->have_err_ret_tracing) {
|
||||
IrInstruction *err_ret_trace_ptr = ir_build_error_return_trace(irb, parent_scope, node, IrInstructionErrorReturnTrace::NonNull);
|
||||
IrInstruction *err_ret_trace_ptr = ir_build_error_return_trace(irb, scope, node, IrInstructionErrorReturnTrace::NonNull);
|
||||
Buf *err_ret_trace_ptr_field_name = buf_create_from_str(ERR_RET_TRACE_PTR_FIELD_NAME);
|
||||
IrInstruction *err_ret_trace_ptr_field_ptr = ir_build_field_ptr(irb, parent_scope, node, coro_promise_ptr, err_ret_trace_ptr_field_name);
|
||||
ir_build_store_ptr(irb, parent_scope, node, err_ret_trace_ptr_field_ptr, err_ret_trace_ptr);
|
||||
IrInstruction *err_ret_trace_ptr_field_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr, err_ret_trace_ptr_field_name);
|
||||
ir_build_store_ptr(irb, scope, node, err_ret_trace_ptr_field_ptr, err_ret_trace_ptr);
|
||||
}
|
||||
|
||||
Buf *atomic_state_field_name = buf_create_from_str(ATOMIC_STATE_FIELD_NAME);
|
||||
IrInstruction *atomic_state_ptr = ir_build_field_ptr(irb, parent_scope, node, coro_promise_ptr,
|
||||
IrInstruction *atomic_state_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr,
|
||||
atomic_state_field_name);
|
||||
|
||||
IrInstruction *const_bool_false = ir_build_const_bool(irb, parent_scope, node, false);
|
||||
VariableTableEntry *result_var = ir_create_var(irb, node, parent_scope, nullptr,
|
||||
IrInstruction *const_bool_false = ir_build_const_bool(irb, scope, node, false);
|
||||
VariableTableEntry *result_var = ir_create_var(irb, node, scope, nullptr,
|
||||
false, false, true, const_bool_false);
|
||||
IrInstruction *undefined_value = ir_build_const_undefined(irb, parent_scope, node);
|
||||
IrInstruction *target_promise_type = ir_build_typeof(irb, parent_scope, node, target_inst);
|
||||
IrInstruction *promise_result_type = ir_build_promise_result_type(irb, parent_scope, node, target_promise_type);
|
||||
ir_build_await_bookkeeping(irb, parent_scope, node, promise_result_type);
|
||||
ir_build_var_decl(irb, parent_scope, node, result_var, promise_result_type, nullptr, undefined_value);
|
||||
IrInstruction *my_result_var_ptr = ir_build_var_ptr(irb, parent_scope, node, result_var);
|
||||
ir_build_store_ptr(irb, parent_scope, node, result_ptr_field_ptr, my_result_var_ptr);
|
||||
IrInstruction *save_token = ir_build_coro_save(irb, parent_scope, node, irb->exec->coro_handle);
|
||||
IrInstruction *usize_type_val = ir_build_const_type(irb, parent_scope, node, irb->codegen->builtin_types.entry_usize);
|
||||
IrInstruction *coro_handle_addr = ir_build_ptr_to_int(irb, parent_scope, node, irb->exec->coro_handle);
|
||||
IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, parent_scope, node,
|
||||
IrInstruction *undefined_value = ir_build_const_undefined(irb, scope, node);
|
||||
IrInstruction *target_promise_type = ir_build_typeof(irb, scope, node, target_inst);
|
||||
IrInstruction *promise_result_type = ir_build_promise_result_type(irb, scope, node, target_promise_type);
|
||||
ir_build_await_bookkeeping(irb, scope, node, promise_result_type);
|
||||
ir_build_var_decl(irb, scope, node, result_var, promise_result_type, nullptr, undefined_value);
|
||||
IrInstruction *my_result_var_ptr = ir_build_var_ptr(irb, scope, node, result_var);
|
||||
ir_build_store_ptr(irb, scope, node, result_ptr_field_ptr, my_result_var_ptr);
|
||||
IrInstruction *save_token = ir_build_coro_save(irb, scope, node, irb->exec->coro_handle);
|
||||
IrInstruction *usize_type_val = ir_build_const_type(irb, scope, node, irb->codegen->builtin_types.entry_usize);
|
||||
IrInstruction *coro_handle_addr = ir_build_ptr_to_int(irb, scope, node, irb->exec->coro_handle);
|
||||
IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, scope, node,
|
||||
usize_type_val, atomic_state_ptr, nullptr, coro_handle_addr, nullptr,
|
||||
AtomicRmwOp_or, AtomicOrderSeqCst);
|
||||
IrInstruction *zero = ir_build_const_usize(irb, parent_scope, node, 0);
|
||||
IrInstruction *inverted_ptr_mask = ir_build_const_usize(irb, parent_scope, node, 0x7); // 0b111
|
||||
IrInstruction *ptr_mask = ir_build_un_op(irb, parent_scope, node, IrUnOpBinNot, inverted_ptr_mask); // 0b111...000
|
||||
IrInstruction *await_handle_addr = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, ptr_mask, false);
|
||||
IrInstruction *is_non_null = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, await_handle_addr, zero, false);
|
||||
IrBasicBlock *yes_suspend_block = ir_create_basic_block(irb, parent_scope, "YesSuspend");
|
||||
IrBasicBlock *no_suspend_block = ir_create_basic_block(irb, parent_scope, "NoSuspend");
|
||||
IrBasicBlock *merge_block = ir_create_basic_block(irb, parent_scope, "MergeSuspend");
|
||||
ir_build_cond_br(irb, parent_scope, node, is_non_null, no_suspend_block, yes_suspend_block, const_bool_false);
|
||||
IrInstruction *zero = ir_build_const_usize(irb, scope, node, 0);
|
||||
IrInstruction *inverted_ptr_mask = ir_build_const_usize(irb, scope, node, 0x7); // 0b111
|
||||
IrInstruction *ptr_mask = ir_build_un_op(irb, scope, node, IrUnOpBinNot, inverted_ptr_mask); // 0b111...000
|
||||
IrInstruction *await_handle_addr = ir_build_bin_op(irb, scope, node, IrBinOpBinAnd, prev_atomic_value, ptr_mask, false);
|
||||
IrInstruction *is_non_null = ir_build_bin_op(irb, scope, node, IrBinOpCmpNotEq, await_handle_addr, zero, false);
|
||||
IrBasicBlock *yes_suspend_block = ir_create_basic_block(irb, scope, "YesSuspend");
|
||||
IrBasicBlock *no_suspend_block = ir_create_basic_block(irb, scope, "NoSuspend");
|
||||
IrBasicBlock *merge_block = ir_create_basic_block(irb, scope, "MergeSuspend");
|
||||
ir_build_cond_br(irb, scope, node, is_non_null, no_suspend_block, yes_suspend_block, const_bool_false);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, no_suspend_block);
|
||||
if (irb->codegen->have_err_ret_tracing) {
|
||||
Buf *err_ret_trace_field_name = buf_create_from_str(ERR_RET_TRACE_FIELD_NAME);
|
||||
IrInstruction *src_err_ret_trace_ptr = ir_build_field_ptr(irb, parent_scope, node, coro_promise_ptr, err_ret_trace_field_name);
|
||||
IrInstruction *dest_err_ret_trace_ptr = ir_build_error_return_trace(irb, parent_scope, node, IrInstructionErrorReturnTrace::NonNull);
|
||||
ir_build_merge_err_ret_traces(irb, parent_scope, node, coro_promise_ptr, src_err_ret_trace_ptr, dest_err_ret_trace_ptr);
|
||||
IrInstruction *src_err_ret_trace_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr, err_ret_trace_field_name);
|
||||
IrInstruction *dest_err_ret_trace_ptr = ir_build_error_return_trace(irb, scope, node, IrInstructionErrorReturnTrace::NonNull);
|
||||
ir_build_merge_err_ret_traces(irb, scope, node, coro_promise_ptr, src_err_ret_trace_ptr, dest_err_ret_trace_ptr);
|
||||
}
|
||||
Buf *result_field_name = buf_create_from_str(RESULT_FIELD_NAME);
|
||||
IrInstruction *promise_result_ptr = ir_build_field_ptr(irb, parent_scope, node, coro_promise_ptr, result_field_name);
|
||||
IrInstruction *promise_result_ptr = ir_build_field_ptr(irb, scope, node, coro_promise_ptr, result_field_name);
|
||||
// If the type of the result handle_is_ptr then this does not actually perform a load. But we need it to,
|
||||
// because we're about to destroy the memory. So we store it into our result variable.
|
||||
IrInstruction *no_suspend_result = ir_build_load_ptr(irb, parent_scope, node, promise_result_ptr);
|
||||
ir_build_store_ptr(irb, parent_scope, node, my_result_var_ptr, no_suspend_result);
|
||||
ir_build_cancel(irb, parent_scope, node, target_inst);
|
||||
ir_build_br(irb, parent_scope, node, merge_block, const_bool_false);
|
||||
IrInstruction *no_suspend_result = ir_build_load_ptr(irb, scope, node, promise_result_ptr);
|
||||
ir_build_store_ptr(irb, scope, node, my_result_var_ptr, no_suspend_result);
|
||||
ir_build_cancel(irb, scope, node, target_inst);
|
||||
ir_build_br(irb, scope, node, merge_block, const_bool_false);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, yes_suspend_block);
|
||||
IrInstruction *suspend_code = ir_build_coro_suspend(irb, parent_scope, node, save_token, const_bool_false);
|
||||
IrBasicBlock *cleanup_block = ir_create_basic_block(irb, parent_scope, "SuspendCleanup");
|
||||
IrBasicBlock *resume_block = ir_create_basic_block(irb, parent_scope, "SuspendResume");
|
||||
IrInstruction *suspend_code = ir_build_coro_suspend(irb, scope, node, save_token, const_bool_false);
|
||||
IrBasicBlock *cleanup_block = ir_create_basic_block(irb, scope, "SuspendCleanup");
|
||||
IrBasicBlock *resume_block = ir_create_basic_block(irb, scope, "SuspendResume");
|
||||
|
||||
IrInstructionSwitchBrCase *cases = allocate<IrInstructionSwitchBrCase>(2);
|
||||
cases[0].value = ir_build_const_u8(irb, parent_scope, node, 0);
|
||||
cases[0].value = ir_build_const_u8(irb, scope, node, 0);
|
||||
cases[0].block = resume_block;
|
||||
cases[1].value = ir_build_const_u8(irb, parent_scope, node, 1);
|
||||
cases[1].value = ir_build_const_u8(irb, scope, node, 1);
|
||||
cases[1].block = cleanup_block;
|
||||
ir_build_switch_br(irb, parent_scope, node, suspend_code, irb->exec->coro_suspend_block,
|
||||
ir_build_switch_br(irb, scope, node, suspend_code, irb->exec->coro_suspend_block,
|
||||
2, cases, const_bool_false, nullptr);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, cleanup_block);
|
||||
ir_gen_defers_for_block(irb, parent_scope, outer_scope, true);
|
||||
ir_mark_gen(ir_build_br(irb, parent_scope, node, irb->exec->coro_final_cleanup_block, const_bool_false));
|
||||
ir_gen_defers_for_block(irb, scope, outer_scope, true);
|
||||
ir_mark_gen(ir_build_br(irb, scope, node, irb->exec->coro_final_cleanup_block, const_bool_false));
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, resume_block);
|
||||
ir_build_br(irb, parent_scope, node, merge_block, const_bool_false);
|
||||
ir_build_br(irb, scope, node, merge_block, const_bool_false);
|
||||
|
||||
ir_set_cursor_at_end_and_append_block(irb, merge_block);
|
||||
return ir_build_load_ptr(irb, parent_scope, node, my_result_var_ptr);
|
||||
return ir_build_load_ptr(irb, scope, node, my_result_var_ptr);
|
||||
}
|
||||
|
||||
static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNode *node) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user