diff options
| author | Alexandros Naskos <alex_naskos@hotmail.com> | 2018-05-01 13:09:34 +0300 |
|---|---|---|
| committer | Alexandros Naskos <alex_naskos@hotmail.com> | 2018-05-01 13:09:34 +0300 |
| commit | 255c0ef40688342aa07f2b51be06791715fc8ae0 (patch) | |
| tree | 489339ad9f5e4eeb9c5fffab8b1a16b19234981e /src/analyze.cpp | |
| parent | e1535ee0a9f9d01d16a79c380b493f676ae57121 (diff) | |
| parent | 3a8dc4e90ddf6b3dc2bdf640c89061c00eee7d45 (diff) | |
| download | zig-255c0ef40688342aa07f2b51be06791715fc8ae0.tar.gz zig-255c0ef40688342aa07f2b51be06791715fc8ae0.zip | |
Resolved merge conflict.
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index a598d7676e..1ecfe32f4c 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -1258,7 +1258,7 @@ void init_fn_type_id(FnTypeId *fn_type_id, AstNode *proto_node, size_t param_cou } fn_type_id->param_count = fn_proto->params.length; - fn_type_id->param_info = allocate_nonzero<FnTypeParamInfo>(param_count_alloc); + fn_type_id->param_info = allocate<FnTypeParamInfo>(param_count_alloc); fn_type_id->next_param_index = 0; fn_type_id->is_var_args = fn_proto->is_var_args; } @@ -6131,4 +6131,3 @@ bool type_can_fail(TypeTableEntry *type_entry) { bool fn_type_can_fail(FnTypeId *fn_type_id) { return type_can_fail(fn_type_id->return_type) || fn_type_id->cc == CallingConventionAsync; } - |