From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 13 Feb 2012 19:57:24 +0000 (+0100)
Subject: re PR middle-end/52230 (OpenMP: Simple C program triggers SIGSEGV at execution)
X-Git-Tag: releases/gcc-4.7.0~427
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9abd5ed90b85306b6cfea640c9e01e486bbcddb1;p=thirdparty%2Fgcc.git

re PR middle-end/52230 (OpenMP: Simple C program triggers SIGSEGV at execution)

	PR middle-end/52230
	* omp-low.c (expand_omp_for): If a static schedule without
	chunk size has NULL region->cont, force fd.chunk_size to be
	integer_zero_node.

From-SVN: r184165
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 536933b41755..89cb0f753ed8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/52230
+	* omp-low.c (expand_omp_for): If a static schedule without
+	chunk size has NULL region->cont, force fd.chunk_size to be
+	integer_zero_node.
+
 2012-02-13  Andrew MacLeod  <amacleod@redhat.com>
 
 	PR c/52190
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 8ab689d01527..db715947df00 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -3,7 +3,7 @@
    marshalling to implement data sharing and copying clauses.
    Contributed by Diego Novillo <dnovillo@redhat.com>
 
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -4664,6 +4664,9 @@ expand_omp_for (struct omp_region *region)
     {
       int fn_index, start_ix, next_ix;
 
+      if (fd.chunk_size == NULL
+	  && fd.sched_kind == OMP_CLAUSE_SCHEDULE_STATIC)
+	fd.chunk_size = integer_zero_node;
       gcc_assert (fd.sched_kind != OMP_CLAUSE_SCHEDULE_AUTO);
       fn_index = (fd.sched_kind == OMP_CLAUSE_SCHEDULE_RUNTIME)
 		  ? 3 : fd.sched_kind;