aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2015-09-03 11:01:05 +0000
committerTom de Vries <vries@gcc.gnu.org>2015-09-03 11:01:05 +0000
commit8050766eaef0077f0af28dab1c0fe6f1aad724bb (patch)
tree34b684e512b67857fce9ba1949fd5553b599be06
parent8cba6b95273ad9d736c977f430fe97638beb8b94 (diff)
downloadgcc-8050766eaef0077f0af28dab1c0fe6f1aad724bb.zip
gcc-8050766eaef0077f0af28dab1c0fe6f1aad724bb.tar.gz
gcc-8050766eaef0077f0af28dab1c0fe6f1aad724bb.tar.bz2
Fix gcc_assert in expand_omp_for_static_chunk
2015-09-03 Tom de Vries <tom@codesourcery.com> PR tree-optimization/65637 * omp-low.c (expand_omp_for_static_chunk): Fix gcc_assert for the case that head is NULL. * gcc.dg/autopar/pr46099-2.c: New test. From-SVN: r227436
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/omp-low.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/autopar/pr46099-2.c5
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86317e3..ae76185 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2015-09-03 Tom de Vries <tom@codesourcery.com>
+ PR tree-optimization/65637
+ * omp-low.c (expand_omp_for_static_chunk): Fix gcc_assert for the case
+ that head is NULL.
+
+2015-09-03 Tom de Vries <tom@codesourcery.com>
+
* omp-low.c (expand_omp_for_static_chunk): Handle simple latch bb.
2015-09-03 Tom de Vries <tom@codesourcery.com>
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 16d1922..0995652 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -7326,7 +7326,7 @@ expand_omp_for_static_chunk (struct omp_region *region,
locus = redirect_edge_var_map_location (vm);
add_phi_arg (nphi, redirect_edge_var_map_def (vm), re, locus);
}
- gcc_assert (gsi_end_p (psi) && i == head->length ());
+ gcc_assert (gsi_end_p (psi) && (head == NULL || i == head->length ()));
redirect_edge_var_map_clear (re);
while (1)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 65ca8c4..bfb7dd2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-03 Tom de Vries <tom@codesourcery.com>
+
+ PR tree-optimization/65637
+ * gcc.dg/autopar/pr46099-2.c: New test.
+
2015-09-03 Naveen H.S <Naveen.Hurugalawadi@caviumnetworks.com>
PR middle-end/67351
diff --git a/gcc/testsuite/gcc.dg/autopar/pr46099-2.c b/gcc/testsuite/gcc.dg/autopar/pr46099-2.c
new file mode 100644
index 0000000..2883408
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/autopar/pr46099-2.c
@@ -0,0 +1,5 @@
+/* PR tree-optimization/46099. */
+/* { dg-do compile } */
+/* { dg-options "-ftree-parallelize-loops=2 -fcompare-debug -O --param parloops-chunk-size=100" } */
+
+#include "pr46099.c"