[Openmp-commits] [PATCH] D21925: __kmp_partition_places: Update assertion for new parameter

[Jonas Hahnfeld via Openmp-commits]

Hahnfeld created this revision.
Hahnfeld added reviewers: jlpeyton, tlwilmar.
Hahnfeld added a subscriber: openmp-commits.

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)

http://reviews.llvm.org/D21925

Files:
  runtime/src/kmp_runtime.c

Index: runtime/src/kmp_runtime.c
===================================================================
--- runtime/src/kmp_runtime.c
+++ runtime/src/kmp_runtime.c
@@ -4651,7 +4651,7 @@
                       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;
@@ -4710,7 +4710,7 @@
                        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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21925.62481.patch
Type: text/x-patch
Size: 918 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160701/03fbc788/attachment.bin>