authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-05 16:55:32-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-05 17:07:15-05:00
log1f602fe8c5b3dea9f00f96e70dad73ebce405b49
tree30df1e8c6fd6f4dd99d91679aa02c79e0ff75c5f
parent38791ac616069963fd808ec724161b93cbc564c1
signature Commit is signed but in an unrecognized format.

implement `@call`

closes #3732

14 files changed, 529 insertions(+), 188 deletions(-)

lib/std/builtin.zig+18
......@@ -372,6 +372,24 @@ pub const Version = struct {
372372 patch: u32,
373373};
374374
375/// This data structure is used by the Zig language code generation and
376/// therefore must be kept in sync with the compiler implementation.
377pub const CallOptions = struct {
378 modifier: Modifier = .auto,
379 stack: ?[]align(std.Target.stack_align) u8 = null,
380
381 pub const Modifier = enum {
382 auto,
383 no_async,
384 async_call,
385 never_tail,
386 never_inline,
387 always_tail,
388 always_inline,
389 compile_time,
390 };
391};
392
375393/// This function type is used by the Zig language code generation and
376394/// therefore must be kept in sync with the compiler implementation.
377395pub const PanicFn = fn ([]const u8, ?*StackTrace) noreturn;
src-self-hosted/llvm.zig+6-4
......@@ -260,10 +260,12 @@ pub const X86StdcallCallConv = c.LLVMX86StdcallCallConv;
260260pub const X86FastcallCallConv = c.LLVMX86FastcallCallConv;
261261pub const CallConv = c.LLVMCallConv;
262262
263pub const FnInline = extern enum {
263pub const CallAttr = extern enum {
264264 Auto,
265 Always,
266 Never,
265 NeverTail,
266 NeverInline,
267 AlwaysTail,
268 AlwaysInline,
267269};
268270
269271fn removeNullability(comptime T: type) type {
......@@ -286,6 +288,6 @@ extern fn ZigLLVMTargetMachineEmitToFile(
286288) bool;
287289
288290pub const BuildCall = ZigLLVMBuildCall;
289extern fn ZigLLVMBuildCall(B: *Builder, Fn: *Value, Args: [*]*Value, NumArgs: c_uint, CC: c_uint, fn_inline: FnInline, Name: [*:0]const u8) ?*Value;
291extern fn ZigLLVMBuildCall(B: *Builder, Fn: *Value, Args: [*]*Value, NumArgs: c_uint, CC: c_uint, fn_inline: CallAttr, Name: [*:0]const u8) ?*Value;
290292
291293pub const PrivateLinkage = c.LLVMLinkage.LLVMPrivateLinkage;
src/all_types.hpp+23-5
......@@ -767,10 +767,18 @@ struct AstNodeUnwrapOptional {
767767 AstNode *expr;
768768};
769769
770// Must be synchronized with std.builtin.CallOptions.Modifier
770771enum CallModifier {
771772 CallModifierNone,
772 CallModifierAsync,
773773 CallModifierNoAsync,
774 CallModifierAsync,
775 CallModifierNeverTail,
776 CallModifierNeverInline,
777 CallModifierAlwaysTail,
778 CallModifierAlwaysInline,
779 CallModifierCompileTime,
780
781 // This is an additional tag in the compiler, but not exposed in the std lib.
774782 CallModifierBuiltin,
775783};
776784
......@@ -1717,6 +1725,7 @@ enum BuiltinFnId {
17171725 BuiltinFnIdFrameHandle,
17181726 BuiltinFnIdFrameSize,
17191727 BuiltinFnIdAs,
1728 BuiltinFnIdCall,
17201729};
17211730
17221731struct BuiltinFnEntry {
......@@ -2479,6 +2488,7 @@ enum IrInstructionId {
24792488 IrInstructionIdVarPtr,
24802489 IrInstructionIdReturnPtr,
24812490 IrInstructionIdCallSrc,
2491 IrInstructionIdCallExtra,
24822492 IrInstructionIdCallGen,
24832493 IrInstructionIdConst,
24842494 IrInstructionIdReturn,
......@@ -2886,15 +2896,24 @@ struct IrInstructionCallSrc {
28862896 ZigFn *fn_entry;
28872897 size_t arg_count;
28882898 IrInstruction **args;
2899 IrInstruction *ret_ptr;
28892900 ResultLoc *result_loc;
28902901
28912902 IrInstruction *new_stack;
28922903
2893 FnInline fn_inline;
28942904 CallModifier modifier;
2895
28962905 bool is_async_call_builtin;
2897 bool is_comptime;
2906};
2907
2908/// This is a pass1 instruction, used by @call.
2909/// `args` is expected to be either a struct or a tuple.
2910struct IrInstructionCallExtra {
2911 IrInstruction base;
2912
2913 IrInstruction *options;
2914 IrInstruction *fn_ref;
2915 IrInstruction *args;
2916 ResultLoc *result_loc;
28982917};
28992918
29002919struct IrInstructionCallGen {
......@@ -2908,7 +2927,6 @@ struct IrInstructionCallGen {
29082927 IrInstruction *frame_result_loc;
29092928 IrInstruction *new_stack;
29102929
2911 FnInline fn_inline;
29122930 CallModifier modifier;
29132931
29142932 bool is_async_call_builtin;
src/analyze.cpp+10-7
......@@ -956,10 +956,7 @@ bool calling_convention_allows_zig_types(CallingConvention cc) {
956956
957957ZigType *get_stack_trace_type(CodeGen *g) {
958958 if (g->stack_trace_type == nullptr) {
959 ZigValue *stack_trace_type_val = get_builtin_value(g, "StackTrace");
960 assert(stack_trace_type_val->type->id == ZigTypeIdMetaType);
961
962 g->stack_trace_type = stack_trace_type_val->data.x_type;
959 g->stack_trace_type = get_builtin_type(g, "StackTrace");
963960 assertNoError(type_resolve(g, g->stack_trace_type, ResolveStatusZeroBitsKnown));
964961 }
965962 return g->stack_trace_type;
......@@ -2717,10 +2714,10 @@ static Error resolve_struct_zero_bits(CodeGen *g, ZigType *struct_type) {
27172714 src_assert(struct_type->data.structure.fields == nullptr, decl_node);
27182715 struct_type->data.structure.fields = alloc_type_struct_fields(field_count);
27192716 } else if (decl_node->type == NodeTypeContainerInitExpr) {
2720 src_assert(struct_type->data.structure.is_inferred, decl_node);
2721 src_assert(struct_type->data.structure.fields != nullptr, decl_node);
2722
27232717 field_count = struct_type->data.structure.src_field_count;
2718
2719 src_assert(struct_type->data.structure.is_inferred, decl_node);
2720 src_assert(field_count == 0 || struct_type->data.structure.fields != nullptr, decl_node);
27242721 } else zig_unreachable();
27252722
27262723 struct_type->data.structure.fields_by_name.init(field_count);
......@@ -7531,6 +7528,12 @@ ZigValue *get_builtin_value(CodeGen *codegen, const char *name) {
75317528 return var_value;
75327529}
75337530
7531ZigType *get_builtin_type(CodeGen *codegen, const char *name) {
7532 ZigValue *type_val = get_builtin_value(codegen, name);
7533 assert(type_val->type->id == ZigTypeIdMetaType);
7534 return type_val->data.x_type;
7535}
7536
75347537bool type_is_global_error_set(ZigType *err_set_type) {
75357538 assert(err_set_type->id == ZigTypeIdErrorSet);
75367539 assert(!err_set_type->data.error_set.incomplete);
src/analyze.hpp+1
......@@ -207,6 +207,7 @@ void add_var_export(CodeGen *g, ZigVar *fn_table_entry, const char *symbol_name,
207207
208208
209209ZigValue *get_builtin_value(CodeGen *codegen, const char *name);
210ZigType *get_builtin_type(CodeGen *codegen, const char *name);
210211ZigType *get_stack_trace_type(CodeGen *g);
211212bool resolve_inferred_error_set(CodeGen *g, ZigType *err_set_type, AstNode *source_node);
212213
src/ast_render.cpp+19-4
......@@ -702,14 +702,29 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
702702 switch (node->data.fn_call_expr.modifier) {
703703 case CallModifierNone:
704704 break;
705 case CallModifierBuiltin:
706 fprintf(ar->f, "@");
705 case CallModifierNoAsync:
706 fprintf(ar->f, "noasync ");
707707 break;
708708 case CallModifierAsync:
709709 fprintf(ar->f, "async ");
710710 break;
711 case CallModifierNoAsync:
712 fprintf(ar->f, "noasync ");
711 case CallModifierNeverTail:
712 fprintf(ar->f, "notail ");
713 break;
714 case CallModifierNeverInline:
715 fprintf(ar->f, "noinline ");
716 break;
717 case CallModifierAlwaysTail:
718 fprintf(ar->f, "tail ");
719 break;
720 case CallModifierAlwaysInline:
721 fprintf(ar->f, "inline ");
722 break;
723 case CallModifierCompileTime:
724 fprintf(ar->f, "comptime ");
725 break;
726 case CallModifierBuiltin:
727 fprintf(ar->f, "@");
713728 break;
714729 }
715730 AstNode *fn_ref_node = node->data.fn_call_expr.fn_ref_expr;
src/codegen.cpp+35-20
......@@ -981,7 +981,7 @@ static void gen_panic(CodeGen *g, LLVMValueRef msg_arg, LLVMValueRef stack_trace
981981 msg_arg,
982982 stack_trace_arg,
983983 };
984 ZigLLVMBuildCall(g->builder, fn_val, args, 2, llvm_cc, ZigLLVM_FnInlineAuto, "");
984 ZigLLVMBuildCall(g->builder, fn_val, args, 2, llvm_cc, ZigLLVM_CallAttrAuto, "");
985985 if (!stack_trace_is_llvm_alloca) {
986986 // The stack trace argument is not in the stack of the caller, so
987987 // we'd like to set tail call here, but because slices (the type of msg_arg) are
......@@ -1201,7 +1201,8 @@ static LLVMValueRef get_return_err_fn(CodeGen *g) {
12011201
12021202 LLVMPositionBuilderAtEnd(g->builder, dest_non_null_block);
12031203 LLVMValueRef args[] = { err_ret_trace_ptr, return_address };
1204 ZigLLVMBuildCall(g->builder, add_error_return_trace_addr_fn_val, args, 2, get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAlways, "");
1204 ZigLLVMBuildCall(g->builder, add_error_return_trace_addr_fn_val, args, 2,
1205 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAlwaysInline, "");
12051206 LLVMBuildRetVoid(g->builder);
12061207
12071208 LLVMPositionBuilderAtEnd(g->builder, prev_block);
......@@ -1370,13 +1371,13 @@ static void gen_safety_crash_for_err(CodeGen *g, LLVMValueRef err_val, Scope *sc
13701371 err_val,
13711372 };
13721373 call_instruction = ZigLLVMBuildCall(g->builder, safety_crash_err_fn, args, 2,
1373 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
1374 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
13741375 } else {
13751376 LLVMValueRef args[] = {
13761377 err_val,
13771378 };
13781379 call_instruction = ZigLLVMBuildCall(g->builder, safety_crash_err_fn, args, 1,
1379 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
1380 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
13801381 }
13811382 if (!is_llvm_alloca) {
13821383 LLVMSetTailCall(call_instruction, true);
......@@ -2216,7 +2217,7 @@ static LLVMValueRef get_merge_err_ret_traces_fn_val(CodeGen *g) {
22162217 LLVMValueRef addr_ptr = LLVMBuildInBoundsGEP(g->builder, src_ptr_val, &ptr_index, 1, "");
22172218 LLVMValueRef this_addr_val = LLVMBuildLoad(g->builder, addr_ptr, "");
22182219 LLVMValueRef args[] = {dest_stack_trace_ptr, this_addr_val};
2219 ZigLLVMBuildCall(g->builder, add_error_return_trace_addr_fn_val, args, 2, get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAlways, "");
2220 ZigLLVMBuildCall(g->builder, add_error_return_trace_addr_fn_val, args, 2, get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAlwaysInline, "");
22202221 LLVMValueRef prev_frames_left = LLVMBuildLoad(g->builder, frames_left_ptr, "");
22212222 LLVMValueRef new_frames_left = LLVMBuildNUWSub(g->builder, prev_frames_left, usize_one, "");
22222223 LLVMValueRef done_bit = LLVMBuildICmp(g->builder, LLVMIntEQ, new_frames_left, usize_zero, "");
......@@ -2253,7 +2254,7 @@ static LLVMValueRef ir_render_save_err_ret_addr(CodeGen *g, IrExecutable *execut
22532254 LLVMValueRef my_err_trace_val = get_cur_err_ret_trace_val(g, save_err_ret_addr_instruction->base.scope,
22542255 &is_llvm_alloca);
22552256 ZigLLVMBuildCall(g->builder, return_err_fn, &my_err_trace_val, 1,
2256 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
2257 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
22572258
22582259 ZigType *ret_type = g->cur_fn->type_entry->data.fn.fn_type_id.return_type;
22592260 if (fn_is_async(g->cur_fn) && codegen_fn_has_err_ret_tracing_arg(g, ret_type)) {
......@@ -2297,7 +2298,7 @@ static LLVMValueRef gen_resume(CodeGen *g, LLVMValueRef fn_val, LLVMValueRef tar
22972298 LLVMValueRef arg_val = LLVMConstSub(LLVMConstAllOnes(usize_type_ref),
22982299 LLVMConstInt(usize_type_ref, resume_id, false));
22992300 LLVMValueRef args[] = {target_frame_ptr, arg_val};
2300 return ZigLLVMBuildCall(g->builder, fn_val, args, 2, LLVMFastCallConv, ZigLLVM_FnInlineAuto, "");
2301 return ZigLLVMBuildCall(g->builder, fn_val, args, 2, LLVMFastCallConv, ZigLLVM_CallAttrAuto, "");
23012302}
23022303
23032304static LLVMBasicBlockRef gen_suspend_begin(CodeGen *g, const char *name_hint) {
......@@ -2424,7 +2425,7 @@ static void gen_async_return(CodeGen *g, IrInstructionReturn *instruction) {
24242425 LLVMValueRef my_err_trace_val = get_cur_err_ret_trace_val(g, instruction->base.scope, &is_llvm_alloca);
24252426 LLVMValueRef args[] = { dest_trace_ptr, my_err_trace_val };
24262427 ZigLLVMBuildCall(g->builder, get_merge_err_ret_traces_fn_val(g), args, 2,
2427 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
2428 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
24282429 }
24292430 }
24302431
......@@ -4142,16 +4143,28 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
41424143 fn_walk.data.call.gen_param_types = &gen_param_types;
41434144 walk_function_params(g, fn_type, &fn_walk);
41444145
4145 ZigLLVM_FnInline fn_inline;
4146 switch (instruction->fn_inline) {
4147 case FnInlineAuto:
4148 fn_inline = ZigLLVM_FnInlineAuto;
4146 ZigLLVM_CallAttr call_attr;
4147 switch (instruction->modifier) {
4148 case CallModifierBuiltin:
4149 case CallModifierCompileTime:
4150 zig_unreachable();
4151 case CallModifierNone:
4152 case CallModifierNoAsync:
4153 case CallModifierAsync:
4154 call_attr = ZigLLVM_CallAttrAuto;
41494155 break;
4150 case FnInlineAlways:
4151 fn_inline = (instruction->fn_entry == nullptr) ? ZigLLVM_FnInlineAuto : ZigLLVM_FnInlineAlways;
4156 case CallModifierNeverTail:
4157 call_attr = ZigLLVM_CallAttrNeverTail;
41524158 break;
4153 case FnInlineNever:
4154 fn_inline = ZigLLVM_FnInlineNever;
4159 case CallModifierNeverInline:
4160 call_attr = ZigLLVM_CallAttrNeverInline;
4161 break;
4162 case CallModifierAlwaysTail:
4163 call_attr = ZigLLVM_CallAttrAlwaysTail;
4164 break;
4165 case CallModifierAlwaysInline:
4166 ir_assert(instruction->fn_entry != nullptr, &instruction->base);
4167 call_attr = ZigLLVM_CallAttrAlwaysInline;
41554168 break;
41564169 }
41574170
......@@ -4257,7 +4270,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
42574270
42584271 if (instruction->new_stack == nullptr || instruction->is_async_call_builtin) {
42594272 result = ZigLLVMBuildCall(g->builder, fn_val,
4260 gen_param_values.items, (unsigned)gen_param_values.length, llvm_cc, fn_inline, "");
4273 gen_param_values.items, (unsigned)gen_param_values.length, llvm_cc, call_attr, "");
42614274 } else if (instruction->modifier == CallModifierAsync) {
42624275 zig_panic("TODO @asyncCall of non-async function");
42634276 } else {
......@@ -4269,7 +4282,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
42694282 }
42704283 gen_set_stack_pointer(g, new_stack_addr);
42714284 result = ZigLLVMBuildCall(g->builder, fn_val,
4272 gen_param_values.items, (unsigned)gen_param_values.length, llvm_cc, fn_inline, "");
4285 gen_param_values.items, (unsigned)gen_param_values.length, llvm_cc, call_attr, "");
42734286 if (src_return_type->id != ZigTypeIdUnreachable) {
42744287 LLVMValueRef stackrestore_fn_val = get_stackrestore_fn_val(g);
42754288 LLVMBuildCall(g->builder, stackrestore_fn_val, &old_stack_ref, 1, "");
......@@ -4947,7 +4960,7 @@ static LLVMValueRef ir_render_enum_tag_name(CodeGen *g, IrExecutable *executable
49474960
49484961 LLVMValueRef enum_tag_value = ir_llvm_value(g, instruction->target);
49494962 return ZigLLVMBuildCall(g->builder, enum_name_function, &enum_tag_value, 1,
4950 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
4963 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
49514964}
49524965
49534966static LLVMValueRef ir_render_field_parent_ptr(CodeGen *g, IrExecutable *executable,
......@@ -5903,7 +5916,7 @@ static LLVMValueRef gen_await_early_return(CodeGen *g, IrInstruction *source_ins
59035916 LLVMValueRef dest_trace_ptr = get_cur_err_ret_trace_val(g, source_instr->scope, &is_llvm_alloca);
59045917 LLVMValueRef args[] = { dest_trace_ptr, src_trace_ptr };
59055918 ZigLLVMBuildCall(g->builder, get_merge_err_ret_traces_fn_val(g), args, 2,
5906 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_FnInlineAuto, "");
5919 get_llvm_cc(g, CallingConventionUnspecified), ZigLLVM_CallAttrAuto, "");
59075920 }
59085921 if (non_async && type_has_bits(result_type)) {
59095922 LLVMValueRef result_ptr = (result_loc == nullptr) ? their_result_ptr : result_loc;
......@@ -6137,6 +6150,7 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable,
61376150 case IrInstructionIdLoadPtr:
61386151 case IrInstructionIdHasDecl:
61396152 case IrInstructionIdUndeclaredIdent:
6153 case IrInstructionIdCallExtra:
61406154 case IrInstructionIdCallSrc:
61416155 case IrInstructionIdAllocaSrc:
61426156 case IrInstructionIdEndExpr:
......@@ -8146,6 +8160,7 @@ static void define_builtin_fns(CodeGen *g) {
81468160 create_builtin_fn(g, BuiltinFnIdFrameAddress, "frameAddress", 0);
81478161 create_builtin_fn(g, BuiltinFnIdFrameSize, "frameSize", 1);
81488162 create_builtin_fn(g, BuiltinFnIdAs, "as", 2);
8163 create_builtin_fn(g, BuiltinFnIdCall, "call", 3);
81498164}
81508165
81518166static const char *bool_to_str(bool b) {
src/ir.cpp+292-133
......@@ -265,6 +265,7 @@ static IrInstruction *ir_analyze_struct_field_ptr(IrAnalyze *ira, IrInstruction
265265static IrInstruction *ir_analyze_inferred_field_ptr(IrAnalyze *ira, Buf *field_name,
266266 IrInstruction *source_instr, IrInstruction *container_ptr, ZigType *container_type);
267267static ResultLoc *no_result_loc(void);
268static IrInstruction *ir_analyze_test_non_null(IrAnalyze *ira, IrInstruction *source_inst, IrInstruction *value);
268269
269270static void destroy_instruction(IrInstruction *inst) {
270271#ifdef ZIG_ENABLE_MEM_PROFILE
......@@ -289,6 +290,8 @@ static void destroy_instruction(IrInstruction *inst) {
289290 return destroy(reinterpret_cast<IrInstructionCast *>(inst), name);
290291 case IrInstructionIdCallSrc:
291292 return destroy(reinterpret_cast<IrInstructionCallSrc *>(inst), name);
293 case IrInstructionIdCallExtra:
294 return destroy(reinterpret_cast<IrInstructionCallExtra *>(inst), name);
292295 case IrInstructionIdCallGen:
293296 return destroy(reinterpret_cast<IrInstructionCallGen *>(inst), name);
294297 case IrInstructionIdUnOp:
......@@ -705,6 +708,13 @@ static bool is_opt_err_set(ZigType *ty) {
705708 (ty->id == ZigTypeIdOptional && ty->data.maybe.child_type->id == ZigTypeIdErrorSet);
706709}
707710
711static bool is_tuple(ZigType *type) {
712 return type->id == ZigTypeIdStruct && type->data.structure.decl_node != nullptr &&
713 type->data.structure.decl_node->type == NodeTypeContainerInitExpr &&
714 (type->data.structure.decl_node->data.container_init_expr.kind == ContainerInitKindArray ||
715 type->data.structure.decl_node->data.container_init_expr.entries.length == 0);
716}
717
708718static bool is_slice(ZigType *type) {
709719 return type->id == ZigTypeIdStruct && type->data.structure.is_slice;
710720}
......@@ -968,6 +978,10 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionCallSrc *) {
968978 return IrInstructionIdCallSrc;
969979}
970980
981static constexpr IrInstructionId ir_instruction_id(IrInstructionCallExtra *) {
982 return IrInstructionIdCallExtra;
983}
984
971985static constexpr IrInstructionId ir_instruction_id(IrInstructionCallGen *) {
972986 return IrInstructionIdCallGen;
973987}
......@@ -1891,30 +1905,42 @@ static IrInstruction *ir_build_union_field_ptr(IrBuilder *irb, Scope *scope, Ast
18911905 return &instruction->base;
18921906}
18931907
1908static IrInstruction *ir_build_call_extra(IrBuilder *irb, Scope *scope, AstNode *source_node,
1909 IrInstruction *options, IrInstruction *fn_ref, IrInstruction *args, ResultLoc *result_loc)
1910{
1911 IrInstructionCallExtra *call_instruction = ir_build_instruction<IrInstructionCallExtra>(irb, scope, source_node);
1912 call_instruction->options = options;
1913 call_instruction->fn_ref = fn_ref;
1914 call_instruction->args = args;
1915 call_instruction->result_loc = result_loc;
1916
1917 ir_ref_instruction(options, irb->current_basic_block);
1918 ir_ref_instruction(fn_ref, irb->current_basic_block);
1919 ir_ref_instruction(args, irb->current_basic_block);
1920
1921 return &call_instruction->base;
1922}
1923
18941924static IrInstruction *ir_build_call_src(IrBuilder *irb, Scope *scope, AstNode *source_node,
18951925 ZigFn *fn_entry, IrInstruction *fn_ref, size_t arg_count, IrInstruction **args,
1896 bool is_comptime, FnInline fn_inline, CallModifier modifier, bool is_async_call_builtin,
1926 IrInstruction *ret_ptr, CallModifier modifier, bool is_async_call_builtin,
18971927 IrInstruction *new_stack, ResultLoc *result_loc)
18981928{
18991929 IrInstructionCallSrc *call_instruction = ir_build_instruction<IrInstructionCallSrc>(irb, scope, source_node);
19001930 call_instruction->fn_entry = fn_entry;
19011931 call_instruction->fn_ref = fn_ref;
1902 call_instruction->is_comptime = is_comptime;
1903 call_instruction->fn_inline = fn_inline;
19041932 call_instruction->args = args;
19051933 call_instruction->arg_count = arg_count;
19061934 call_instruction->modifier = modifier;
19071935 call_instruction->is_async_call_builtin = is_async_call_builtin;
19081936 call_instruction->new_stack = new_stack;
19091937 call_instruction->result_loc = result_loc;
1938 call_instruction->ret_ptr = ret_ptr;
19101939
19111940 if (fn_ref != nullptr) ir_ref_instruction(fn_ref, irb->current_basic_block);
19121941 for (size_t i = 0; i < arg_count; i += 1)
19131942 ir_ref_instruction(args[i], irb->current_basic_block);
1914 if (modifier == CallModifierAsync && new_stack != nullptr) {
1915 // in this case the arg at the end is the return pointer
1916 ir_ref_instruction(args[arg_count], irb->current_basic_block);
1917 }
1943 if (ret_ptr != nullptr) ir_ref_instruction(ret_ptr, irb->current_basic_block);
19181944 if (new_stack != nullptr) ir_ref_instruction(new_stack, irb->current_basic_block);
19191945
19201946 return &call_instruction->base;
......@@ -1922,7 +1948,7 @@ static IrInstruction *ir_build_call_src(IrBuilder *irb, Scope *scope, AstNode *s
19221948
19231949static IrInstructionCallGen *ir_build_call_gen(IrAnalyze *ira, IrInstruction *source_instruction,
19241950 ZigFn *fn_entry, IrInstruction *fn_ref, size_t arg_count, IrInstruction **args,
1925 FnInline fn_inline, CallModifier modifier, IrInstruction *new_stack, bool is_async_call_builtin,
1951 CallModifier modifier, IrInstruction *new_stack, bool is_async_call_builtin,
19261952 IrInstruction *result_loc, ZigType *return_type)
19271953{
19281954 IrInstructionCallGen *call_instruction = ir_build_instruction<IrInstructionCallGen>(&ira->new_irb,
......@@ -1930,7 +1956,6 @@ static IrInstructionCallGen *ir_build_call_gen(IrAnalyze *ira, IrInstruction *so
19301956 call_instruction->base.value->type = return_type;
19311957 call_instruction->fn_entry = fn_entry;
19321958 call_instruction->fn_ref = fn_ref;
1933 call_instruction->fn_inline = fn_inline;
19341959 call_instruction->args = args;
19351960 call_instruction->arg_count = arg_count;
19361961 call_instruction->modifier = modifier;
......@@ -5054,10 +5079,7 @@ static IrInstruction *ir_gen_async_call(IrBuilder *irb, Scope *scope, AstNode *a
50545079 return fn_ref;
50555080
50565081 size_t arg_count = call_node->data.fn_call_expr.params.length - arg_offset;
5057
5058 // last "arg" is return pointer
5059 IrInstruction **args = allocate<IrInstruction*>(arg_count + 1);
5060
5082 IrInstruction **args = allocate<IrInstruction*>(arg_count);
50615083 for (size_t i = 0; i < arg_count; i += 1) {
50625084 AstNode *arg_node = call_node->data.fn_call_expr.params.at(i + arg_offset);
50635085 IrInstruction *arg = ir_gen_node(irb, arg_node, scope);
......@@ -5066,12 +5088,10 @@ static IrInstruction *ir_gen_async_call(IrBuilder *irb, Scope *scope, AstNode *a
50665088 args[i] = arg;
50675089 }
50685090
5069 args[arg_count] = ret_ptr;
5070
50715091 CallModifier modifier = (await_node == nullptr) ? CallModifierAsync : CallModifierNone;
50725092 bool is_async_call_builtin = true;
5073 IrInstruction *call = ir_build_call_src(irb, scope, call_node, nullptr, fn_ref, arg_count, args, false,
5074 FnInlineAuto, modifier, is_async_call_builtin, bytes, result_loc);
5093 IrInstruction *call = ir_build_call_src(irb, scope, call_node, nullptr, fn_ref, arg_count, args,
5094 ret_ptr, modifier, is_async_call_builtin, bytes, result_loc);
50755095 return ir_lval_wrap(irb, scope, call, lval, result_loc);
50765096}
50775097
......@@ -6015,10 +6035,11 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
60156035 if (args[i] == irb->codegen->invalid_instruction)
60166036 return args[i];
60176037 }
6018 FnInline fn_inline = (builtin_fn->id == BuiltinFnIdInlineCall) ? FnInlineAlways : FnInlineNever;
6038 CallModifier modifier = (builtin_fn->id == BuiltinFnIdInlineCall) ?
6039 CallModifierAlwaysInline : CallModifierNeverInline;
60196040
6020 IrInstruction *call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args, false,
6021 fn_inline, CallModifierNone, false, nullptr, result_loc);
6041 IrInstruction *call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args,
6042 nullptr, modifier, false, nullptr, result_loc);
60226043 return ir_lval_wrap(irb, scope, call, lval, result_loc);
60236044 }
60246045 case BuiltinFnIdNewStackCall:
......@@ -6050,10 +6071,36 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
60506071 return args[i];
60516072 }
60526073
6053 IrInstruction *call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args, false,
6054 FnInlineAuto, CallModifierNone, false, new_stack, result_loc);
6074 IrInstruction *call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args,
6075 nullptr, CallModifierNone, false, new_stack, result_loc);
60556076 return ir_lval_wrap(irb, scope, call, lval, result_loc);
60566077 }
6078 case BuiltinFnIdCall: {
6079 // Cast the options parameter to the options type
6080 ZigType *options_type = get_builtin_type(irb->codegen, "CallOptions");
6081 IrInstruction *options_type_inst = ir_build_const_type(irb, scope, node, options_type);
6082 ResultLocCast *result_loc_cast = ir_build_cast_result_loc(irb, options_type_inst, no_result_loc());
6083
6084 AstNode *options_node = node->data.fn_call_expr.params.at(0);
6085 IrInstruction *options_inner = ir_gen_node_extra(irb, options_node, scope,
6086 LValNone, &result_loc_cast->base);
6087 if (options_inner == irb->codegen->invalid_instruction)
6088 return options_inner;
6089 IrInstruction *options = ir_build_implicit_cast(irb, scope, options_node, options_inner, result_loc_cast);
6090
6091 AstNode *fn_ref_node = node->data.fn_call_expr.params.at(1);
6092 IrInstruction *fn_ref = ir_gen_node(irb, fn_ref_node, scope);
6093 if (fn_ref == irb->codegen->invalid_instruction)
6094 return fn_ref;
6095
6096 AstNode *args_node = node->data.fn_call_expr.params.at(2);
6097 IrInstruction *args = ir_gen_node(irb, args_node, scope);
6098 if (args == irb->codegen->invalid_instruction)
6099 return args;
6100
6101 IrInstruction *call = ir_build_call_extra(irb, scope, node, options, fn_ref, args, result_loc);
6102 return ir_lval_wrap(irb, scope, call, lval, result_loc);
6103 }
60576104 case BuiltinFnIdAsyncCall:
60586105 return ir_gen_async_call(irb, scope, nullptr, node, lval, result_loc);
60596106 case BuiltinFnIdTypeId:
......@@ -6395,8 +6442,8 @@ static IrInstruction *ir_gen_fn_call(IrBuilder *irb, Scope *scope, AstNode *node
63956442 args[i] = ir_build_implicit_cast(irb, scope, arg_node, arg, result_loc_cast);
63966443 }
63976444
6398 IrInstruction *fn_call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args, false,
6399 FnInlineAuto, node->data.fn_call_expr.modifier, false, nullptr, result_loc);
6445 IrInstruction *fn_call = ir_build_call_src(irb, scope, node, nullptr, fn_ref, arg_count, args, nullptr,
6446 node->data.fn_call_expr.modifier, false, nullptr, result_loc);
64006447 return ir_lval_wrap(irb, scope, fn_call, lval, result_loc);
64016448}
64026449
......@@ -14102,9 +14149,7 @@ static bool ir_resolve_atomic_order(IrAnalyze *ira, IrInstruction *value, Atomic
1410214149 if (type_is_invalid(value->value->type))
1410314150 return false;
1410414151
14105 ZigValue *atomic_order_val = get_builtin_value(ira->codegen, "AtomicOrder");
14106 assert(atomic_order_val->type->id == ZigTypeIdMetaType);
14107 ZigType *atomic_order_type = atomic_order_val->data.x_type;
14152 ZigType *atomic_order_type = get_builtin_type(ira->codegen, "AtomicOrder");
1410814153
1410914154 IrInstruction *casted_value = ir_implicit_cast(ira, value, atomic_order_type);
1411014155 if (type_is_invalid(casted_value->value->type))
......@@ -14122,9 +14167,7 @@ static bool ir_resolve_atomic_rmw_op(IrAnalyze *ira, IrInstruction *value, Atomi
1412214167 if (type_is_invalid(value->value->type))
1412314168 return false;
1412414169
14125 ZigValue *atomic_rmw_op_val = get_builtin_value(ira->codegen, "AtomicRmwOp");
14126 assert(atomic_rmw_op_val->type->id == ZigTypeIdMetaType);
14127 ZigType *atomic_rmw_op_type = atomic_rmw_op_val->data.x_type;
14170 ZigType *atomic_rmw_op_type = get_builtin_type(ira->codegen, "AtomicRmwOp");
1412814171
1412914172 IrInstruction *casted_value = ir_implicit_cast(ira, value, atomic_rmw_op_type);
1413014173 if (type_is_invalid(casted_value->value->type))
......@@ -14142,9 +14185,7 @@ static bool ir_resolve_global_linkage(IrAnalyze *ira, IrInstruction *value, Glob
1414214185 if (type_is_invalid(value->value->type))
1414314186 return false;
1414414187
14145 ZigValue *global_linkage_val = get_builtin_value(ira->codegen, "GlobalLinkage");
14146 assert(global_linkage_val->type->id == ZigTypeIdMetaType);
14147 ZigType *global_linkage_type = global_linkage_val->data.x_type;
14188 ZigType *global_linkage_type = get_builtin_type(ira->codegen, "GlobalLinkage");
1414814189
1414914190 IrInstruction *casted_value = ir_implicit_cast(ira, value, global_linkage_type);
1415014191 if (type_is_invalid(casted_value->value->type))
......@@ -14162,9 +14203,7 @@ static bool ir_resolve_float_mode(IrAnalyze *ira, IrInstruction *value, FloatMod
1416214203 if (type_is_invalid(value->value->type))
1416314204 return false;
1416414205
14165 ZigValue *float_mode_val = get_builtin_value(ira->codegen, "FloatMode");
14166 assert(float_mode_val->type->id == ZigTypeIdMetaType);
14167 ZigType *float_mode_type = float_mode_val->data.x_type;
14206 ZigType *float_mode_type = get_builtin_type(ira->codegen, "FloatMode");
1416814207
1416914208 IrInstruction *casted_value = ir_implicit_cast(ira, value, float_mode_type);
1417014209 if (type_is_invalid(casted_value->value->type))
......@@ -16972,11 +17011,11 @@ static IrInstruction *ir_analyze_instruction_reset_result(IrAnalyze *ira, IrInst
1697217011 return ir_const_void(ira, &instruction->base);
1697317012}
1697417013
16975static IrInstruction *get_async_call_result_loc(IrAnalyze *ira, IrInstructionCallSrc *call_instruction,
16976 ZigType *fn_ret_type)
17014static IrInstruction *get_async_call_result_loc(IrAnalyze *ira, IrInstruction *source_instr,
17015 ZigType *fn_ret_type, bool is_async_call_builtin, IrInstruction **args_ptr, size_t args_len,
17016 IrInstruction *ret_ptr_uncasted)
1697717017{
16978 ir_assert(call_instruction->is_async_call_builtin, &call_instruction->base);
16979 IrInstruction *ret_ptr_uncasted = call_instruction->args[call_instruction->arg_count]->child;
17018 ir_assert(is_async_call_builtin, source_instr);
1698017019 if (type_is_invalid(ret_ptr_uncasted->value->type))
1698117020 return ira->codegen->invalid_instruction;
1698217021 if (ret_ptr_uncasted->value->type->id == ZigTypeIdVoid) {
......@@ -16986,9 +17025,10 @@ static IrInstruction *get_async_call_result_loc(IrAnalyze *ira, IrInstructionCal
1698617025 return ir_implicit_cast(ira, ret_ptr_uncasted, get_pointer_to_type(ira->codegen, fn_ret_type, false));
1698717026}
1698817027
16989static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCallSrc *call_instruction, ZigFn *fn_entry,
17028static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstruction *source_instr, ZigFn *fn_entry,
1699017029 ZigType *fn_type, IrInstruction *fn_ref, IrInstruction **casted_args, size_t arg_count,
16991 IrInstruction *casted_new_stack)
17030 IrInstruction *casted_new_stack, bool is_async_call_builtin, IrInstruction *ret_ptr_uncasted,
17031 ResultLoc *call_result_loc)
1699217032{
1699317033 if (fn_entry == nullptr) {
1699417034 if (fn_type->data.fn.fn_type_id.cc != CallingConventionAsync) {
......@@ -17003,19 +17043,20 @@ static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCallSrc
1700317043 }
1700417044 if (casted_new_stack != nullptr) {
1700517045 ZigType *fn_ret_type = fn_type->data.fn.fn_type_id.return_type;
17006 IrInstruction *ret_ptr = get_async_call_result_loc(ira, call_instruction, fn_ret_type);
17046 IrInstruction *ret_ptr = get_async_call_result_loc(ira, source_instr, fn_ret_type, is_async_call_builtin,
17047 casted_args, arg_count, ret_ptr_uncasted);
1700717048 if (ret_ptr != nullptr && type_is_invalid(ret_ptr->value->type))
1700817049 return ira->codegen->invalid_instruction;
1700917050
1701017051 ZigType *anyframe_type = get_any_frame_type(ira->codegen, fn_ret_type);
1701117052
17012 IrInstructionCallGen *call_gen = ir_build_call_gen(ira, &call_instruction->base, fn_entry, fn_ref,
17013 arg_count, casted_args, FnInlineAuto, CallModifierAsync, casted_new_stack,
17014 call_instruction->is_async_call_builtin, ret_ptr, anyframe_type);
17053 IrInstructionCallGen *call_gen = ir_build_call_gen(ira, source_instr, fn_entry, fn_ref,
17054 arg_count, casted_args, CallModifierAsync, casted_new_stack,
17055 is_async_call_builtin, ret_ptr, anyframe_type);
1701517056 return &call_gen->base;
1701617057 } else {
1701717058 ZigType *frame_type = get_fn_frame_type(ira->codegen, fn_entry);
17018 IrInstruction *result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
17059 IrInstruction *result_loc = ir_resolve_result(ira, source_instr, call_result_loc,
1701917060 frame_type, nullptr, true, true, false);
1702017061 if (type_is_invalid(result_loc->value->type) || instr_is_unreachable(result_loc)) {
1702117062 return result_loc;
......@@ -17023,9 +17064,9 @@ static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCallSrc
1702317064 result_loc = ir_implicit_cast(ira, result_loc, get_pointer_to_type(ira->codegen, frame_type, false));
1702417065 if (type_is_invalid(result_loc->value->type))
1702517066 return ira->codegen->invalid_instruction;
17026 return &ir_build_call_gen(ira, &call_instruction->base, fn_entry, fn_ref, arg_count,
17027 casted_args, FnInlineAuto, CallModifierAsync, casted_new_stack,
17028 call_instruction->is_async_call_builtin, result_loc, frame_type)->base;
17067 return &ir_build_call_gen(ira, source_instr, fn_entry, fn_ref, arg_count,
17068 casted_args, CallModifierAsync, casted_new_stack,
17069 is_async_call_builtin, result_loc, frame_type)->base;
1702917070 }
1703017071}
1703117072static bool ir_analyze_fn_call_inline_arg(IrAnalyze *ira, AstNode *fn_proto_node,
......@@ -17417,25 +17458,21 @@ static IrInstruction *ir_analyze_store_ptr(IrAnalyze *ira, IrInstruction *source
1741717458 return &store_ptr->base;
1741817459}
1741917460
17420static IrInstruction *analyze_casted_new_stack(IrAnalyze *ira, IrInstructionCallSrc *call_instruction,
17421 ZigFn *fn_entry)
17461static IrInstruction *analyze_casted_new_stack(IrAnalyze *ira, IrInstruction *source_instr,
17462 IrInstruction *new_stack, bool is_async_call_builtin, ZigFn *fn_entry)
1742217463{
17423 if (call_instruction->new_stack == nullptr)
17464 if (new_stack == nullptr)
1742417465 return nullptr;
1742517466
17426 if (!call_instruction->is_async_call_builtin &&
17467 if (!is_async_call_builtin &&
1742717468 arch_stack_pointer_register_name(ira->codegen->zig_target->arch) == nullptr)
1742817469 {
17429 ir_add_error(ira, &call_instruction->base,
17470 ir_add_error(ira, source_instr,
1743017471 buf_sprintf("target arch '%s' does not support @newStackCall",
1743117472 target_arch_name(ira->codegen->zig_target->arch)));
1743217473 }
1743317474
17434 IrInstruction *new_stack = call_instruction->new_stack->child;
17435 if (type_is_invalid(new_stack->value->type))
17436 return ira->codegen->invalid_instruction;
17437
17438 if (call_instruction->is_async_call_builtin &&
17475 if (is_async_call_builtin &&
1743917476 fn_entry != nullptr && new_stack->value->type->id == ZigTypeIdPointer &&
1744017477 new_stack->value->type->data.pointer.child_type->id == ZigTypeIdFnFrame)
1744117478 {
......@@ -17451,9 +17488,11 @@ static IrInstruction *analyze_casted_new_stack(IrAnalyze *ira, IrInstructionCall
1745117488 }
1745217489}
1745317490
17454static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *call_instruction,
17491static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstruction *source_instr,
1745517492 ZigFn *fn_entry, ZigType *fn_type, IrInstruction *fn_ref,
17456 IrInstruction *first_arg_ptr, bool comptime_fn_call, FnInline fn_inline)
17493 IrInstruction *first_arg_ptr, CallModifier modifier,
17494 IrInstruction *new_stack, bool is_async_call_builtin,
17495 IrInstruction **args_ptr, size_t args_len, IrInstruction *ret_ptr, ResultLoc *call_result_loc)
1745717496{
1745817497 Error err;
1745917498 FnTypeId *fn_type_id = &fn_type->data.fn.fn_type_id;
......@@ -17469,16 +17508,16 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1746917508 }
1747017509 size_t src_param_count = fn_type_id->param_count - var_args_1_or_0;
1747117510
17472 size_t call_param_count = call_instruction->arg_count + first_arg_1_or_0;
17473 for (size_t i = 0; i < call_instruction->arg_count; i += 1) {
17474 ZigValue *arg_tuple_value = call_instruction->args[i]->child->value;
17511 size_t call_param_count = args_len + first_arg_1_or_0;
17512 for (size_t i = 0; i < args_len; i += 1) {
17513 ZigValue *arg_tuple_value = args_ptr[i]->value;
1747517514 if (arg_tuple_value->type->id == ZigTypeIdArgTuple) {
1747617515 call_param_count -= 1;
1747717516 call_param_count += arg_tuple_value->data.x_arg_tuple.end_index -
1747817517 arg_tuple_value->data.x_arg_tuple.start_index;
1747917518 }
1748017519 }
17481 AstNode *source_node = call_instruction->base.source_node;
17520 AstNode *source_node = source_instr->source_node;
1748217521
1748317522 AstNode *fn_proto_node = fn_entry ? fn_entry->proto_node : nullptr;;
1748417523
......@@ -17511,14 +17550,14 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1751117550 return ira->codegen->invalid_instruction;
1751217551 }
1751317552
17514 if (comptime_fn_call) {
17553 if (modifier == CallModifierCompileTime) {
1751517554 // No special handling is needed for compile time evaluation of generic functions.
1751617555 if (!fn_entry || fn_entry->body_node == nullptr) {
1751717556 ir_add_error(ira, fn_ref, buf_sprintf("unable to evaluate constant expression"));
1751817557 return ira->codegen->invalid_instruction;
1751917558 }
1752017559
17521 if (!ir_emit_backward_branch(ira, &call_instruction->base))
17560 if (!ir_emit_backward_branch(ira, source_instr))
1752217561 return ira->codegen->invalid_instruction;
1752317562
1752417563 // Fork a scope of the function with known values for the parameters.
......@@ -17550,16 +17589,14 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1755017589 }
1755117590
1755217591 if (fn_proto_node->data.fn_proto.is_var_args) {
17553 ir_add_error(ira, &call_instruction->base,
17592 ir_add_error(ira, source_instr,
1755417593 buf_sprintf("compiler bug: unable to call var args function at compile time. https://github.com/ziglang/zig/issues/313"));
1755517594 return ira->codegen->invalid_instruction;
1755617595 }
1755717596
1755817597
17559 for (size_t call_i = 0; call_i < call_instruction->arg_count; call_i += 1) {
17560 IrInstruction *old_arg = call_instruction->args[call_i]->child;
17561 if (type_is_invalid(old_arg->value->type))
17562 return ira->codegen->invalid_instruction;
17598 for (size_t call_i = 0; call_i < args_len; call_i += 1) {
17599 IrInstruction *old_arg = args_ptr[call_i];
1756317600
1756417601 if (!ir_analyze_fn_call_inline_arg(ira, fn_proto_node, old_arg, &exec_scope, &next_proto_i))
1756517602 return ira->codegen->invalid_instruction;
......@@ -17593,7 +17630,7 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1759317630 AstNode *body_node = fn_entry->body_node;
1759417631 result = ir_eval_const_value(ira->codegen, exec_scope, body_node, return_type,
1759517632 ira->new_irb.exec->backward_branch_count, ira->new_irb.exec->backward_branch_quota, fn_entry,
17596 nullptr, call_instruction->base.source_node, nullptr, ira->new_irb.exec, return_type_node,
17633 nullptr, source_instr->source_node, nullptr, ira->new_irb.exec, return_type_node,
1759717634 UndefOk);
1759817635
1759917636 if (inferred_err_set_type != nullptr) {
......@@ -17623,24 +17660,21 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1762317660 }
1762417661 }
1762517662
17626 IrInstruction *new_instruction = ir_const_move(ira, &call_instruction->base, result);
17663 IrInstruction *new_instruction = ir_const_move(ira, source_instr, result);
1762717664 return ir_finish_anal(ira, new_instruction);
1762817665 }
1762917666
1763017667 if (fn_type->data.fn.is_generic) {
1763117668 if (!fn_entry) {
17632 ir_add_error(ira, call_instruction->fn_ref,
17669 ir_add_error(ira, fn_ref,
1763317670 buf_sprintf("calling a generic function requires compile-time known function value"));
1763417671 return ira->codegen->invalid_instruction;
1763517672 }
1763617673
1763717674 // Count the arguments of the function type id we are creating
1763817675 size_t new_fn_arg_count = first_arg_1_or_0;
17639 for (size_t call_i = 0; call_i < call_instruction->arg_count; call_i += 1) {
17640 IrInstruction *arg = call_instruction->args[call_i]->child;
17641 if (type_is_invalid(arg->value->type))
17642 return ira->codegen->invalid_instruction;
17643
17676 for (size_t call_i = 0; call_i < args_len; call_i += 1) {
17677 IrInstruction *arg = args_ptr[call_i];
1764417678 if (arg->value->type->id == ZigTypeIdArgTuple) {
1764517679 new_fn_arg_count += arg->value->data.x_arg_tuple.end_index - arg->value->data.x_arg_tuple.start_index;
1764617680 } else {
......@@ -17702,10 +17736,8 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1770217736
1770317737 ZigFn *parent_fn_entry = exec_fn_entry(ira->new_irb.exec);
1770417738 assert(parent_fn_entry);
17705 for (size_t call_i = 0; call_i < call_instruction->arg_count; call_i += 1) {
17706 IrInstruction *arg = call_instruction->args[call_i]->child;
17707 if (type_is_invalid(arg->value->type))
17708 return ira->codegen->invalid_instruction;
17739 for (size_t call_i = 0; call_i < args_len; call_i += 1) {
17740 IrInstruction *arg = args_ptr[call_i];
1770917741
1771017742 if (arg->value->type->id == ZigTypeIdArgTuple) {
1771117743 for (size_t arg_tuple_i = arg->value->data.x_arg_tuple.start_index;
......@@ -17804,8 +17836,9 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1780417836 switch (type_requires_comptime(ira->codegen, specified_return_type)) {
1780517837 case ReqCompTimeYes:
1780617838 // Throw out our work and call the function as if it were comptime.
17807 return ir_analyze_fn_call(ira, call_instruction, fn_entry, fn_type, fn_ref, first_arg_ptr,
17808 true, FnInlineAuto);
17839 return ir_analyze_fn_call(ira, source_instr, fn_entry, fn_type, fn_ref, first_arg_ptr,
17840 CallModifierCompileTime, new_stack, is_async_call_builtin, args_ptr, args_len,
17841 ret_ptr, call_result_loc);
1780917842 case ReqCompTimeInvalid:
1781017843 return ira->codegen->invalid_instruction;
1781117844 case ReqCompTimeNo:
......@@ -17823,9 +17856,9 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1782317856 if (type_is_invalid(impl_fn->type_entry))
1782417857 return ira->codegen->invalid_instruction;
1782517858
17826 impl_fn->ir_executable->source_node = call_instruction->base.source_node;
17859 impl_fn->ir_executable->source_node = source_instr->source_node;
1782717860 impl_fn->ir_executable->parent_exec = ira->new_irb.exec;
17828 impl_fn->analyzed_executable.source_node = call_instruction->base.source_node;
17861 impl_fn->analyzed_executable.source_node = source_instr->source_node;
1782917862 impl_fn->analyzed_executable.parent_exec = ira->new_irb.exec;
1783017863 impl_fn->analyzed_executable.backward_branch_quota = ira->new_irb.exec->backward_branch_quota;
1783117864 impl_fn->analyzed_executable.is_generic_instantiation = true;
......@@ -17839,32 +17872,35 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1783917872 parent_fn_entry->calls_or_awaits_errorable_fn = true;
1784017873 }
1784117874
17842 IrInstruction *casted_new_stack = analyze_casted_new_stack(ira, call_instruction, impl_fn);
17875 IrInstruction *casted_new_stack = analyze_casted_new_stack(ira, source_instr, new_stack,
17876 is_async_call_builtin, impl_fn);
1784317877 if (casted_new_stack != nullptr && type_is_invalid(casted_new_stack->value->type))
1784417878 return ira->codegen->invalid_instruction;
1784517879
1784617880 size_t impl_param_count = impl_fn_type_id->param_count;
17847 if (call_instruction->modifier == CallModifierAsync) {
17848 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, impl_fn, impl_fn->type_entry,
17849 nullptr, casted_args, impl_param_count, casted_new_stack);
17881 if (modifier == CallModifierAsync) {
17882 IrInstruction *result = ir_analyze_async_call(ira, source_instr, impl_fn, impl_fn->type_entry,
17883 nullptr, casted_args, impl_param_count, casted_new_stack, is_async_call_builtin, ret_ptr,
17884 call_result_loc);
1785017885 return ir_finish_anal(ira, result);
1785117886 }
1785217887
1785317888 IrInstruction *result_loc;
1785417889 if (handle_is_ptr(impl_fn_type_id->return_type)) {
17855 result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
17890 result_loc = ir_resolve_result(ira, source_instr, call_result_loc,
1785617891 impl_fn_type_id->return_type, nullptr, true, true, false);
1785717892 if (result_loc != nullptr) {
1785817893 if (type_is_invalid(result_loc->value->type) || instr_is_unreachable(result_loc)) {
1785917894 return result_loc;
1786017895 }
1786117896 if (!handle_is_ptr(result_loc->value->type->data.pointer.child_type)) {
17862 ir_reset_result(call_instruction->result_loc);
17897 ir_reset_result(call_result_loc);
1786317898 result_loc = nullptr;
1786417899 }
1786517900 }
17866 } else if (call_instruction->is_async_call_builtin) {
17867 result_loc = get_async_call_result_loc(ira, call_instruction, impl_fn_type_id->return_type);
17901 } else if (is_async_call_builtin) {
17902 result_loc = get_async_call_result_loc(ira, source_instr, impl_fn_type_id->return_type,
17903 is_async_call_builtin, args_ptr, args_len, ret_ptr);
1786817904 if (result_loc != nullptr && type_is_invalid(result_loc->value->type))
1786917905 return ira->codegen->invalid_instruction;
1787017906 } else {
......@@ -17873,18 +17909,17 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1787317909
1787417910 if (impl_fn_type_id->cc == CallingConventionAsync &&
1787517911 parent_fn_entry->inferred_async_node == nullptr &&
17876 call_instruction->modifier != CallModifierNoAsync)
17912 modifier != CallModifierNoAsync)
1787717913 {
1787817914 parent_fn_entry->inferred_async_node = fn_ref->source_node;
1787917915 parent_fn_entry->inferred_async_fn = impl_fn;
1788017916 }
1788117917
17882 IrInstructionCallGen *new_call_instruction = ir_build_call_gen(ira, &call_instruction->base,
17883 impl_fn, nullptr, impl_param_count, casted_args, fn_inline,
17884 call_instruction->modifier, casted_new_stack, call_instruction->is_async_call_builtin, result_loc,
17885 impl_fn_type_id->return_type);
17918 IrInstructionCallGen *new_call_instruction = ir_build_call_gen(ira, source_instr,
17919 impl_fn, nullptr, impl_param_count, casted_args, modifier, casted_new_stack,
17920 is_async_call_builtin, result_loc, impl_fn_type_id->return_type);
1788617921
17887 if (get_scope_typeof(call_instruction->base.scope) == nullptr) {
17922 if (get_scope_typeof(source_instr->scope) == nullptr) {
1788817923 parent_fn_entry->call_list.append(new_call_instruction);
1788917924 }
1789017925
......@@ -17926,8 +17961,8 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1792617961 casted_args[next_arg_index] = casted_arg;
1792717962 next_arg_index += 1;
1792817963 }
17929 for (size_t call_i = 0; call_i < call_instruction->arg_count; call_i += 1) {
17930 IrInstruction *old_arg = call_instruction->args[call_i]->child;
17964 for (size_t call_i = 0; call_i < args_len; call_i += 1) {
17965 IrInstruction *old_arg = args_ptr[call_i];
1793117966 if (type_is_invalid(old_arg->value->type))
1793217967 return ira->codegen->invalid_instruction;
1793317968
......@@ -17988,25 +18023,26 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1798818023 if (type_is_invalid(return_type))
1798918024 return ira->codegen->invalid_instruction;
1799018025
17991 if (fn_entry != nullptr && fn_entry->fn_inline == FnInlineAlways && fn_inline == FnInlineNever) {
17992 ir_add_error(ira, &call_instruction->base,
18026 if (fn_entry != nullptr && fn_entry->fn_inline == FnInlineAlways && modifier == CallModifierNeverInline) {
18027 ir_add_error(ira, source_instr,
1799318028 buf_sprintf("no-inline call of inline function"));
1799418029 return ira->codegen->invalid_instruction;
1799518030 }
1799618031
17997 IrInstruction *casted_new_stack = analyze_casted_new_stack(ira, call_instruction, fn_entry);
18032 IrInstruction *casted_new_stack = analyze_casted_new_stack(ira, source_instr, new_stack,
18033 is_async_call_builtin, fn_entry);
1799818034 if (casted_new_stack != nullptr && type_is_invalid(casted_new_stack->value->type))
1799918035 return ira->codegen->invalid_instruction;
1800018036
18001 if (call_instruction->modifier == CallModifierAsync) {
18002 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, fn_entry, fn_type, fn_ref,
18003 casted_args, call_param_count, casted_new_stack);
18037 if (modifier == CallModifierAsync) {
18038 IrInstruction *result = ir_analyze_async_call(ira, source_instr, fn_entry, fn_type, fn_ref,
18039 casted_args, call_param_count, casted_new_stack, is_async_call_builtin, ret_ptr, call_result_loc);
1800418040 return ir_finish_anal(ira, result);
1800518041 }
1800618042
1800718043 if (fn_type_id->cc == CallingConventionAsync &&
1800818044 parent_fn_entry->inferred_async_node == nullptr &&
18009 call_instruction->modifier != CallModifierNoAsync)
18045 modifier != CallModifierNoAsync)
1801018046 {
1801118047 parent_fn_entry->inferred_async_node = fn_ref->source_node;
1801218048 parent_fn_entry->inferred_async_fn = fn_entry;
......@@ -18014,41 +18050,163 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
1801418050
1801518051 IrInstruction *result_loc;
1801618052 if (handle_is_ptr(return_type)) {
18017 result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
18053 result_loc = ir_resolve_result(ira, source_instr, call_result_loc,
1801818054 return_type, nullptr, true, true, false);
1801918055 if (result_loc != nullptr) {
1802018056 if (type_is_invalid(result_loc->value->type) || instr_is_unreachable(result_loc)) {
1802118057 return result_loc;
1802218058 }
1802318059 if (!handle_is_ptr(result_loc->value->type->data.pointer.child_type)) {
18024 ir_reset_result(call_instruction->result_loc);
18060 ir_reset_result(call_result_loc);
1802518061 result_loc = nullptr;
1802618062 }
1802718063 }
18028 } else if (call_instruction->is_async_call_builtin) {
18029 result_loc = get_async_call_result_loc(ira, call_instruction, return_type);
18064 } else if (is_async_call_builtin) {
18065 result_loc = get_async_call_result_loc(ira, source_instr, return_type, is_async_call_builtin,
18066 args_ptr, args_len, ret_ptr);
1803018067 if (result_loc != nullptr && type_is_invalid(result_loc->value->type))
1803118068 return ira->codegen->invalid_instruction;
1803218069 } else {
1803318070 result_loc = nullptr;
1803418071 }
1803518072
18036 IrInstructionCallGen *new_call_instruction = ir_build_call_gen(ira, &call_instruction->base, fn_entry, fn_ref,
18037 call_param_count, casted_args, fn_inline, call_instruction->modifier, casted_new_stack,
18038 call_instruction->is_async_call_builtin, result_loc, return_type);
18039 if (get_scope_typeof(call_instruction->base.scope) == nullptr) {
18073 IrInstructionCallGen *new_call_instruction = ir_build_call_gen(ira, source_instr, fn_entry, fn_ref,
18074 call_param_count, casted_args, modifier, casted_new_stack,
18075 is_async_call_builtin, result_loc, return_type);
18076 if (get_scope_typeof(source_instr->scope) == nullptr) {
1804018077 parent_fn_entry->call_list.append(new_call_instruction);
1804118078 }
1804218079 return ir_finish_anal(ira, &new_call_instruction->base);
1804318080}
1804418081
18082static IrInstruction *ir_analyze_fn_call_src(IrAnalyze *ira, IrInstructionCallSrc *call_instruction,
18083 ZigFn *fn_entry, ZigType *fn_type, IrInstruction *fn_ref,
18084 IrInstruction *first_arg_ptr, CallModifier modifier)
18085{
18086 IrInstruction *new_stack = nullptr;
18087 if (call_instruction->new_stack) {
18088 new_stack = call_instruction->new_stack->child;
18089 if (type_is_invalid(new_stack->value->type))
18090 return ira->codegen->invalid_instruction;
18091 }
18092 IrInstruction **args_ptr = allocate<IrInstruction *>(call_instruction->arg_count, "IrInstruction *");
18093 for (size_t i = 0; i < call_instruction->arg_count; i += 1) {
18094 args_ptr[i] = call_instruction->args[i]->child;
18095 if (type_is_invalid(args_ptr[i]->value->type))
18096 return ira->codegen->invalid_instruction;
18097 }
18098 IrInstruction *ret_ptr = nullptr;
18099 if (call_instruction->ret_ptr != nullptr) {
18100 ret_ptr = call_instruction->ret_ptr->child;
18101 if (type_is_invalid(ret_ptr->value->type))
18102 return ira->codegen->invalid_instruction;
18103 }
18104 IrInstruction *result = ir_analyze_fn_call(ira, &call_instruction->base, fn_entry, fn_type, fn_ref,
18105 first_arg_ptr, modifier, new_stack, call_instruction->is_async_call_builtin,
18106 args_ptr, call_instruction->arg_count, ret_ptr, call_instruction->result_loc);
18107 deallocate(args_ptr, call_instruction->arg_count, "IrInstruction *");
18108 return result;
18109}
18110
18111static IrInstruction *ir_analyze_instruction_call_extra(IrAnalyze *ira, IrInstructionCallExtra *instruction) {
18112 IrInstruction *options = instruction->options->child;
18113 if (type_is_invalid(options->value->type))
18114 return ira->codegen->invalid_instruction;
18115
18116 IrInstruction *fn_ref = instruction->fn_ref->child;
18117 if (type_is_invalid(fn_ref->value->type))
18118 return ira->codegen->invalid_instruction;
18119 ZigFn *fn = ir_resolve_fn(ira, fn_ref);
18120 ZigType *fn_type = (fn != nullptr) ? fn->type_entry : fn_ref->value->type;
18121
18122 IrInstruction *args = instruction->args->child;
18123 ZigType *args_type = args->value->type;
18124 if (type_is_invalid(args_type))
18125 return ira->codegen->invalid_instruction;
18126
18127 if (args_type->id != ZigTypeIdStruct) {
18128 ir_add_error(ira, args,
18129 buf_sprintf("expected tuple or struct, found '%s'", buf_ptr(&args_type->name)));
18130 return ira->codegen->invalid_instruction;
18131 }
18132
18133 IrInstruction **args_ptr = nullptr;
18134 size_t args_len = 0;
18135
18136 if (is_tuple(args_type)) {
18137 args_len = args_type->data.structure.src_field_count;
18138 args_ptr = allocate<IrInstruction *>(args_len, "IrInstruction *");
18139 for (size_t i = 0; i < args_len; i += 1) {
18140 TypeStructField *arg_field = args_type->data.structure.fields[i];
18141 args_ptr[i] = ir_analyze_struct_value_field_value(ira, &instruction->base, args, arg_field);
18142 if (type_is_invalid(args_ptr[i]->value->type))
18143 return ira->codegen->invalid_instruction;
18144 }
18145 } else {
18146 ir_add_error(ira, args, buf_sprintf("TODO: struct args"));
18147 return ira->codegen->invalid_instruction;
18148 }
18149
18150 TypeStructField *modifier_field = find_struct_type_field(options->value->type, buf_create_from_str("modifier"));
18151 ir_assert(modifier_field != nullptr, &instruction->base);
18152 IrInstruction *modifier_inst = ir_analyze_struct_value_field_value(ira, &instruction->base, options, modifier_field);
18153 ZigValue *modifier_val = ir_resolve_const(ira, modifier_inst, UndefBad);
18154 if (modifier_val == nullptr)
18155 return ira->codegen->invalid_instruction;
18156 CallModifier modifier = (CallModifier)bigint_as_u32(&modifier_val->data.x_enum_tag);
18157 if (modifier == CallModifierAsync) {
18158 ir_add_error(ira, args, buf_sprintf("TODO: @call with async modifier"));
18159 return ira->codegen->invalid_instruction;
18160 }
18161 if (ir_should_inline(ira->new_irb.exec, instruction->base.scope)) {
18162 switch (modifier) {
18163 case CallModifierBuiltin:
18164 zig_unreachable();
18165 case CallModifierAsync:
18166 ir_add_error(ira, args, buf_sprintf("TODO: comptime @call with async modifier"));
18167 return ira->codegen->invalid_instruction;
18168 case CallModifierCompileTime:
18169 case CallModifierNone:
18170 case CallModifierAlwaysInline:
18171 case CallModifierAlwaysTail:
18172 case CallModifierNoAsync:
18173 modifier = CallModifierCompileTime;
18174 break;
18175 case CallModifierNeverInline:
18176 ir_add_error(ira, args,
18177 buf_sprintf("unable to perform 'never_inline' call at compile-time"));
18178 return ira->codegen->invalid_instruction;
18179 case CallModifierNeverTail:
18180 ir_add_error(ira, args,
18181 buf_sprintf("unable to perform 'never_tail' call at compile-time"));
18182 return ira->codegen->invalid_instruction;
18183 }
18184 }
18185
18186 TypeStructField *stack_field = find_struct_type_field(options->value->type, buf_create_from_str("stack"));
18187 ir_assert(stack_field != nullptr, &instruction->base);
18188 IrInstruction *stack = ir_analyze_struct_value_field_value(ira, &instruction->base, options, stack_field);
18189 IrInstruction *stack_is_non_null_inst = ir_analyze_test_non_null(ira, &instruction->base, stack);
18190 bool stack_is_non_null;
18191 if (!ir_resolve_bool(ira, stack_is_non_null_inst, &stack_is_non_null))
18192 return ira->codegen->invalid_instruction;
18193 if (!stack_is_non_null)
18194 stack = nullptr;
18195
18196 IrInstruction *result = ir_analyze_fn_call(ira, &instruction->base, fn, fn_type, fn_ref, nullptr,
18197 modifier, stack, false, args_ptr, args_len, nullptr, instruction->result_loc);
18198 deallocate(args_ptr, args_len, "IrInstruction *");
18199 return result;
18200}
18201
1804518202static IrInstruction *ir_analyze_instruction_call(IrAnalyze *ira, IrInstructionCallSrc *call_instruction) {
1804618203 IrInstruction *fn_ref = call_instruction->fn_ref->child;
1804718204 if (type_is_invalid(fn_ref->value->type))
1804818205 return ira->codegen->invalid_instruction;
1804918206
18050 bool is_comptime = call_instruction->is_comptime ||
18207 bool is_comptime = (call_instruction->modifier == CallModifierCompileTime) ||
1805118208 ir_should_inline(ira->new_irb.exec, call_instruction->base.scope);
18209 CallModifier modifier = is_comptime ? CallModifierCompileTime : call_instruction->modifier;
1805218210
1805318211 if (is_comptime || instr_is_comptime(fn_ref)) {
1805418212 if (fn_ref->value->type->id == ZigTypeIdMetaType) {
......@@ -18063,14 +18221,16 @@ static IrInstruction *ir_analyze_instruction_call(IrAnalyze *ira, IrInstructionC
1806318221 } else if (fn_ref->value->type->id == ZigTypeIdFn) {
1806418222 ZigFn *fn_table_entry = ir_resolve_fn(ira, fn_ref);
1806518223 ZigType *fn_type = fn_table_entry ? fn_table_entry->type_entry : fn_ref->value->type;
18066 return ir_analyze_fn_call(ira, call_instruction, fn_table_entry, fn_type,
18067 fn_ref, nullptr, is_comptime, call_instruction->fn_inline);
18224 CallModifier modifier = is_comptime ? CallModifierCompileTime : call_instruction->modifier;
18225 return ir_analyze_fn_call_src(ira, call_instruction, fn_table_entry, fn_type,
18226 fn_ref, nullptr, modifier);
1806818227 } else if (fn_ref->value->type->id == ZigTypeIdBoundFn) {
1806918228 assert(fn_ref->value->special == ConstValSpecialStatic);
1807018229 ZigFn *fn_table_entry = fn_ref->value->data.x_bound_fn.fn;
1807118230 IrInstruction *first_arg_ptr = fn_ref->value->data.x_bound_fn.first_arg;
18072 return ir_analyze_fn_call(ira, call_instruction, fn_table_entry, fn_table_entry->type_entry,
18073 fn_ref, first_arg_ptr, is_comptime, call_instruction->fn_inline);
18231 CallModifier modifier = is_comptime ? CallModifierCompileTime : call_instruction->modifier;
18232 return ir_analyze_fn_call_src(ira, call_instruction, fn_table_entry, fn_table_entry->type_entry,
18233 fn_ref, first_arg_ptr, modifier);
1807418234 } else {
1807518235 ir_add_error_node(ira, fn_ref->source_node,
1807618236 buf_sprintf("type '%s' not a function", buf_ptr(&fn_ref->value->type->name)));
......@@ -18079,8 +18239,8 @@ static IrInstruction *ir_analyze_instruction_call(IrAnalyze *ira, IrInstructionC
1807918239 }
1808018240
1808118241 if (fn_ref->value->type->id == ZigTypeIdFn) {
18082 return ir_analyze_fn_call(ira, call_instruction, nullptr, fn_ref->value->type,
18083 fn_ref, nullptr, false, call_instruction->fn_inline);
18242 return ir_analyze_fn_call_src(ira, call_instruction, nullptr, fn_ref->value->type,
18243 fn_ref, nullptr, modifier);
1808418244 } else {
1808518245 ir_add_error_node(ira, fn_ref->source_node,
1808618246 buf_sprintf("type '%s' not a function", buf_ptr(&fn_ref->value->type->name)));
......@@ -21794,9 +21954,7 @@ static void ensure_field_index(ZigType *type, const char *field_name, size_t ind
2179421954
2179521955static ZigType *ir_type_info_get_type(IrAnalyze *ira, const char *type_name, ZigType *root) {
2179621956 Error err;
21797 ZigValue *type_info_var = get_builtin_value(ira->codegen, "TypeInfo");
21798 assert(type_info_var->type->id == ZigTypeIdMetaType);
21799 ZigType *type_info_type = type_info_var->data.x_type;
21957 ZigType *type_info_type = get_builtin_type(ira->codegen, "TypeInfo");
2180021958 assert(type_info_type->id == ZigTypeIdUnion);
2180121959 if ((err = type_resolve(ira->codegen, type_info_type, ResolveStatusSizeKnown))) {
2180221960 zig_unreachable();
......@@ -23026,9 +23184,7 @@ static IrInstruction *ir_analyze_instruction_type_id(IrAnalyze *ira,
2302623184 if (type_is_invalid(type_entry))
2302723185 return ira->codegen->invalid_instruction;
2302823186
23029 ZigValue *var_value = get_builtin_value(ira->codegen, "TypeId");
23030 assert(var_value->type->id == ZigTypeIdMetaType);
23031 ZigType *result_type = var_value->data.x_type;
23187 ZigType *result_type = get_builtin_type(ira->codegen, "TypeId");
2303223188
2303323189 IrInstruction *result = ir_const(ira, &instruction->base, result_type);
2303423190 bigint_init_unsigned(&result->value->data.x_enum_tag, type_id_index(type_entry));
......@@ -27779,6 +27935,8 @@ static IrInstruction *ir_analyze_instruction_base(IrAnalyze *ira, IrInstruction
2777927935 return ir_analyze_instruction_field_ptr(ira, (IrInstructionFieldPtr *)instruction);
2778027936 case IrInstructionIdCallSrc:
2778127937 return ir_analyze_instruction_call(ira, (IrInstructionCallSrc *)instruction);
27938 case IrInstructionIdCallExtra:
27939 return ir_analyze_instruction_call_extra(ira, (IrInstructionCallExtra *)instruction);
2778227940 case IrInstructionIdBr:
2778327941 return ir_analyze_instruction_br(ira, (IrInstructionBr *)instruction);
2778427942 case IrInstructionIdCondBr:
......@@ -28176,6 +28334,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {
2817628334 case IrInstructionIdDeclVarGen:
2817728335 case IrInstructionIdStorePtr:
2817828336 case IrInstructionIdVectorStoreElem:
28337 case IrInstructionIdCallExtra:
2817928338 case IrInstructionIdCallSrc:
2818028339 case IrInstructionIdCallGen:
2818128340 case IrInstructionIdReturn:
src/ir_print.cpp+50-4
......@@ -92,6 +92,8 @@ const char* ir_instruction_type_str(IrInstructionId id) {
9292 return "VarPtr";
9393 case IrInstructionIdReturnPtr:
9494 return "ReturnPtr";
95 case IrInstructionIdCallExtra:
96 return "CallExtra";
9597 case IrInstructionIdCallSrc:
9698 return "CallSrc";
9799 case IrInstructionIdCallGen:
......@@ -636,15 +638,41 @@ static void ir_print_result_loc(IrPrint *irp, ResultLoc *result_loc) {
636638 zig_unreachable();
637639}
638640
641static void ir_print_call_extra(IrPrint *irp, IrInstructionCallExtra *instruction) {
642 fprintf(irp->f, "opts=");
643 ir_print_other_instruction(irp, instruction->options);
644 fprintf(irp->f, ", fn=");
645 ir_print_other_instruction(irp, instruction->fn_ref);
646 fprintf(irp->f, ", args=");
647 ir_print_other_instruction(irp, instruction->args);
648 fprintf(irp->f, ", result=");
649 ir_print_result_loc(irp, instruction->result_loc);
650}
651
639652static void ir_print_call_src(IrPrint *irp, IrInstructionCallSrc *call_instruction) {
640653 switch (call_instruction->modifier) {
641654 case CallModifierNone:
642655 break;
656 case CallModifierNoAsync:
657 fprintf(irp->f, "noasync ");
658 break;
643659 case CallModifierAsync:
644660 fprintf(irp->f, "async ");
645661 break;
646 case CallModifierNoAsync:
647 fprintf(irp->f, "noasync ");
662 case CallModifierNeverTail:
663 fprintf(irp->f, "notail ");
664 break;
665 case CallModifierNeverInline:
666 fprintf(irp->f, "noinline ");
667 break;
668 case CallModifierAlwaysTail:
669 fprintf(irp->f, "tail ");
670 break;
671 case CallModifierAlwaysInline:
672 fprintf(irp->f, "inline ");
673 break;
674 case CallModifierCompileTime:
675 fprintf(irp->f, "comptime ");
648676 break;
649677 case CallModifierBuiltin:
650678 zig_unreachable();
......@@ -670,11 +698,26 @@ static void ir_print_call_gen(IrPrint *irp, IrInstructionCallGen *call_instructi
670698 switch (call_instruction->modifier) {
671699 case CallModifierNone:
672700 break;
701 case CallModifierNoAsync:
702 fprintf(irp->f, "noasync ");
703 break;
673704 case CallModifierAsync:
674705 fprintf(irp->f, "async ");
675706 break;
676 case CallModifierNoAsync:
677 fprintf(irp->f, "noasync ");
707 case CallModifierNeverTail:
708 fprintf(irp->f, "notail ");
709 break;
710 case CallModifierNeverInline:
711 fprintf(irp->f, "noinline ");
712 break;
713 case CallModifierAlwaysTail:
714 fprintf(irp->f, "tail ");
715 break;
716 case CallModifierAlwaysInline:
717 fprintf(irp->f, "inline ");
718 break;
719 case CallModifierCompileTime:
720 fprintf(irp->f, "comptime ");
678721 break;
679722 case CallModifierBuiltin:
680723 zig_unreachable();
......@@ -2082,6 +2125,9 @@ static void ir_print_instruction(IrPrint *irp, IrInstruction *instruction, bool
20822125 case IrInstructionIdCast:
20832126 ir_print_cast(irp, (IrInstructionCast *)instruction);
20842127 break;
2128 case IrInstructionIdCallExtra:
2129 ir_print_call_extra(irp, (IrInstructionCallExtra *)instruction);
2130 break;
20852131 case IrInstructionIdCallSrc:
20862132 ir_print_call_src(irp, (IrInstructionCallSrc *)instruction);
20872133 break;
src/zig_llvm.cpp+12-6
......@@ -269,19 +269,25 @@ ZIG_EXTERN_C LLVMTypeRef ZigLLVMTokenTypeInContext(LLVMContextRef context_ref) {
269269}
270270
271271LLVMValueRef ZigLLVMBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args,
272 unsigned NumArgs, unsigned CC, ZigLLVM_FnInline fn_inline, const char *Name)
272 unsigned NumArgs, unsigned CC, ZigLLVM_CallAttr attr, const char *Name)
273273{
274274 CallInst *call_inst = CallInst::Create(unwrap(Fn), makeArrayRef(unwrap(Args), NumArgs), Name);
275275 call_inst->setCallingConv(CC);
276 switch (fn_inline) {
277 case ZigLLVM_FnInlineAuto:
276 switch (attr) {
277 case ZigLLVM_CallAttrAuto:
278278 break;
279 case ZigLLVM_FnInlineAlways:
280 call_inst->addAttribute(AttributeList::FunctionIndex, Attribute::AlwaysInline);
279 case ZigLLVM_CallAttrNeverTail:
280 call_inst->setTailCallKind(CallInst::TCK_NoTail);
281281 break;
282 case ZigLLVM_FnInlineNever:
282 case ZigLLVM_CallAttrNeverInline:
283283 call_inst->addAttribute(AttributeList::FunctionIndex, Attribute::NoInline);
284284 break;
285 case ZigLLVM_CallAttrAlwaysTail:
286 call_inst->setTailCallKind(CallInst::TCK_MustTail);
287 break;
288 case ZigLLVM_CallAttrAlwaysInline:
289 call_inst->addAttribute(AttributeList::FunctionIndex, Attribute::AlwaysInline);
290 break;
285291 }
286292 return wrap(unwrap(B)->Insert(call_inst));
287293}
src/zig_llvm.h+7-5
......@@ -64,13 +64,15 @@ ZIG_EXTERN_C LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, co
6464
6565ZIG_EXTERN_C LLVMTypeRef ZigLLVMTokenTypeInContext(LLVMContextRef context_ref);
6666
67enum ZigLLVM_FnInline {
68 ZigLLVM_FnInlineAuto,
69 ZigLLVM_FnInlineAlways,
70 ZigLLVM_FnInlineNever,
67enum ZigLLVM_CallAttr {
68 ZigLLVM_CallAttrAuto,
69 ZigLLVM_CallAttrNeverTail,
70 ZigLLVM_CallAttrNeverInline,
71 ZigLLVM_CallAttrAlwaysTail,
72 ZigLLVM_CallAttrAlwaysInline,
7173};
7274ZIG_EXTERN_C LLVMValueRef ZigLLVMBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args,
73 unsigned NumArgs, unsigned CC, enum ZigLLVM_FnInline fn_inline, const char *Name);
75 unsigned NumArgs, unsigned CC, enum ZigLLVM_CallAttr attr, const char *Name);
7476
7577ZIG_EXTERN_C LLVMValueRef ZigLLVMBuildMemCpy(LLVMBuilderRef B, LLVMValueRef Dst, unsigned DstAlign,
7678 LLVMValueRef Src, unsigned SrcAlign, LLVMValueRef Size, bool isVolatile);
test/compile_errors.zig+18
......@@ -2,6 +2,24 @@ const tests = @import("tests.zig");
22const builtin = @import("builtin");
33
44pub fn addCases(cases: *tests.CompileErrorContext) void {
5 cases.add(
6 "bad usage of @call",
7 \\export fn entry1() void {
8 \\ @call(.{}, foo, {});
9 \\}
10 \\export fn entry2() void {
11 \\ comptime @call(.{ .modifier = .never_inline }, foo, .{});
12 \\}
13 \\export fn entry3() void {
14 \\ comptime @call(.{ .modifier = .never_tail }, foo, .{});
15 \\}
16 \\fn foo() void {}
17 ,
18 "tmp.zig:2:21: error: expected tuple or struct, found 'void'",
19 "tmp.zig:5:58: error: unable to perform 'never_inline' call at compile-time",
20 "tmp.zig:8:56: error: unable to perform 'never_tail' call at compile-time",
21 );
22
523 cases.add(
624 \\export async fn foo() void {}
725 , "tmp.zig:1:1: error: exported function cannot be async");
test/stage1/behavior.zig+1
......@@ -52,6 +52,7 @@ comptime {
5252 _ = @import("behavior/bugs/920.zig");
5353 _ = @import("behavior/byteswap.zig");
5454 _ = @import("behavior/byval_arg_var.zig");
55 _ = @import("behavior/call.zig");
5556 _ = @import("behavior/cast.zig");
5657 _ = @import("behavior/const_slice_child.zig");
5758 _ = @import("behavior/defer.zig");
test/stage1/behavior/call.zig created+37
......@@ -0,0 +1,37 @@
1const std = @import("std");
2const expect = std.testing.expect;
3
4test "basic invocations" {
5 const foo = struct {
6 fn foo() i32 {
7 return 1234;
8 }
9 }.foo;
10 expect(@call(.{}, foo, .{}) == 1234);
11 comptime {
12 // modifiers that allow comptime calls
13 expect(@call(.{}, foo, .{}) == 1234);
14 expect(@call(.{ .modifier = .no_async }, foo, .{}) == 1234);
15 expect(@call(.{ .modifier = .always_tail }, foo, .{}) == 1234);
16 expect(@call(.{ .modifier = .always_inline }, foo, .{}) == 1234);
17 }
18 {
19 // comptime call without comptime keyword
20 const result = @call(.{ .modifier = .compile_time }, foo, .{}) == 1234;
21 comptime expect(result);
22 }
23}
24
25test "tuple parameters" {
26 const add = struct {
27 fn add(a: i32, b: i32) i32 {
28 return a + b;
29 }
30 }.add;
31 expect(@call(.{}, add, .{ 12, 34 }) == 46);
32 comptime expect(@call(.{}, add, .{ 12, 34 }) == 46);
33 {
34 const separate_args = .{ 12, 34 };
35 expect(@call(.{ .modifier = .always_inline }, add, separate_args) == 46);
36 }
37}