re PR libgomp/32468 (number of threads in a parallel region depends on number of...

	PR libgomp/32468
	* sections.c (GOMP_parallel_sections_start): Only decrease
	number of threads to COUNT if dyn_var is true.
	* testsuite/libgomp.c/pr32468.c: New test.

From-SVN: r126224

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6e5b09fb5a0e9fcc60f4531c5b7af4c3e078ddf0..a9d1f5a40be5fb6da3929cf68df777029fae087d 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libgomp/32468
+       * sections.c (GOMP_parallel_sections_start): Only decrease
+       number of threads to COUNT if dyn_var is true.
+       * testsuite/libgomp.c/pr32468.c: New test.
+
 2007-07-02  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        PR libgomp/26308

diff --git a/libgomp/sections.c b/libgomp/sections.c
index de0acd843eaf942fab344aa7c40ec82d5cbcf43c..9ccc65e4b66fef0e8780d36a8ee6a909ff0f0ae3 100644 (file)
--- a/libgomp/sections.c
+++ b/libgomp/sections.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2007 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -106,7 +106,7 @@ GOMP_parallel_sections_start (void (*fn) (void *), void *data,
   struct gomp_work_share *ws;
 
   num_threads = gomp_resolve_num_threads (num_threads);
-  if (num_threads > count)
+  if (gomp_dyn_var && num_threads > count)
     num_threads = count;
 
   ws = gomp_new_work_share (false, num_threads);

diff --git a/libgomp/testsuite/libgomp.c/pr32468.c b/libgomp/testsuite/libgomp.c/pr32468.c
new file mode 100644 (file)
index 0000000..f20f660
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr32468.c
@@ -0,0 +1,26 @@
+/* PR libgomp/32468 */
+/* { dg-do run } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+  int res[2] = { -1, -1 };
+  omp_set_dynamic (0);
+  omp_set_num_threads (4);
+#pragma omp parallel
+  {
+    #pragma omp sections
+      {
+       #pragma omp section
+       res[0] = omp_get_num_threads () != 4;
+       #pragma omp section
+       res[1] = omp_get_num_threads () != 4;
+      }
+  }
+  if (res[0] != 0 || res[1] != 0)
+    abort ();
+  return 0;
+}