authorgravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-05-05 05:11:19-06:00
committergravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-05-05 05:17:34-06:00
logb957dc29a4e3f025e446e717b0ae8c69602545ca
tree848b3648266fccbf887d317217936fb051661810
parent8d5636ebe4b1d70db14e28c67f7986fb2a1ce3cf
signature Commit is signed but in an unrecognized format.

Rename noasync to nosuspend in C++ compiler

10 files changed, 96 insertions(+), 96 deletions(-)

src/all_types.hpp+11-11
......@@ -672,7 +672,7 @@ enum NodeType {
672672 NodeTypeSwitchProng,
673673 NodeTypeSwitchRange,
674674 NodeTypeCompTime,
675 NodeTypeNoAsync,
675 NodeTypeNoSuspend,
676676 NodeTypeBreak,
677677 NodeTypeContinue,
678678 NodeTypeAsmExpr,
......@@ -862,7 +862,7 @@ enum CallModifier {
862862 CallModifierAsync,
863863 CallModifierNeverTail,
864864 CallModifierNeverInline,
865 CallModifierNoAsync,
865 CallModifierNoSuspend,
866866 CallModifierAlwaysTail,
867867 CallModifierAlwaysInline,
868868 CallModifierCompileTime,
......@@ -1014,7 +1014,7 @@ struct AstNodeCompTime {
10141014 AstNode *expr;
10151015};
10161016
1017struct AstNodeNoAsync {
1017struct AstNodeNoSuspend {
10181018 AstNode *expr;
10191019};
10201020
......@@ -1225,7 +1225,7 @@ struct AstNode {
12251225 AstNodeSwitchProng switch_prong;
12261226 AstNodeSwitchRange switch_range;
12271227 AstNodeCompTime comptime_expr;
1228 AstNodeNoAsync noasync_expr;
1228 AstNodeNoSuspend nosuspend_expr;
12291229 AstNodeAsmExpr asm_expr;
12301230 AstNodeFieldAccessExpr field_access_expr;
12311231 AstNodePtrDerefExpr ptr_deref_expr;
......@@ -1858,7 +1858,7 @@ enum PanicMsgId {
18581858 PanicMsgIdResumedAnAwaitingFn,
18591859 PanicMsgIdFrameTooSmall,
18601860 PanicMsgIdResumedFnPendingAwait,
1861 PanicMsgIdBadNoAsyncCall,
1861 PanicMsgIdBadNoSuspendCall,
18621862 PanicMsgIdResumeNotSuspendedFn,
18631863 PanicMsgIdBadSentinel,
18641864 PanicMsgIdShxTooBigRhs,
......@@ -2376,7 +2376,7 @@ enum ScopeId {
23762376 ScopeIdRuntime,
23772377 ScopeIdTypeOf,
23782378 ScopeIdExpr,
2379 ScopeIdNoAsync,
2379 ScopeIdNoSuspend,
23802380};
23812381
23822382struct Scope {
......@@ -2510,9 +2510,9 @@ struct ScopeCompTime {
25102510 Scope base;
25112511};
25122512
2513// This scope is created for a noasync expression.
2514// NodeTypeNoAsync
2515struct ScopeNoAsync {
2513// This scope is created for a nosuspend expression.
2514// NodeTypeNoSuspend
2515struct ScopeNoSuspend {
25162516 Scope base;
25172517};
25182518
......@@ -4488,7 +4488,7 @@ struct IrInstSrcAwait {
44884488
44894489 IrInstSrc *frame;
44904490 ResultLoc *result_loc;
4491 bool is_noasync;
4491 bool is_nosuspend;
44924492};
44934493
44944494struct IrInstGenAwait {
......@@ -4497,7 +4497,7 @@ struct IrInstGenAwait {
44974497 IrInstGen *frame;
44984498 IrInstGen *result_loc;
44994499 ZigFn *target_fn;
4500 bool is_noasync;
4500 bool is_nosuspend;
45014501};
45024502
45034503struct IrInstSrcResume {
src/analyze.cpp+9-9
......@@ -106,7 +106,7 @@ static ScopeExpr *find_expr_scope(Scope *scope) {
106106 case ScopeIdDecls:
107107 case ScopeIdFnDef:
108108 case ScopeIdCompTime:
109 case ScopeIdNoAsync:
109 case ScopeIdNoSuspend:
110110 case ScopeIdVarDecl:
111111 case ScopeIdCImport:
112112 case ScopeIdSuspend:
......@@ -227,9 +227,9 @@ Scope *create_comptime_scope(CodeGen *g, AstNode *node, Scope *parent) {
227227 return &scope->base;
228228}
229229
230Scope *create_noasync_scope(CodeGen *g, AstNode *node, Scope *parent) {
231 ScopeNoAsync *scope = heap::c_allocator.create<ScopeNoAsync>();
232 init_scope(g, &scope->base, ScopeIdNoAsync, node, parent);
230Scope *create_nosuspend_scope(CodeGen *g, AstNode *node, Scope *parent) {
231 ScopeNoSuspend *scope = heap::c_allocator.create<ScopeNoSuspend>();
232 init_scope(g, &scope->base, ScopeIdNoSuspend, node, parent);
233233 return &scope->base;
234234}
235235
......@@ -3771,7 +3771,7 @@ void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node) {
37713771 case NodeTypeCompTime:
37723772 preview_comptime_decl(g, node, decls_scope);
37733773 break;
3774 case NodeTypeNoAsync:
3774 case NodeTypeNoSuspend:
37753775 case NodeTypeParamDecl:
37763776 case NodeTypeReturnExpr:
37773777 case NodeTypeDefer:
......@@ -4689,7 +4689,7 @@ void add_async_error_notes(CodeGen *g, ErrorMsg *msg, ZigFn *fn) {
46894689static Error analyze_callee_async(CodeGen *g, ZigFn *fn, ZigFn *callee, AstNode *call_node,
46904690 bool must_not_be_async, CallModifier modifier)
46914691{
4692 if (modifier == CallModifierNoAsync)
4692 if (modifier == CallModifierNoSuspend)
46934693 return ErrorNone;
46944694 bool callee_is_async = false;
46954695 switch (callee->type_entry->data.fn.fn_type_id.cc) {
......@@ -4812,7 +4812,7 @@ static void analyze_fn_async(CodeGen *g, ZigFn *fn, bool resolve_frame) {
48124812 }
48134813 for (size_t i = 0; i < fn->await_list.length; i += 1) {
48144814 IrInstGenAwait *await = fn->await_list.at(i);
4815 if (await->is_noasync) continue;
4815 if (await->is_nosuspend) continue;
48164816 switch (analyze_callee_async(g, fn, await->target_fn, await->base.base.source_node, must_not_be_async,
48174817 CallModifierNone))
48184818 {
......@@ -6239,7 +6239,7 @@ static void mark_suspension_point(Scope *scope) {
62396239 case ScopeIdDecls:
62406240 case ScopeIdFnDef:
62416241 case ScopeIdCompTime:
6242 case ScopeIdNoAsync:
6242 case ScopeIdNoSuspend:
62436243 case ScopeIdCImport:
62446244 case ScopeIdSuspend:
62456245 case ScopeIdTypeOf:
......@@ -6472,7 +6472,7 @@ static Error resolve_async_frame(CodeGen *g, ZigType *frame_type) {
64726472 // The funtion call result of foo() must be spilled.
64736473 for (size_t i = 0; i < fn->await_list.length; i += 1) {
64746474 IrInstGenAwait *await = fn->await_list.at(i);
6475 if (await->is_noasync) {
6475 if (await->is_nosuspend) {
64766476 continue;
64776477 }
64786478 if (await->base.value->special != ConstValSpecialRuntime) {
src/analyze.hpp+1-1
......@@ -125,7 +125,7 @@ ScopeLoop *create_loop_scope(CodeGen *g, AstNode *node, Scope *parent);
125125ScopeSuspend *create_suspend_scope(CodeGen *g, AstNode *node, Scope *parent);
126126ScopeFnDef *create_fndef_scope(CodeGen *g, AstNode *node, Scope *parent, ZigFn *fn_entry);
127127Scope *create_comptime_scope(CodeGen *g, AstNode *node, Scope *parent);
128Scope *create_noasync_scope(CodeGen *g, AstNode *node, Scope *parent);
128Scope *create_nosuspend_scope(CodeGen *g, AstNode *node, Scope *parent);
129129Scope *create_runtime_scope(CodeGen *g, AstNode *node, Scope *parent, IrInstSrc *is_comptime);
130130Scope *create_typeof_scope(CodeGen *g, AstNode *node, Scope *parent);
131131ScopeExpr *create_expr_scope(CodeGen *g, AstNode *node, Scope *parent);
src/ast_render.cpp+7-7
......@@ -220,8 +220,8 @@ static const char *node_type_str(NodeType node_type) {
220220 return "SwitchRange";
221221 case NodeTypeCompTime:
222222 return "CompTime";
223 case NodeTypeNoAsync:
224 return "NoAsync";
223 case NodeTypeNoSuspend:
224 return "NoSuspend";
225225 case NodeTypeBreak:
226226 return "Break";
227227 case NodeTypeContinue:
......@@ -709,8 +709,8 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
709709 switch (node->data.fn_call_expr.modifier) {
710710 case CallModifierNone:
711711 break;
712 case CallModifierNoAsync:
713 fprintf(ar->f, "noasync ");
712 case CallModifierNoSuspend:
713 fprintf(ar->f, "nosuspend ");
714714 break;
715715 case CallModifierAsync:
716716 fprintf(ar->f, "async ");
......@@ -1093,10 +1093,10 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
10931093 render_node_grouped(ar, node->data.comptime_expr.expr);
10941094 break;
10951095 }
1096 case NodeTypeNoAsync:
1096 case NodeTypeNoSuspend:
10971097 {
1098 fprintf(ar->f, "noasync ");
1099 render_node_grouped(ar, node->data.noasync_expr.expr);
1098 fprintf(ar->f, "nosuspend ");
1099 render_node_grouped(ar, node->data.nosuspend_expr.expr);
11001100 break;
11011101 }
11021102 case NodeTypeForExpr:
src/codegen.cpp+15-15
......@@ -685,7 +685,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
685685 case ScopeIdLoop:
686686 case ScopeIdSuspend:
687687 case ScopeIdCompTime:
688 case ScopeIdNoAsync:
688 case ScopeIdNoSuspend:
689689 case ScopeIdRuntime:
690690 case ScopeIdTypeOf:
691691 case ScopeIdExpr:
......@@ -966,8 +966,8 @@ static Buf *panic_msg_buf(PanicMsgId msg_id) {
966966 return buf_create_from_str("frame too small");
967967 case PanicMsgIdResumedFnPendingAwait:
968968 return buf_create_from_str("resumed an async function which can only be awaited");
969 case PanicMsgIdBadNoAsyncCall:
970 return buf_create_from_str("async function called in noasync scope suspended");
969 case PanicMsgIdBadNoSuspendCall:
970 return buf_create_from_str("async function called in nosuspend scope suspended");
971971 case PanicMsgIdResumeNotSuspendedFn:
972972 return buf_create_from_str("resumed a non-suspended function");
973973 case PanicMsgIdBadSentinel:
......@@ -4061,7 +4061,7 @@ static void render_async_var_decls(CodeGen *g, Scope *scope) {
40614061 case ScopeIdLoop:
40624062 case ScopeIdSuspend:
40634063 case ScopeIdCompTime:
4064 case ScopeIdNoAsync:
4064 case ScopeIdNoSuspend:
40654065 case ScopeIdRuntime:
40664066 case ScopeIdTypeOf:
40674067 case ScopeIdExpr:
......@@ -4212,9 +4212,9 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn
42124212 // even if prefix_arg_err_ret_stack is true, let the async function do its own
42134213 // initialization.
42144214 } else {
4215 if (instruction->modifier == CallModifierNoAsync && !fn_is_async(g->cur_fn)) {
4215 if (instruction->modifier == CallModifierNoSuspend && !fn_is_async(g->cur_fn)) {
42164216 // Async function called as a normal function, and calling function is not async.
4217 // This is allowed because it was called with `noasync` which asserts that it will
4217 // This is allowed because it was called with `nosuspend` which asserts that it will
42184218 // never suspend.
42194219 awaiter_init_val = zero;
42204220 } else {
......@@ -4325,7 +4325,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn
43254325 case CallModifierCompileTime:
43264326 zig_unreachable();
43274327 case CallModifierNone:
4328 case CallModifierNoAsync:
4328 case CallModifierNoSuspend:
43294329 case CallModifierAsync:
43304330 call_attr = ZigLLVM_CallAttrAuto;
43314331 break;
......@@ -4401,7 +4401,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn
44014401 get_llvm_type(g, instruction->base.value->type), "");
44024402 }
44034403 return nullptr;
4404 } else if (instruction->modifier == CallModifierNoAsync && !fn_is_async(g->cur_fn)) {
4404 } else if (instruction->modifier == CallModifierNoSuspend && !fn_is_async(g->cur_fn)) {
44054405 gen_resume(g, fn_val, frame_result_loc, ResumeIdCall);
44064406
44074407 if (ir_want_runtime_safety(g, &instruction->base)) {
......@@ -4412,13 +4412,13 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutableGen *executable, IrIn
44124412 all_ones, LLVMAtomicOrderingRelease);
44134413 LLVMValueRef ok_val = LLVMBuildICmp(g->builder, LLVMIntEQ, prev_val, all_ones, "");
44144414
4415 LLVMBasicBlockRef bad_block = LLVMAppendBasicBlock(g->cur_fn_val, "NoAsyncPanic");
4416 LLVMBasicBlockRef ok_block = LLVMAppendBasicBlock(g->cur_fn_val, "NoAsyncOk");
4415 LLVMBasicBlockRef bad_block = LLVMAppendBasicBlock(g->cur_fn_val, "NoSuspendPanic");
4416 LLVMBasicBlockRef ok_block = LLVMAppendBasicBlock(g->cur_fn_val, "NoSuspendOk");
44174417 LLVMBuildCondBr(g->builder, ok_val, ok_block, bad_block);
44184418
4419 // The async function suspended, but this noasync call asserted it wouldn't.
4419 // The async function suspended, but this nosuspend call asserted it wouldn't.
44204420 LLVMPositionBuilderAtEnd(g->builder, bad_block);
4421 gen_safety_crash(g, PanicMsgIdBadNoAsyncCall);
4421 gen_safety_crash(g, PanicMsgIdBadNoSuspendCall);
44224422
44234423 LLVMPositionBuilderAtEnd(g->builder, ok_block);
44244424 }
......@@ -6391,7 +6391,7 @@ static LLVMValueRef ir_render_await(CodeGen *g, IrExecutableGen *executable, IrI
63916391 LLVMValueRef result_loc = (instruction->result_loc == nullptr) ?
63926392 nullptr : ir_llvm_value(g, instruction->result_loc);
63936393
6394 if (instruction->is_noasync ||
6394 if (instruction->is_nosuspend ||
63956395 (instruction->target_fn != nullptr && !fn_is_async(instruction->target_fn)))
63966396 {
63976397 return gen_await_early_return(g, &instruction->base, target_frame_ptr, result_type,
......@@ -7918,7 +7918,7 @@ static void do_code_gen(CodeGen *g) {
79187918 }
79197919
79207920 if (!is_async) {
7921 // allocate async frames for noasync calls & awaits to async functions
7921 // allocate async frames for nosuspend calls & awaits to async functions
79227922 ZigType *largest_call_frame_type = nullptr;
79237923 IrInstGen *all_calls_alloca = ir_create_alloca(g, &fn_table_entry->fndef_scope->base,
79247924 fn_table_entry->body_node, fn_table_entry, g->builtin_types.entry_void, "@async_call_frame");
......@@ -7928,7 +7928,7 @@ static void do_code_gen(CodeGen *g) {
79287928 continue;
79297929 if (!fn_is_async(call->fn_entry))
79307930 continue;
7931 if (call->modifier != CallModifierNoAsync)
7931 if (call->modifier != CallModifierNoSuspend)
79327932 continue;
79337933 if (call->frame_result_loc != nullptr)
79347934 continue;
src/ir.cpp+30-30
......@@ -4846,12 +4846,12 @@ static IrInstGen *ir_build_suspend_finish_gen(IrAnalyze *ira, IrInst *source_ins
48464846}
48474847
48484848static IrInstSrc *ir_build_await_src(IrBuilderSrc *irb, Scope *scope, AstNode *source_node,
4849 IrInstSrc *frame, ResultLoc *result_loc, bool is_noasync)
4849 IrInstSrc *frame, ResultLoc *result_loc, bool is_nosuspend)
48504850{
48514851 IrInstSrcAwait *instruction = ir_build_instruction<IrInstSrcAwait>(irb, scope, source_node);
48524852 instruction->frame = frame;
48534853 instruction->result_loc = result_loc;
4854 instruction->is_noasync = is_noasync;
4854 instruction->is_nosuspend = is_nosuspend;
48554855
48564856 ir_ref_instruction(frame, irb->current_basic_block);
48574857
......@@ -4859,14 +4859,14 @@ static IrInstSrc *ir_build_await_src(IrBuilderSrc *irb, Scope *scope, AstNode *s
48594859}
48604860
48614861static IrInstGenAwait *ir_build_await_gen(IrAnalyze *ira, IrInst *source_instruction,
4862 IrInstGen *frame, ZigType *result_type, IrInstGen *result_loc, bool is_noasync)
4862 IrInstGen *frame, ZigType *result_type, IrInstGen *result_loc, bool is_nosuspend)
48634863{
48644864 IrInstGenAwait *instruction = ir_build_inst_gen<IrInstGenAwait>(&ira->new_irb,
48654865 source_instruction->scope, source_instruction->source_node);
48664866 instruction->base.value->type = result_type;
48674867 instruction->frame = frame;
48684868 instruction->result_loc = result_loc;
4869 instruction->is_noasync = is_noasync;
4869 instruction->is_nosuspend = is_nosuspend;
48704870
48714871 ir_ref_inst_gen(frame);
48724872 if (result_loc != nullptr) ir_ref_inst_gen(result_loc);
......@@ -4982,7 +4982,7 @@ static void ir_count_defers(IrBuilderSrc *irb, Scope *inner_scope, Scope *outer_
49824982 case ScopeIdLoop:
49834983 case ScopeIdSuspend:
49844984 case ScopeIdCompTime:
4985 case ScopeIdNoAsync:
4985 case ScopeIdNoSuspend:
49864986 case ScopeIdRuntime:
49874987 case ScopeIdTypeOf:
49884988 case ScopeIdExpr:
......@@ -5072,7 +5072,7 @@ static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope
50725072 case ScopeIdLoop:
50735073 case ScopeIdSuspend:
50745074 case ScopeIdCompTime:
5075 case ScopeIdNoAsync:
5075 case ScopeIdNoSuspend:
50765076 case ScopeIdRuntime:
50775077 case ScopeIdTypeOf:
50785078 case ScopeIdExpr:
......@@ -7335,10 +7335,10 @@ static IrInstSrc *ir_gen_builtin_fn_call(IrBuilderSrc *irb, Scope *scope, AstNod
73357335 zig_unreachable();
73367336}
73377337
7338static ScopeNoAsync *get_scope_noasync(Scope *scope) {
7338static ScopeNoSuspend *get_scope_nosuspend(Scope *scope) {
73397339 while (scope) {
7340 if (scope->id == ScopeIdNoAsync)
7341 return (ScopeNoAsync *)scope;
7340 if (scope->id == ScopeIdNoSuspend)
7341 return (ScopeNoSuspend *)scope;
73427342 if (scope->id == ScopeIdFnDef)
73437343 return nullptr;
73447344
......@@ -7355,15 +7355,15 @@ static IrInstSrc *ir_gen_fn_call(IrBuilderSrc *irb, Scope *scope, AstNode *node,
73557355 if (node->data.fn_call_expr.modifier == CallModifierBuiltin)
73567356 return ir_gen_builtin_fn_call(irb, scope, node, lval, result_loc);
73577357
7358 bool is_noasync = get_scope_noasync(scope) != nullptr;
7358 bool is_nosuspend = get_scope_nosuspend(scope) != nullptr;
73597359 CallModifier modifier = node->data.fn_call_expr.modifier;
7360 if (is_noasync) {
7360 if (is_nosuspend) {
73617361 if (modifier == CallModifierAsync) {
73627362 add_node_error(irb->codegen, node,
7363 buf_sprintf("async call in noasync scope"));
7363 buf_sprintf("async call in nosuspend scope"));
73647364 return irb->codegen->invalid_inst_src;
73657365 }
7366 modifier = CallModifierNoAsync;
7366 modifier = CallModifierNoSuspend;
73677367 }
73687368
73697369 AstNode *fn_ref_node = node->data.fn_call_expr.fn_ref_expr;
......@@ -9222,10 +9222,10 @@ static IrInstSrc *ir_gen_comptime(IrBuilderSrc *irb, Scope *parent_scope, AstNod
92229222 return ir_gen_node_extra(irb, node->data.comptime_expr.expr, child_scope, lval, nullptr);
92239223}
92249224
9225static IrInstSrc *ir_gen_noasync(IrBuilderSrc *irb, Scope *parent_scope, AstNode *node, LVal lval) {
9226 assert(node->type == NodeTypeNoAsync);
9225static IrInstSrc *ir_gen_nosuspend(IrBuilderSrc *irb, Scope *parent_scope, AstNode *node, LVal lval) {
9226 assert(node->type == NodeTypeNoSuspend);
92279227
9228 Scope *child_scope = create_noasync_scope(irb->codegen, node, parent_scope);
9228 Scope *child_scope = create_nosuspend_scope(irb->codegen, node, parent_scope);
92299229 // purposefully pass null for result_loc and let EndExpr handle it
92309230 return ir_gen_node_extra(irb, node->data.comptime_expr.expr, child_scope, lval, nullptr);
92319231}
......@@ -9813,8 +9813,8 @@ static IrInstSrc *ir_gen_fn_proto(IrBuilderSrc *irb, Scope *parent_scope, AstNod
98139813
98149814static IrInstSrc *ir_gen_resume(IrBuilderSrc *irb, Scope *scope, AstNode *node) {
98159815 assert(node->type == NodeTypeResume);
9816 if (get_scope_noasync(scope) != nullptr) {
9817 add_node_error(irb->codegen, node, buf_sprintf("resume in noasync scope"));
9816 if (get_scope_nosuspend(scope) != nullptr) {
9817 add_node_error(irb->codegen, node, buf_sprintf("resume in nosuspend scope"));
98189818 return irb->codegen->invalid_inst_src;
98199819 }
98209820
......@@ -9830,7 +9830,7 @@ static IrInstSrc *ir_gen_await_expr(IrBuilderSrc *irb, Scope *scope, AstNode *no
98309830{
98319831 assert(node->type == NodeTypeAwaitExpr);
98329832
9833 bool is_noasync = get_scope_noasync(scope) != nullptr;
9833 bool is_nosuspend = get_scope_nosuspend(scope) != nullptr;
98349834
98359835 AstNode *expr_node = node->data.await_expr.expr;
98369836 if (expr_node->type == NodeTypeFnCallExpr && expr_node->data.fn_call_expr.modifier == CallModifierBuiltin) {
......@@ -9864,7 +9864,7 @@ static IrInstSrc *ir_gen_await_expr(IrBuilderSrc *irb, Scope *scope, AstNode *no
98649864 if (target_inst == irb->codegen->invalid_inst_src)
98659865 return irb->codegen->invalid_inst_src;
98669866
9867 IrInstSrc *await_inst = ir_build_await_src(irb, scope, node, target_inst, result_loc, is_noasync);
9867 IrInstSrc *await_inst = ir_build_await_src(irb, scope, node, target_inst, result_loc, is_nosuspend);
98689868 return ir_lval_wrap(irb, scope, await_inst, lval, result_loc);
98699869}
98709870
......@@ -9876,8 +9876,8 @@ static IrInstSrc *ir_gen_suspend(IrBuilderSrc *irb, Scope *parent_scope, AstNode
98769876 add_node_error(irb->codegen, node, buf_sprintf("suspend outside function definition"));
98779877 return irb->codegen->invalid_inst_src;
98789878 }
9879 if (get_scope_noasync(parent_scope) != nullptr) {
9880 add_node_error(irb->codegen, node, buf_sprintf("suspend in noasync scope"));
9879 if (get_scope_nosuspend(parent_scope) != nullptr) {
9880 add_node_error(irb->codegen, node, buf_sprintf("suspend in nosuspend scope"));
98819881 return irb->codegen->invalid_inst_src;
98829882 }
98839883
......@@ -10017,8 +10017,8 @@ static IrInstSrc *ir_gen_node_raw(IrBuilderSrc *irb, AstNode *node, Scope *scope
1001710017 return ir_gen_switch_expr(irb, scope, node, lval, result_loc);
1001810018 case NodeTypeCompTime:
1001910019 return ir_expr_wrap(irb, scope, ir_gen_comptime(irb, scope, node, lval), result_loc);
10020 case NodeTypeNoAsync:
10021 return ir_expr_wrap(irb, scope, ir_gen_noasync(irb, scope, node, lval), result_loc);
10020 case NodeTypeNoSuspend:
10021 return ir_expr_wrap(irb, scope, ir_gen_nosuspend(irb, scope, node, lval), result_loc);
1002210022 case NodeTypeErrorType:
1002310023 return ir_lval_wrap(irb, scope, ir_gen_error_type(irb, scope, node), lval, result_loc);
1002410024 case NodeTypeBreak:
......@@ -10105,7 +10105,7 @@ static IrInstSrc *ir_gen_node_extra(IrBuilderSrc *irb, AstNode *node, Scope *sco
1010510105 case NodeTypeIfOptional:
1010610106 case NodeTypeSwitchExpr:
1010710107 case NodeTypeCompTime:
10108 case NodeTypeNoAsync:
10108 case NodeTypeNoSuspend:
1010910109 case NodeTypeErrorType:
1011010110 case NodeTypeBreak:
1011110111 case NodeTypeContinue:
......@@ -20025,7 +20025,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr,
2002520025
2002620026 if (impl_fn_type_id->cc == CallingConventionAsync &&
2002720027 parent_fn_entry->inferred_async_node == nullptr &&
20028 modifier != CallModifierNoAsync)
20028 modifier != CallModifierNoSuspend)
2002920029 {
2003020030 parent_fn_entry->inferred_async_node = fn_ref->base.source_node;
2003120031 parent_fn_entry->inferred_async_fn = impl_fn;
......@@ -20123,7 +20123,7 @@ static IrInstGen *ir_analyze_fn_call(IrAnalyze *ira, IrInst* source_instr,
2012320123
2012420124 if (fn_type_id->cc == CallingConventionAsync &&
2012520125 parent_fn_entry->inferred_async_node == nullptr &&
20126 modifier != CallModifierNoAsync)
20126 modifier != CallModifierNoSuspend)
2012720127 {
2012820128 parent_fn_entry->inferred_async_node = fn_ref->base.source_node;
2012920129 parent_fn_entry->inferred_async_fn = fn_entry;
......@@ -20233,7 +20233,7 @@ static IrInstGen *ir_analyze_call_extra(IrAnalyze *ira, IrInst* source_instr,
2023320233 case CallModifierNone:
2023420234 case CallModifierAlwaysInline:
2023520235 case CallModifierAlwaysTail:
20236 case CallModifierNoAsync:
20236 case CallModifierNoSuspend:
2023720237 modifier = CallModifierCompileTime;
2023820238 break;
2023920239 case CallModifierNeverInline:
......@@ -30277,7 +30277,7 @@ static IrInstGen *ir_analyze_instruction_await(IrAnalyze *ira, IrInstSrcAwait *i
3027730277 ir_assert(fn_entry != nullptr, &instruction->base.base);
3027830278
3027930279 // If it's not @Frame(func) then it's definitely a suspend point
30280 if (target_fn == nullptr && !instruction->is_noasync) {
30280 if (target_fn == nullptr && !instruction->is_nosuspend) {
3028130281 if (fn_entry->inferred_async_node == nullptr) {
3028230282 fn_entry->inferred_async_node = instruction->base.base.source_node;
3028330283 }
......@@ -30301,7 +30301,7 @@ static IrInstGen *ir_analyze_instruction_await(IrAnalyze *ira, IrInstSrcAwait *i
3030130301 }
3030230302
3030330303 IrInstGenAwait *result = ir_build_await_gen(ira, &instruction->base.base, frame, result_type, result_loc,
30304 instruction->is_noasync);
30304 instruction->is_nosuspend);
3030530305 result->target_fn = target_fn;
3030630306 fn_entry->await_list.append(result);
3030730307 return ir_finish_anal(ira, &result->base);
src/ir_print.cpp+4-4
......@@ -861,8 +861,8 @@ static void ir_print_call_src(IrPrintSrc *irp, IrInstSrcCall *call_instruction)
861861 switch (call_instruction->modifier) {
862862 case CallModifierNone:
863863 break;
864 case CallModifierNoAsync:
865 fprintf(irp->f, "noasync ");
864 case CallModifierNoSuspend:
865 fprintf(irp->f, "nosuspend ");
866866 break;
867867 case CallModifierAsync:
868868 fprintf(irp->f, "async ");
......@@ -906,8 +906,8 @@ static void ir_print_call_gen(IrPrintGen *irp, IrInstGenCall *call_instruction)
906906 switch (call_instruction->modifier) {
907907 case CallModifierNone:
908908 break;
909 case CallModifierNoAsync:
910 fprintf(irp->f, "noasync ");
909 case CallModifierNoSuspend:
910 fprintf(irp->f, "nosuspend ");
911911 break;
912912 case CallModifierAsync:
913913 fprintf(irp->f, "async ");
src/parser.cpp+16-16
......@@ -913,7 +913,7 @@ static AstNode *ast_parse_container_field(ParseContext *pc) {
913913// Statement
914914// <- KEYWORD_comptime? VarDecl
915915// / KEYWORD_comptime BlockExprStatement
916// / KEYWORD_noasync BlockExprStatement
916// / KEYWORD_nosuspend BlockExprStatement
917917// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)
918918// / KEYWORD_defer BlockExprStatement
919919// / KEYWORD_errdefer Payload? BlockExprStatement
......@@ -937,11 +937,11 @@ static AstNode *ast_parse_statement(ParseContext *pc) {
937937 return res;
938938 }
939939
940 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
941 if (noasync != nullptr) {
940 Token *nosuspend = eat_token_if(pc, TokenIdKeywordNoSuspend);
941 if (nosuspend != nullptr) {
942942 AstNode *statement = ast_expect(pc, ast_parse_block_expr_statement);
943 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
944 res->data.noasync_expr.expr = statement;
943 AstNode *res = ast_create_node(pc, NodeTypeNoSuspend, nosuspend);
944 res->data.nosuspend_expr.expr = statement;
945945 return res;
946946 }
947947
......@@ -1289,7 +1289,7 @@ static AstNode *ast_parse_prefix_expr(ParseContext *pc) {
12891289// / IfExpr
12901290// / KEYWORD_break BreakLabel? Expr?
12911291// / KEYWORD_comptime Expr
1292// / KEYWORD_noasync Expr
1292// / KEYWORD_nosuspend Expr
12931293// / KEYWORD_continue BreakLabel?
12941294// / KEYWORD_resume Expr
12951295// / KEYWORD_return Expr?
......@@ -1324,11 +1324,11 @@ static AstNode *ast_parse_primary_expr(ParseContext *pc) {
13241324 return res;
13251325 }
13261326
1327 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
1328 if (noasync != nullptr) {
1327 Token *nosuspend = eat_token_if(pc, TokenIdKeywordNoSuspend);
1328 if (nosuspend != nullptr) {
13291329 AstNode *expr = ast_expect(pc, ast_parse_expr);
1330 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
1331 res->data.noasync_expr.expr = expr;
1330 AstNode *res = ast_create_node(pc, NodeTypeNoSuspend, nosuspend);
1331 res->data.nosuspend_expr.expr = expr;
13321332 return res;
13331333 }
13341334
......@@ -1640,7 +1640,7 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) {
16401640// / IfTypeExpr
16411641// / INTEGER
16421642// / KEYWORD_comptime TypeExpr
1643// / KEYWORD_noasync TypeExpr
1643// / KEYWORD_nosuspend TypeExpr
16441644// / KEYWORD_error DOT IDENTIFIER
16451645// / KEYWORD_false
16461646// / KEYWORD_null
......@@ -1742,11 +1742,11 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) {
17421742 return res;
17431743 }
17441744
1745 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
1746 if (noasync != nullptr) {
1745 Token *nosuspend = eat_token_if(pc, TokenIdKeywordNoSuspend);
1746 if (nosuspend != nullptr) {
17471747 AstNode *expr = ast_expect(pc, ast_parse_type_expr);
1748 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
1749 res->data.noasync_expr.expr = expr;
1748 AstNode *res = ast_create_node(pc, NodeTypeNoSuspend, nosuspend);
1749 res->data.nosuspend_expr.expr = expr;
17501750 return res;
17511751 }
17521752
......@@ -3189,7 +3189,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont
31893189 case NodeTypeCompTime:
31903190 visit_field(&node->data.comptime_expr.expr, visit, context);
31913191 break;
3192 case NodeTypeNoAsync:
3192 case NodeTypeNoSuspend:
31933193 visit_field(&node->data.comptime_expr.expr, visit, context);
31943194 break;
31953195 case NodeTypeBreak:
src/tokenizer.cpp+2-2
......@@ -128,8 +128,8 @@ static const struct ZigKeyword zig_keywords[] = {
128128 {"if", TokenIdKeywordIf},
129129 {"inline", TokenIdKeywordInline},
130130 {"noalias", TokenIdKeywordNoAlias},
131 {"noasync", TokenIdKeywordNoAsync},
132131 {"noinline", TokenIdKeywordNoInline},
132 {"nosuspend", TokenIdKeywordNoSuspend},
133133 {"null", TokenIdKeywordNull},
134134 {"or", TokenIdKeywordOr},
135135 {"orelse", TokenIdKeywordOrElse},
......@@ -1589,8 +1589,8 @@ const char * token_name(TokenId id) {
15891589 case TokenIdKeywordIf: return "if";
15901590 case TokenIdKeywordInline: return "inline";
15911591 case TokenIdKeywordNoAlias: return "noalias";
1592 case TokenIdKeywordNoAsync: return "noasync";
15931592 case TokenIdKeywordNoInline: return "noinline";
1593 case TokenIdKeywordNoSuspend: return "nosuspend";
15941594 case TokenIdKeywordNull: return "null";
15951595 case TokenIdKeywordOr: return "or";
15961596 case TokenIdKeywordOrElse: return "orelse";
src/tokenizer.hpp+1-1
......@@ -78,7 +78,7 @@ enum TokenId {
7878 TokenIdKeywordNoInline,
7979 TokenIdKeywordLinkSection,
8080 TokenIdKeywordNoAlias,
81 TokenIdKeywordNoAsync,
81 TokenIdKeywordNoSuspend,
8282 TokenIdKeywordNull,
8383 TokenIdKeywordOr,
8484 TokenIdKeywordOrElse,