diff options
| author | Henry Linjamäki <henry.linjamaki@parmance.com> | 2017-09-29 16:57:18 +0000 |
|---|---|---|
| committer | Pekka Jääskeläinen <visit0r@gcc.gnu.org> | 2017-09-29 16:57:18 +0000 |
| commit | e1e299f3356d1977e33d7c654a8f5f49d5a0446a (patch) | |
| tree | 5f1923cf9ce043d86f6d84635ce257acc94044a9 /gcc | |
| parent | e90c74f59870d39e36eb2f390ea0d9b2bea10693 (diff) | |
| download | gcc-e1e299f3356d1977e33d7c654a8f5f49d5a0446a.zip gcc-e1e299f3356d1977e33d7c654a8f5f49d5a0446a.tar.gz gcc-e1e299f3356d1977e33d7c654a8f5f49d5a0446a.tar.bz2 | |
[BRIGFE] Fix crash with calls with more than 4 args.
Also fix a misexecution issue with kernels that have
both unexpanded ID functions and calls to subfunctions.
From-SVN: r253298
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/brig/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/brig/brigfrontend/brig-branch-inst-handler.cc | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/brig/ChangeLog b/gcc/brig/ChangeLog index fb2b09d..c66b16f 100644 --- a/gcc/brig/ChangeLog +++ b/gcc/brig/ChangeLog @@ -1,3 +1,10 @@ +2017-09-29 Henry Linjamäki <henry.linjamaki@parmance.com> + + * brigfrontend/brig-branch-inst-handler.cc: Fix crash with + calls with more than 4 args. Also fix a misexecution issue + with kernels that have both unexpanded ID functions and + calls to subfunctions. + 2017-09-28 Henry Linjamäki <henry.linjamaki@parmance.com> * brig-lang.c: Added function attributes and their handlers. diff --git a/gcc/brig/brigfrontend/brig-branch-inst-handler.cc b/gcc/brig/brigfrontend/brig-branch-inst-handler.cc index c8912db..a32dd99 100644 --- a/gcc/brig/brigfrontend/brig-branch-inst-handler.cc +++ b/gcc/brig/brigfrontend/brig-branch-inst-handler.cc @@ -42,7 +42,8 @@ brig_branch_inst_handler::operator () (const BrigBase *base) vec<tree, va_gc> *out_args; vec_alloc (out_args, 1); vec<tree, va_gc> *in_args; - vec_alloc (in_args, 4); + /* Ten elem initially, more reserved if needed. */ + vec_alloc (in_args, 10); size_t operand_count = operand_entries->byteCount / 4; gcc_assert (operand_count < 4); @@ -96,6 +97,7 @@ brig_branch_inst_handler::operator () (const BrigBase *base) } gcc_assert (var != NULL_TREE); + vec_safe_reserve (args, 1); vec_safe_push (args, var); ++operand_ptr; bytes -= 4; @@ -125,6 +127,7 @@ brig_branch_inst_handler::operator () (const BrigBase *base) /* TODO: ensure the callee's frame is aligned! */ + vec_safe_reserve (in_args, 4); vec_safe_push (in_args, m_parent.m_cf->m_context_arg); vec_safe_push (in_args, m_parent.m_cf->m_group_base_arg); vec_safe_push (in_args, group_local_offset); @@ -147,7 +150,6 @@ brig_branch_inst_handler::operator () (const BrigBase *base) m_parent.m_cf->append_statement (call); } - m_parent.m_cf->m_has_unexpanded_dp_builtins = false; m_parent.m_cf->m_called_functions.push_back (func_ref); return base->byteCount; |