[Openmp-commits] [PATCH] D25510: Fix for mistake done by https://reviews.llvm.org/D23115

[Phabricator via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL284747: Fixed memory leak mistakenly introduced by https://reviews.llvm.org/D23115 (authored by achurbanov).

Changed prior to commit:
  https://reviews.llvm.org/D25510?vs=74359&id=75317#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D25510

Files:
  openmp/trunk/runtime/src/kmp_tasking.c


Index: openmp/trunk/runtime/src/kmp_tasking.c
===================================================================
--- openmp/trunk/runtime/src/kmp_tasking.c
+++ openmp/trunk/runtime/src/kmp_tasking.c
@@ -579,9 +579,11 @@
 #if OMP_45_ENABLED
     // Proxy tasks must always be allowed to free their parents
     // because they can be run in background even in serial mode.
-    kmp_int32 task_serial = taskdata->td_flags.task_serial && !taskdata->td_flags.proxy;
+    kmp_int32 team_serial = ( taskdata->td_flags.team_serial ||
+        taskdata->td_flags.tasking_ser ) && !taskdata->td_flags.proxy;
 #else
-    kmp_int32 task_serial = taskdata->td_flags.task_serial;
+    kmp_int32 team_serial = taskdata->td_flags.team_serial ||
+        taskdata->td_flags.tasking_ser;
 #endif
     KMP_DEBUG_ASSERT( taskdata -> td_flags.tasktype == TASK_EXPLICIT );
 
@@ -603,7 +605,7 @@
 
         // Stop checking ancestors at implicit task
         // instead of walking up ancestor tree to avoid premature deallocation of ancestors.
-        if ( task_serial || taskdata -> td_flags.tasktype == TASK_IMPLICIT )
+        if ( team_serial || taskdata -> td_flags.tasktype == TASK_IMPLICIT )
             return;
 
         // Predecrement simulated by "- 1" calculation


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25510.75317.patch
Type: text/x-patch
Size: 1259 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20161020/376c696d/attachment.bin>