[Openmp-commits] [openmp] add8d90 - [OpenMP] support alloc of serialized tasks

[Joachim Protze via Openmp-commits]

Author: Joachim Protze
Date: 2020-06-14T15:55:32+02:00
New Revision: add8d90cb3bbcee5f381bcb480d1f543b3609ac6

URL: https://github.com/llvm/llvm-project/commit/add8d90cb3bbcee5f381bcb480d1f543b3609ac6
DIFF: https://github.com/llvm/llvm-project/commit/add8d90cb3bbcee5f381bcb480d1f543b3609ac6.diff

LOG: [OpenMP] support alloc of serialized tasks

Reviewed by: AndreyChurbanov

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

Added: 
    

Modified: 
    openmp/runtime/src/kmp_tasking.cpp

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp
index 001992475028..b86ea2f5f55a 100644
--- a/openmp/runtime/src/kmp_tasking.cpp
+++ b/openmp/runtime/src/kmp_tasking.cpp
@@ -1328,7 +1328,7 @@ kmp_task_t *__kmp_task_alloc(ident_t *loc_ref, kmp_int32 gtid,
 
   taskdata->td_flags.task_serial =
       (parent_task->td_flags.final || taskdata->td_flags.team_serial ||
-       taskdata->td_flags.tasking_ser);
+       taskdata->td_flags.tasking_ser || flags->merged_if0);
 
   taskdata->td_flags.started = 0;
   taskdata->td_flags.executing = 0;