diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /liboffloadmic | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'liboffloadmic')
| -rw-r--r-- | liboffloadmic/ChangeLog | 6 | ||||
| -rw-r--r-- | liboffloadmic/runtime/offload_target.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 2c3cfff..c45f937 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2020-05-05 Martin Liska <mliska@suse.cz> + + PR other/89860 + * runtime/offload_target.cpp: Put index check + before its use. + 2020-01-24 Maciej W. Rozycki <macro@wdc.com> * plugin/configure.ac: Handle `--with-toolexeclibdir='. diff --git a/liboffloadmic/runtime/offload_target.cpp b/liboffloadmic/runtime/offload_target.cpp index 8273faa..16ba4a3 100644 --- a/liboffloadmic/runtime/offload_target.cpp +++ b/liboffloadmic/runtime/offload_target.cpp @@ -329,7 +329,7 @@ void OffloadDescriptor::merge_var_descs( } } // instead of m_vars[i].type.dst we will use m_vars_extra[i].type_dst - if (m_vars[i].type.dst == c_extended_type && i < vars_total) { + if (i < vars_total && m_vars[i].type.dst == c_extended_type) { VarDescExtendedType *etype = reinterpret_cast<VarDescExtendedType*>(vars[i].into); m_vars_extra[i].type_dst = etype->extended_type; |