wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[OpenMP] Add check for hot_teams array 

If hot teams are not being used, this code could seg fault without the added
check, and does so when composability is used in conjunction with nesting.
The fix prevents the segfault.

Differential Revision: https://reviews.llvm.org/D50649

llvm-svn: 340629
This commit is contained in:
Jonathan Peyton 2018-08-24 18:05:00 +00:00
parent b1b221c82c
commit ca10a76f08
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmp/runtime/src/kmp_runtime.cpp
View File

@ -2115,7 +2115,8 @@ int __kmp_fork_call(ident_t *loc, int gtid,
master_th->th.th_task_state;
master_th->th.th_task_state_top++;
#if KMP_NESTED_HOT_TEAMS
if (team == master_th->th.th_hot_teams[active_level].hot_team) {
if (master_th->th.th_hot_teams &&
team == master_th->th.th_hot_teams[active_level].hot_team) {
// Restore master's nested state if nested hot team
master_th->th.th_task_state =
master_th->th