authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-26 21:14:15-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-26 21:14:15-05:00
log4ac6c4d6bfb8f7ada2799ddb5ce3a9797be0518d
tree4ab97ddfa6d660de755eec346162df5125919d23
parent3e86fb500dc918618a2ccaa5d942de98bd5fea47

workaround llvm coro transformations

by making alloc and free functions be parameters to async functions instead of using getelementptr in the DynAlloc block See #727

6 files changed, 179 insertions(+), 69 deletions(-)

src/all_types.hpp+11
......@@ -2208,7 +2208,10 @@ struct IrInstructionCall {
22082208 LLVMValueRef tmp_ptr;
22092209 FnInline fn_inline;
22102210 bool is_async;
2211
22112212 IrInstruction *async_allocator;
2213 IrInstruction *alloc_fn;
2214 IrInstruction *free_fn;
22122215};
22132216
22142217struct IrInstructionConst {
......@@ -2849,8 +2852,16 @@ struct IrInstructionCancel {
28492852 IrInstruction *target;
28502853};
28512854
2855enum ImplicitAllocatorId {
2856 ImplicitAllocatorIdContext,
2857 ImplicitAllocatorIdAlloc,
2858 ImplicitAllocatorIdFree,
2859};
2860
28522861struct IrInstructionGetImplicitAllocator {
28532862 IrInstruction base;
2863
2864 ImplicitAllocatorId id;
28542865};
28552866
28562867struct IrInstructionCoroId {
src/analyze.cpp+30-4
......@@ -1006,13 +1006,13 @@ TypeTableEntry *get_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
10061006 fn_type_id->return_type->id == TypeTableEntryIdErrorSet);
10071007 // +1 for maybe making the first argument the return value
10081008 // +1 for maybe first argument the error return trace
1009 // +2 for maybe arguments async allocator and error code pointer
1010 LLVMTypeRef *gen_param_types = allocate<LLVMTypeRef>(4 + fn_type_id->param_count);
1009 // +4 for maybe arguments async allocator and error code pointer
1010 LLVMTypeRef *gen_param_types = allocate<LLVMTypeRef>(6 + fn_type_id->param_count);
10111011 // +1 because 0 is the return type and
10121012 // +1 for maybe making first arg ret val and
10131013 // +1 for maybe first argument the error return trace
1014 // +2 for maybe arguments async allocator and error code pointer
1015 ZigLLVMDIType **param_di_types = allocate<ZigLLVMDIType*>(5 + fn_type_id->param_count);
1014 // +4 for maybe arguments async allocator and error code pointer
1015 ZigLLVMDIType **param_di_types = allocate<ZigLLVMDIType*>(7 + fn_type_id->param_count);
10161016 param_di_types[0] = fn_type_id->return_type->di_type;
10171017 size_t gen_param_index = 0;
10181018 TypeTableEntry *gen_return_type;
......@@ -1049,6 +1049,32 @@ TypeTableEntry *get_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
10491049 param_di_types[gen_param_index] = gen_type->di_type;
10501050 }
10511051
1052 {
1053 // async alloc fn param
1054 assert(fn_type_id->async_allocator_type->id == TypeTableEntryIdPointer);
1055 TypeTableEntry *struct_type = fn_type_id->async_allocator_type->data.pointer.child_type;
1056 TypeStructField *alloc_fn_field = find_struct_type_field(struct_type, buf_create_from_str("allocFn"));
1057 assert(alloc_fn_field->type_entry->id == TypeTableEntryIdFn);
1058 TypeTableEntry *gen_type = alloc_fn_field->type_entry;
1059 gen_param_types[gen_param_index] = gen_type->type_ref;
1060 gen_param_index += 1;
1061 // after the gen_param_index += 1 because 0 is the return type
1062 param_di_types[gen_param_index] = gen_type->di_type;
1063 }
1064
1065 {
1066 // async free fn param
1067 assert(fn_type_id->async_allocator_type->id == TypeTableEntryIdPointer);
1068 TypeTableEntry *struct_type = fn_type_id->async_allocator_type->data.pointer.child_type;
1069 TypeStructField *free_fn_field = find_struct_type_field(struct_type, buf_create_from_str("freeFn"));
1070 assert(free_fn_field->type_entry->id == TypeTableEntryIdFn);
1071 TypeTableEntry *gen_type = free_fn_field->type_entry;
1072 gen_param_types[gen_param_index] = gen_type->type_ref;
1073 gen_param_index += 1;
1074 // after the gen_param_index += 1 because 0 is the return type
1075 param_di_types[gen_param_index] = gen_type->di_type;
1076 }
1077
10521078 {
10531079 // error code pointer
10541080 TypeTableEntry *gen_type = get_pointer_to_type(g, g->builtin_types.entry_global_error_set, false);
src/codegen.cpp+31-6
......@@ -2667,6 +2667,18 @@ static bool get_prefix_arg_err_ret_stack(CodeGen *g, TypeTableEntry *src_return_
26672667 (src_return_type->id == TypeTableEntryIdErrorUnion || src_return_type->id == TypeTableEntryIdErrorSet);
26682668}
26692669
2670static size_t get_async_allocator_arg_index(CodeGen *g, TypeTableEntry *src_return_type) {
2671 // 0 1 2 3 4 5
2672 // err_ret_stack allocator_ptr alloc free err_code other_args...
2673 return get_prefix_arg_err_ret_stack(g, src_return_type) ? 1 : 0;
2674}
2675
2676static size_t get_async_err_code_arg_index(CodeGen *g, TypeTableEntry *src_return_type) {
2677 // 0 1 2 3 4 5
2678 // err_ret_stack allocator_ptr alloc free err_code other_args...
2679 return 3 + get_async_allocator_arg_index(g, src_return_type);
2680}
2681
26702682static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstructionCall *instruction) {
26712683 LLVMValueRef fn_val;
26722684 TypeTableEntry *fn_type;
......@@ -2687,7 +2699,8 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
26872699 bool first_arg_ret = ret_has_bits && handle_is_ptr(src_return_type) &&
26882700 calling_convention_does_first_arg_return(fn_type->data.fn.fn_type_id.cc);
26892701 bool prefix_arg_err_ret_stack = get_prefix_arg_err_ret_stack(g, src_return_type);
2690 size_t actual_param_count = instruction->arg_count + (first_arg_ret ? 1 : 0) + (prefix_arg_err_ret_stack ? 1 : 0);
2702 // +4 for the async args
2703 size_t actual_param_count = instruction->arg_count + (first_arg_ret ? 1 : 0) + (prefix_arg_err_ret_stack ? 1 : 0) + 4;
26912704 bool is_var_args = fn_type_id->is_var_args;
26922705 LLVMValueRef *gen_param_values = allocate<LLVMValueRef>(actual_param_count);
26932706 size_t gen_param_index = 0;
......@@ -2703,6 +2716,12 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
27032716 gen_param_values[gen_param_index] = ir_llvm_value(g, instruction->async_allocator);
27042717 gen_param_index += 1;
27052718
2719 gen_param_values[gen_param_index] = ir_llvm_value(g, instruction->alloc_fn);
2720 gen_param_index += 1;
2721
2722 gen_param_values[gen_param_index] = ir_llvm_value(g, instruction->free_fn);
2723 gen_param_index += 1;
2724
27062725 LLVMValueRef err_val_ptr = LLVMBuildStructGEP(g->builder, instruction->tmp_ptr, err_union_err_index, "");
27072726 LLVMBuildStore(g->builder, LLVMConstNull(g->builtin_types.entry_global_error_set->type_ref), err_val_ptr);
27082727 gen_param_values[gen_param_index] = err_val_ptr;
......@@ -3281,9 +3300,16 @@ static LLVMValueRef ir_render_get_implicit_allocator(CodeGen *g, IrExecutable *e
32813300 IrInstructionGetImplicitAllocator *instruction)
32823301{
32833302 TypeTableEntry *src_return_type = g->cur_fn->type_entry->data.fn.fn_type_id.return_type;
3284 bool prefix_arg_err_ret_stack = get_prefix_arg_err_ret_stack(g, src_return_type);
3285 size_t allocator_arg_index = prefix_arg_err_ret_stack ? 1 : 0;
3286 return LLVMGetParam(g->cur_fn_val, allocator_arg_index);
3303 size_t allocator_arg_index = get_async_allocator_arg_index(g, src_return_type);
3304 switch (instruction->id) {
3305 case ImplicitAllocatorIdContext:
3306 return LLVMGetParam(g->cur_fn_val, allocator_arg_index + 0);
3307 case ImplicitAllocatorIdAlloc:
3308 return LLVMGetParam(g->cur_fn_val, allocator_arg_index + 1);
3309 case ImplicitAllocatorIdFree:
3310 return LLVMGetParam(g->cur_fn_val, allocator_arg_index + 2);
3311 }
3312 zig_unreachable();
32873313}
32883314
32893315static LLVMAtomicOrdering to_LLVMAtomicOrdering(AtomicOrder atomic_order) {
......@@ -3915,8 +3941,7 @@ static LLVMValueRef ir_render_coro_alloc_fail(CodeGen *g, IrExecutable *executab
39153941 IrInstructionCoroAllocFail *instruction)
39163942{
39173943 TypeTableEntry *src_return_type = g->cur_fn->type_entry->data.fn.fn_type_id.return_type;
3918 bool prefix_arg_err_ret_stack = get_prefix_arg_err_ret_stack(g, src_return_type);
3919 size_t err_code_ptr_arg_index = prefix_arg_err_ret_stack ? 2 : 1;
3944 size_t err_code_ptr_arg_index = get_async_err_code_arg_index(g, src_return_type);
39203945 LLVMValueRef err_code_ptr_val = LLVMGetParam(g->cur_fn_val, err_code_ptr_arg_index);
39213946 LLVMValueRef err_code = ir_llvm_value(g, instruction->err_val);
39223947 LLVMBuildStore(g->builder, err_code, err_code_ptr_val);
src/ir.cpp+94-42
......@@ -1066,7 +1066,7 @@ static IrInstruction *ir_build_union_field_ptr_from(IrBuilder *irb, IrInstructio
10661066
10671067static IrInstruction *ir_build_call(IrBuilder *irb, Scope *scope, AstNode *source_node,
10681068 FnTableEntry *fn_entry, IrInstruction *fn_ref, size_t arg_count, IrInstruction **args,
1069 bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator)
1069 bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator, IrInstruction *alloc_fn, IrInstruction *free_fn)
10701070{
10711071 IrInstructionCall *call_instruction = ir_build_instruction<IrInstructionCall>(irb, scope, source_node);
10721072 call_instruction->fn_entry = fn_entry;
......@@ -1077,6 +1077,8 @@ static IrInstruction *ir_build_call(IrBuilder *irb, Scope *scope, AstNode *sourc
10771077 call_instruction->arg_count = arg_count;
10781078 call_instruction->is_async = is_async;
10791079 call_instruction->async_allocator = async_allocator;
1080 call_instruction->alloc_fn = alloc_fn;
1081 call_instruction->free_fn = free_fn;
10801082
10811083 if (fn_ref)
10821084 ir_ref_instruction(fn_ref, irb->current_basic_block);
......@@ -1084,16 +1086,20 @@ static IrInstruction *ir_build_call(IrBuilder *irb, Scope *scope, AstNode *sourc
10841086 ir_ref_instruction(args[i], irb->current_basic_block);
10851087 if (async_allocator)
10861088 ir_ref_instruction(async_allocator, irb->current_basic_block);
1089 if (alloc_fn)
1090 ir_ref_instruction(alloc_fn, irb->current_basic_block);
1091 if (free_fn)
1092 ir_ref_instruction(free_fn, irb->current_basic_block);
10871093
10881094 return &call_instruction->base;
10891095}
10901096
10911097static IrInstruction *ir_build_call_from(IrBuilder *irb, IrInstruction *old_instruction,
10921098 FnTableEntry *fn_entry, IrInstruction *fn_ref, size_t arg_count, IrInstruction **args,
1093 bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator)
1099 bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator, IrInstruction *alloc_fn, IrInstruction *free_fn)
10941100{
10951101 IrInstruction *new_instruction = ir_build_call(irb, old_instruction->scope,
1096 old_instruction->source_node, fn_entry, fn_ref, arg_count, args, is_comptime, fn_inline, is_async, async_allocator);
1102 old_instruction->source_node, fn_entry, fn_ref, arg_count, args, is_comptime, fn_inline, is_async, async_allocator, alloc_fn, free_fn);
10971103 ir_link_new_instruction(new_instruction, old_instruction);
10981104 return new_instruction;
10991105}
......@@ -2495,8 +2501,9 @@ static IrInstruction *ir_build_cancel(IrBuilder *irb, Scope *scope, AstNode *sou
24952501 return &instruction->base;
24962502}
24972503
2498static IrInstruction *ir_build_get_implicit_allocator(IrBuilder *irb, Scope *scope, AstNode *source_node) {
2504static IrInstruction *ir_build_get_implicit_allocator(IrBuilder *irb, Scope *scope, AstNode *source_node, ImplicitAllocatorId id) {
24992505 IrInstructionGetImplicitAllocator *instruction = ir_build_instruction<IrInstructionGetImplicitAllocator>(irb, scope, source_node);
2506 instruction->id = id;
25002507
25012508 return &instruction->base;
25022509}
......@@ -3970,7 +3977,7 @@ static IrInstruction *ir_gen_builtin_fn_call(IrBuilder *irb, Scope *scope, AstNo
39703977 }
39713978 FnInline fn_inline = (builtin_fn->id == BuiltinFnIdInlineCall) ? FnInlineAlways : FnInlineNever;
39723979
3973 return ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, fn_inline, false, nullptr);
3980 return ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, fn_inline, false, nullptr, nullptr, nullptr);
39743981 }
39753982 case BuiltinFnIdTypeId:
39763983 {
......@@ -4106,15 +4113,25 @@ static IrInstruction *ir_gen_fn_call(IrBuilder *irb, Scope *scope, AstNode *node
41064113
41074114 bool is_async = node->data.fn_call_expr.is_async;
41084115 IrInstruction *async_allocator = nullptr;
4116 IrInstruction *alloc_fn = nullptr;
4117 IrInstruction *free_fn = nullptr;
41094118 if (is_async) {
41104119 if (node->data.fn_call_expr.async_allocator) {
41114120 async_allocator = ir_gen_node(irb, node->data.fn_call_expr.async_allocator, scope);
41124121 if (async_allocator == irb->codegen->invalid_instruction)
41134122 return async_allocator;
4123
4124 Buf *alloc_field_name = buf_create_from_str(ASYNC_ALLOC_FIELD_NAME);
4125 IrInstruction *alloc_fn_ptr = ir_build_field_ptr(irb, scope, node, async_allocator, alloc_field_name);
4126 alloc_fn = ir_build_load_ptr(irb, scope, node, alloc_fn_ptr);
4127
4128 Buf *free_field_name = buf_create_from_str(ASYNC_FREE_FIELD_NAME);
4129 IrInstruction *free_fn_ptr = ir_build_field_ptr(irb, scope, node, async_allocator, free_field_name);
4130 free_fn = ir_build_load_ptr(irb, scope, node, free_fn_ptr);
41144131 }
41154132 }
41164133
4117 return ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, FnInlineAuto, is_async, async_allocator);
4134 return ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, FnInlineAuto, is_async, async_allocator, alloc_fn, free_fn);
41184135}
41194136
41204137static IrInstruction *ir_gen_if_bool_expr(IrBuilder *irb, Scope *scope, AstNode *node) {
......@@ -6106,20 +6123,16 @@ bool ir_gen(CodeGen *codegen, AstNode *node, Scope *scope, IrExecutable *ir_exec
61066123
61076124 ir_set_cursor_at_end_and_append_block(irb, dyn_alloc_block);
61086125 IrInstruction *coro_size = ir_build_coro_size(irb, scope, node);
6109 irb->exec->implicit_allocator_ptr = ir_build_get_implicit_allocator(irb, scope, node);
6110 Buf *alloc_field_name = buf_create_from_str(ASYNC_ALLOC_FIELD_NAME);
6111 IrInstruction *alloc_fn_ptr = ir_build_field_ptr(irb, scope, node, irb->exec->implicit_allocator_ptr,
6112 alloc_field_name);
6113 IrInstruction *alloc_fn = ir_build_load_ptr(irb, scope, node, alloc_fn_ptr);
6114 IrInstruction *alignment = ir_build_const_u29(irb, scope, node,
6115 get_coro_frame_align_bytes(irb->codegen));
6126 irb->exec->implicit_allocator_ptr = ir_build_get_implicit_allocator(irb, scope, node, ImplicitAllocatorIdContext);
6127 IrInstruction *alloc_fn = ir_build_get_implicit_allocator(irb, scope, node, ImplicitAllocatorIdAlloc);
6128 IrInstruction *alignment = ir_build_const_u29(irb, scope, node, get_coro_frame_align_bytes(irb->codegen));
61166129 size_t arg_count = 3;
61176130 IrInstruction **args = allocate<IrInstruction *>(arg_count);
61186131 args[0] = irb->exec->implicit_allocator_ptr; // self
61196132 args[1] = coro_size; // byte_count
61206133 args[2] = alignment; // alignment
61216134 IrInstruction *alloc_result = ir_build_call(irb, scope, node, nullptr, alloc_fn, arg_count, args, false,
6122 FnInlineAuto, false, nullptr);
6135 FnInlineAuto, false, nullptr, nullptr, nullptr);
61236136 IrInstruction *alloc_result_ptr = ir_build_ref(irb, scope, node, alloc_result, true, false);
61246137 IrInstruction *alloc_result_is_err = ir_build_test_err(irb, scope, node, alloc_result);
61256138 IrBasicBlock *alloc_err_block = ir_create_basic_block(irb, scope, "AllocError");
......@@ -6237,15 +6250,12 @@ bool ir_gen(CodeGen *codegen, AstNode *node, Scope *scope, IrExecutable *ir_exec
62376250 ir_build_cond_br(irb, scope, node, coro_need_dyn_alloc, dyn_free_block, end_free_block, const_bool_false);
62386251
62396252 ir_set_cursor_at_end_and_append_block(irb, dyn_free_block);
6240 Buf *free_field_name = buf_create_from_str(ASYNC_FREE_FIELD_NAME);
6241 IrInstruction *free_fn_ptr = ir_build_field_ptr(irb, scope, node, irb->exec->implicit_allocator_ptr,
6242 free_field_name);
6243 IrInstruction *free_fn = ir_build_load_ptr(irb, scope, node, free_fn_ptr);
6253 IrInstruction *free_fn = ir_build_get_implicit_allocator(irb, scope, node, ImplicitAllocatorIdFree);
62446254 size_t arg_count = 2;
62456255 IrInstruction **args = allocate<IrInstruction *>(arg_count);
62466256 args[0] = irb->exec->implicit_allocator_ptr; // self
62476257 args[1] = ir_build_load_ptr(irb, scope, node, coro_unwrapped_mem_ptr); // old_mem
6248 ir_build_call(irb, scope, node, nullptr, free_fn, arg_count, args, false, FnInlineAuto, false, nullptr);
6258 ir_build_call(irb, scope, node, nullptr, free_fn, arg_count, args, false, FnInlineAuto, false, nullptr, nullptr, nullptr);
62496259 ir_build_br(irb, scope, node, end_free_block, const_bool_false);
62506260
62516261 ir_set_cursor_at_end_and_append_block(irb, end_free_block);
......@@ -11266,7 +11276,7 @@ static TypeTableEntry *ir_analyze_instruction_error_union(IrAnalyze *ira,
1126611276 return ira->codegen->builtin_types.entry_type;
1126711277}
1126811278
11269IrInstruction *ir_get_implicit_allocator(IrAnalyze *ira, IrInstruction *source_instr) {
11279IrInstruction *ir_get_implicit_allocator(IrAnalyze *ira, IrInstruction *source_instr, ImplicitAllocatorId id) {
1127011280 FnTableEntry *parent_fn_entry = exec_fn_entry(ira->new_irb.exec);
1127111281 if (parent_fn_entry == nullptr) {
1127211282 ir_add_error(ira, source_instr, buf_sprintf("no implicit allocator available"));
......@@ -11280,27 +11290,39 @@ IrInstruction *ir_get_implicit_allocator(IrAnalyze *ira, IrInstruction *source_i
1128011290 }
1128111291
1128211292 assert(parent_fn_type->async_allocator_type != nullptr);
11283 IrInstruction *result = ir_build_get_implicit_allocator(&ira->new_irb, source_instr->scope, source_instr->source_node);
11284 result->value.type = parent_fn_type->async_allocator_type;
11293 IrInstruction *result = ir_build_get_implicit_allocator(&ira->new_irb, source_instr->scope, source_instr->source_node, id);
11294 switch (id) {
11295 case ImplicitAllocatorIdContext:
11296 result->value.type = parent_fn_type->async_allocator_type;
11297 break;
11298 case ImplicitAllocatorIdAlloc:
11299 {
11300 assert(parent_fn_type->async_allocator_type->id == TypeTableEntryIdPointer);
11301 TypeTableEntry *struct_type = parent_fn_type->async_allocator_type->data.pointer.child_type;
11302 TypeStructField *alloc_fn_field = find_struct_type_field(struct_type, buf_create_from_str(ASYNC_ALLOC_FIELD_NAME));
11303 assert(alloc_fn_field->type_entry->id == TypeTableEntryIdFn);
11304 result->value.type = alloc_fn_field->type_entry;
11305 break;
11306 }
11307 case ImplicitAllocatorIdFree:
11308 {
11309 assert(parent_fn_type->async_allocator_type->id == TypeTableEntryIdPointer);
11310 TypeTableEntry *struct_type = parent_fn_type->async_allocator_type->data.pointer.child_type;
11311 TypeStructField *free_fn_field = find_struct_type_field(struct_type, buf_create_from_str(ASYNC_FREE_FIELD_NAME));
11312 assert(free_fn_field->type_entry->id == TypeTableEntryIdFn);
11313 result->value.type = free_fn_field->type_entry;
11314 break;
11315 }
11316 }
1128511317 return result;
1128611318}
1128711319
1128811320static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCall *call_instruction, FnTableEntry *fn_entry, TypeTableEntry *fn_type,
11289 IrInstruction *fn_ref, IrInstruction **casted_args, size_t arg_count, IrInstruction *async_allocator_inst)
11321 IrInstruction *fn_ref, IrInstruction **casted_args, size_t arg_count, IrInstruction *async_allocator_inst, IrInstruction *alloc_fn, IrInstruction *free_fn)
1129011322{
11291 Buf *alloc_field_name = buf_create_from_str(ASYNC_ALLOC_FIELD_NAME);
11292 //Buf *free_field_name = buf_create_from_str("freeFn");
1129311323 assert(async_allocator_inst->value.type->id == TypeTableEntryIdPointer);
11294 TypeTableEntry *container_type = async_allocator_inst->value.type->data.pointer.child_type;
11295 IrInstruction *field_ptr_inst = ir_analyze_container_field_ptr(ira, alloc_field_name, &call_instruction->base,
11296 async_allocator_inst, container_type);
11297 if (type_is_invalid(field_ptr_inst->value.type)) {
11298 return ira->codegen->invalid_instruction;
11299 }
11300 TypeTableEntry *ptr_to_alloc_fn_type = field_ptr_inst->value.type;
11301 assert(ptr_to_alloc_fn_type->id == TypeTableEntryIdPointer);
1130211324
11303 TypeTableEntry *alloc_fn_type = ptr_to_alloc_fn_type->data.pointer.child_type;
11325 TypeTableEntry *alloc_fn_type = alloc_fn->value.type;
1130411326 if (alloc_fn_type->id != TypeTableEntryIdFn) {
1130511327 ir_add_error(ira, &call_instruction->base,
1130611328 buf_sprintf("expected allocation function, found '%s'", buf_ptr(&alloc_fn_type->name)));
......@@ -11319,7 +11341,7 @@ static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCall *c
1131911341 TypeTableEntry *async_return_type = get_error_union_type(ira->codegen, alloc_fn_error_set_type, promise_type);
1132011342
1132111343 IrInstruction *result = ir_build_call(&ira->new_irb, call_instruction->base.scope, call_instruction->base.source_node,
11322 fn_entry, fn_ref, arg_count, casted_args, false, FnInlineAuto, true, async_allocator_inst);
11344 fn_entry, fn_ref, arg_count, casted_args, false, FnInlineAuto, true, async_allocator_inst, alloc_fn, free_fn);
1132311345 result->value.type = async_return_type;
1132411346 return result;
1132511347}
......@@ -11842,7 +11864,7 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
1184211864 }
1184311865 IrInstruction *uncasted_async_allocator_inst;
1184411866 if (call_instruction->async_allocator == nullptr) {
11845 uncasted_async_allocator_inst = ir_get_implicit_allocator(ira, &call_instruction->base);
11867 uncasted_async_allocator_inst = ir_get_implicit_allocator(ira, &call_instruction->base, ImplicitAllocatorIdContext);
1184611868 if (type_is_invalid(uncasted_async_allocator_inst->value.type))
1184711869 return ira->codegen->builtin_types.entry_invalid;
1184811870 } else {
......@@ -11886,15 +11908,25 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
1188611908
1188711909 size_t impl_param_count = impl_fn->type_entry->data.fn.fn_type_id.param_count;
1188811910 if (call_instruction->is_async) {
11889 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, impl_fn, impl_fn->type_entry, fn_ref, casted_args, impl_param_count, async_allocator_inst);
11911 IrInstruction *alloc_fn = call_instruction->alloc_fn->other;
11912 if (type_is_invalid(alloc_fn->value.type))
11913 return ira->codegen->builtin_types.entry_invalid;
11914
11915 IrInstruction *free_fn = call_instruction->free_fn->other;
11916 if (type_is_invalid(free_fn->value.type))
11917 return ira->codegen->builtin_types.entry_invalid;
11918
11919 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, impl_fn, impl_fn->type_entry, fn_ref, casted_args, impl_param_count,
11920 async_allocator_inst, alloc_fn, free_fn);
1189011921 ir_link_new_instruction(result, &call_instruction->base);
1189111922 ir_add_alloca(ira, result, result->value.type);
1189211923 return ir_finish_anal(ira, result->value.type);
1189311924 }
1189411925
11926 assert(async_allocator_inst == nullptr);
1189511927 IrInstruction *new_call_instruction = ir_build_call_from(&ira->new_irb, &call_instruction->base,
1189611928 impl_fn, nullptr, impl_param_count, casted_args, false, fn_inline,
11897 call_instruction->is_async, async_allocator_inst);
11929 call_instruction->is_async, nullptr, nullptr, nullptr);
1189811930
1189911931 ir_add_alloca(ira, new_call_instruction, return_type);
1190011932
......@@ -11961,20 +11993,40 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
1196111993
1196211994 if (call_instruction->is_async) {
1196311995 IrInstruction *uncasted_async_allocator_inst;
11996 IrInstruction *uncasted_alloc_fn_inst;
11997 IrInstruction *uncasted_free_fn_inst;
1196411998 if (call_instruction->async_allocator == nullptr) {
11965 uncasted_async_allocator_inst = ir_get_implicit_allocator(ira, &call_instruction->base);
11999 uncasted_async_allocator_inst = ir_get_implicit_allocator(ira, &call_instruction->base, ImplicitAllocatorIdContext);
1196612000 if (type_is_invalid(uncasted_async_allocator_inst->value.type))
1196712001 return ira->codegen->builtin_types.entry_invalid;
12002
12003 uncasted_alloc_fn_inst = ir_get_implicit_allocator(ira, &call_instruction->base, ImplicitAllocatorIdAlloc);
12004 if (type_is_invalid(uncasted_alloc_fn_inst->value.type))
12005 return ira->codegen->builtin_types.entry_invalid;
12006
12007 uncasted_free_fn_inst = ir_get_implicit_allocator(ira, &call_instruction->base, ImplicitAllocatorIdFree);
12008 if (type_is_invalid(uncasted_free_fn_inst->value.type))
12009 return ira->codegen->builtin_types.entry_invalid;
1196812010 } else {
1196912011 uncasted_async_allocator_inst = call_instruction->async_allocator->other;
1197012012 if (type_is_invalid(uncasted_async_allocator_inst->value.type))
1197112013 return ira->codegen->builtin_types.entry_invalid;
12014
12015 uncasted_alloc_fn_inst = call_instruction->alloc_fn->other;
12016 if (type_is_invalid(uncasted_alloc_fn_inst->value.type))
12017 return ira->codegen->builtin_types.entry_invalid;
12018
12019 uncasted_free_fn_inst = call_instruction->free_fn->other;
12020 if (type_is_invalid(uncasted_free_fn_inst->value.type))
12021 return ira->codegen->builtin_types.entry_invalid;
12022
1197212023 }
1197312024 IrInstruction *async_allocator_inst = ir_implicit_cast(ira, uncasted_async_allocator_inst, fn_type_id->async_allocator_type);
1197412025 if (type_is_invalid(async_allocator_inst->value.type))
1197512026 return ira->codegen->builtin_types.entry_invalid;
1197612027
11977 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, fn_entry, fn_type, fn_ref, casted_args, call_param_count, async_allocator_inst);
12028 IrInstruction *result = ir_analyze_async_call(ira, call_instruction, fn_entry, fn_type, fn_ref, casted_args, call_param_count,
12029 async_allocator_inst, uncasted_alloc_fn_inst, uncasted_free_fn_inst);
1197812030 ir_link_new_instruction(result, &call_instruction->base);
1197912031 ir_add_alloca(ira, result, result->value.type);
1198012032 return ir_finish_anal(ira, result->value.type);
......@@ -11982,7 +12034,7 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
1198212034
1198312035
1198412036 IrInstruction *new_call_instruction = ir_build_call_from(&ira->new_irb, &call_instruction->base,
11985 fn_entry, fn_ref, call_param_count, casted_args, false, fn_inline, false, nullptr);
12037 fn_entry, fn_ref, call_param_count, casted_args, false, fn_inline, false, nullptr, nullptr, nullptr);
1198612038
1198712039 ir_add_alloca(ira, new_call_instruction, return_type);
1198812040 return ir_finish_anal(ira, return_type);
......@@ -17222,7 +17274,7 @@ static TypeTableEntry *ir_analyze_instruction_coro_begin(IrAnalyze *ira, IrInstr
1722217274}
1722317275
1722417276static TypeTableEntry *ir_analyze_instruction_get_implicit_allocator(IrAnalyze *ira, IrInstructionGetImplicitAllocator *instruction) {
17225 IrInstruction *result = ir_get_implicit_allocator(ira, &instruction->base);
17277 IrInstruction *result = ir_get_implicit_allocator(ira, &instruction->base, instruction->id);
1722617278 ir_link_new_instruction(result, &instruction->base);
1722717279 return result->value.type;
1722817280}
src/ir_print.cpp+13-1
......@@ -1027,7 +1027,19 @@ static void ir_print_cancel(IrPrint *irp, IrInstructionCancel *instruction) {
10271027}
10281028
10291029static void ir_print_get_implicit_allocator(IrPrint *irp, IrInstructionGetImplicitAllocator *instruction) {
1030 fprintf(irp->f, "@getImplicitAllocator()");
1030 fprintf(irp->f, "@getImplicitAllocator(");
1031 switch (instruction->id) {
1032 case ImplicitAllocatorIdContext:
1033 fprintf(irp->f, "Context");
1034 break;
1035 case ImplicitAllocatorIdAlloc:
1036 fprintf(irp->f, "Alloc");
1037 break;
1038 case ImplicitAllocatorIdFree:
1039 fprintf(irp->f, "Free");
1040 break;
1041 }
1042 fprintf(irp->f, ")");
10311043}
10321044
10331045static void ir_print_coro_id(IrPrint *irp, IrInstructionCoroId *instruction) {
std/mem.zig-16
......@@ -116,22 +116,6 @@ pub const Allocator = struct {
116116 const non_const_ptr = @intToPtr(&u8, @ptrToInt(bytes.ptr));
117117 self.freeFn(self, non_const_ptr[0..bytes.len]);
118118 }
119
120 pub const AsyncAllocator = struct {
121 allocator: &Allocator,
122
123 fn alloc(self: &const AsyncAllocator, byte_count: usize, alignment: u29) Error![]u8 {
124 return self.allocator.allocFn(self.allocator, byte_count, alignment);
125 }
126
127 fn free(self: &const AsyncAllocator, old_mem: []u8) void {
128 return self.allocator.freeFn(self.allocator, old_mem);
129 }
130 };
131
132 fn toAsync(self: &Allocator) AsyncAllocator {
133 return AsyncAllocator { .allocator = self };
134 }
135119};
136120
137121/// Copy all of source into dest at position 0.