[Openmp-commits] [openmp] r274482 - __kmp_partition_places: Update assertion for new parameter update_master_only

[Jonas Hahnfeld via Openmp-commits]

Author: hahnfeld
Date: Mon Jul  4 00:58:10 2016
New Revision: 274482

URL: http://llvm.org/viewvc/llvm-project?rev=274482&view=rev
Log:
__kmp_partition_places: Update assertion for new parameter update_master_only

If update_master_only is set the place list is not completely traversed
and therefore this assertion failed. Make it only trigger if
update_master_only is false.

(was introduced by D20539)

Differential Revision: http://reviews.llvm.org/D21925

Modified:
    openmp/trunk/runtime/src/kmp_runtime.c

Modified: openmp/trunk/runtime/src/kmp_runtime.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_runtime.c?rev=274482&r1=274481&r2=274482&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_runtime.c (original)
+++ openmp/trunk/runtime/src/kmp_runtime.c Mon Jul  4 00:58:10 2016
@@ -4646,7 +4646,7 @@ __kmp_partition_places( kmp_team_t *team
                       team->t.t_id, f, th->th.th_new_place,
                       th->th.th_first_place, th->th.th_last_place ) );
                 }
-                KMP_DEBUG_ASSERT( place == masters_place );
+                KMP_DEBUG_ASSERT( update_master_only || place == masters_place );
             }
             else {
                 int S, rem, gap, s_count;
@@ -4705,7 +4705,7 @@ __kmp_partition_places( kmp_team_t *team
                        team->t.t_id, f, th->th.th_new_place,
                        th->th.th_first_place, th->th.th_last_place) );
                 }
-                KMP_DEBUG_ASSERT( place == masters_place );
+                KMP_DEBUG_ASSERT( update_master_only || place == masters_place );
             }
         }
         break;