re PR c/39495 (OMP parallel loop w/ unsigned index var rejected)

	PR c/39495
	* c-omp.c (c_finish_omp_for): Allow NE_EXPR with TREE_TYPE (decl)'s
	minimum or maximum value.

	* parser.c (cp_parser_omp_for_cond): Don't check lhs if decl is NULL.
	(cp_parser_omp_for_loop): Always use cp_parser_omp_for_cond.

	* gcc.dg/gomp/pr39495-1.c: New test.
	* gcc.dg/gomp/pr39495-2.c: New test.
	* g++.dg/gomp/pr39495-1.C: New test.
	* g++.dg/gomp/pr39495-2.C: New test.

From-SVN: r144965

9 files changed, 307 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1d372b5..a6aefee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/39495
+	* c-omp.c (c_finish_omp_for): Allow NE_EXPR with TREE_TYPE (decl)'s
+	minimum or maximum value.
+
 2009-03-19  Alexandre Oliva  <aoliva@redhat.com>
 
 	* reginfo.c (globalize_reg): Recompute derived reg sets.
diff --git a/gcc/c-omp.c b/gcc/c-omp.c
index 3be3729..33f0a83 100644
--- a/gcc/c-omp.c
+++ b/gcc/c-omp.c
@@ -1,7 +1,7 @@
 /* This file contains routines to construct GNU OpenMP constructs, 
    called from parsing in the C and C++ front ends.
 
-   Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>,
 		  Diego Novillo <dnovillo@redhat.com>.
 
@@ -280,7 +280,8 @@ c_finish_omp_for (location_t locus, tree declv, tree initv, tree condv,
 	  if (TREE_CODE (cond) == LT_EXPR
 	      || TREE_CODE (cond) == LE_EXPR
 	      || TREE_CODE (cond) == GT_EXPR
-	      || TREE_CODE (cond) == GE_EXPR)
+	      || TREE_CODE (cond) == GE_EXPR
+	      || TREE_CODE (cond) == NE_EXPR)
 	    {
 	      tree op0 = TREE_OPERAND (cond, 0);
 	      tree op1 = TREE_OPERAND (cond, 1);
@@ -324,6 +325,22 @@ c_finish_omp_for (location_t locus, tree declv, tree initv, tree condv,
 		  TREE_OPERAND (cond, 0) = decl;
 		  cond_ok = true;
 		}
+
+	      if (TREE_CODE (cond) == NE_EXPR)
+		{
+		  if (!INTEGRAL_TYPE_P (TREE_TYPE (decl)))
+		    cond_ok = false;
+		  else if (operand_equal_p (TREE_OPERAND (cond, 1),
+					    TYPE_MIN_VALUE (TREE_TYPE (decl)),
+					    0))
+		    TREE_SET_CODE (cond, GT_EXPR);
+		  else if (operand_equal_p (TREE_OPERAND (cond, 1),
+					    TYPE_MAX_VALUE (TREE_TYPE (decl)),
+					    0))
+		    TREE_SET_CODE (cond, LT_EXPR);
+		  else
+		    cond_ok = false;
+		}
 	    }
 
 	  if (!cond_ok)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8553a19..f533944 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/39495
+	* parser.c (cp_parser_omp_for_cond): Don't check lhs if decl is NULL.
+	(cp_parser_omp_for_loop): Always use cp_parser_omp_for_cond.
+
 2009-03-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* parser.c (struct cp_token): Reorder fields for 64-bit hosts.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 4e79e1f..60787b0 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -21012,7 +21012,7 @@ cp_parser_omp_for_cond (cp_parser *parser, tree decl)
   enum tree_code op;
   cp_token *token;
 
-  if (lhs != decl)
+  if (decl && lhs != decl)
     {
       cp_parser_skip_to_end_of_statement (parser);
       return error_mark_node;
@@ -21414,16 +21414,7 @@ cp_parser_omp_for_loop (cp_parser *parser, tree clauses, tree *par_clauses)
 
       cond = NULL;
       if (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON))
-	{
-	  /* If decl is an iterator, preserve LHS and RHS of the relational
-	     expr until finish_omp_for.  */
-	  if (decl
-	      && (type_dependent_expression_p (decl)
-		  || CLASS_TYPE_P (TREE_TYPE (decl))))
-	    cond = cp_parser_omp_for_cond (parser, decl);
-	  else
-	    cond = cp_parser_condition (parser);
-	}
+	cond = cp_parser_omp_for_cond (parser, decl);
       cp_parser_require (parser, CPP_SEMICOLON, "%<;%>");
 
       incr = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 541c732..6f5dfa9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-19  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c/39495
+	* gcc.dg/gomp/pr39495-1.c: New test.
+	* gcc.dg/gomp/pr39495-2.c: New test.
+	* g++.dg/gomp/pr39495-1.C: New test.
+	* g++.dg/gomp/pr39495-2.C: New test.
+
 	PR target/39496
 	* gcc.target/i386/pr39496.c: New test.
 	* g++.dg/other/pr39496.C: New test.
diff --git a/gcc/testsuite/g++.dg/gomp/pr39495-1.C b/gcc/testsuite/g++.dg/gomp/pr39495-1.C
new file mode 100644
index 0000000..8563e68
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr39495-1.C
@@ -0,0 +1,95 @@
+// PR c/39495
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+#define INT_MIN (-__INT_MAX__ - 1)
+#define INT_MAX __INT_MAX__
+#define UINT_MAX (2U * __INT_MAX__ + 1)
+
+int
+foo (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN + 1; i--)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i >= INT_MIN + 1; i--)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN; i--)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX - 1; i++)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i <= INT_MAX - 1; i++)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX; i++)
+    ;
+#pragma omp for
+  for (u = 6; u > 1; u--)
+    ;
+#pragma omp for
+  for (u = 6; u >= 1; u--)
+    ;
+#pragma omp for
+  for (u = 6; u > 0; u--)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX - 1; u++)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u <= UINT_MAX - 1; u++)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX; u++)
+    ;
+}
+
+int
+bar (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN + 1; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i >= INT_MIN + 1; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX - 1; i += 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i <= INT_MAX - 1; i += 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX; i += 2)
+    ;
+#pragma omp for
+  for (u = 6; u > 1; u -= 2)
+    ;
+#pragma omp for
+  for (u = 6; u >= 1; u -= 2)
+    ;
+#pragma omp for
+  for (u = 6; u > 0; u -= 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX - 1; u += 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u <= UINT_MAX - 1; u += 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX; u += 2)
+    ;
+}
diff --git a/gcc/testsuite/g++.dg/gomp/pr39495-2.C b/gcc/testsuite/g++.dg/gomp/pr39495-2.C
new file mode 100644
index 0000000..c0b4d5d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr39495-2.C
@@ -0,0 +1,39 @@
+// PR c/39495
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+#define INT_MIN (-__INT_MAX__ - 1)
+#define INT_MAX __INT_MAX__
+#define UINT_MAX (2U * __INT_MAX__ + 1)
+
+int
+foo (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i != INT_MIN; i--)	// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i == INT_MIN; i--)	// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i != INT_MAX; i++)	// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i == INT_MAX; i++)	// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (u = 6; u != 0; u--)			// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (u = 6; u == 0; u--)			// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u != UINT_MAX; u++)	// { dg-error "invalid controlling predicate" }
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u == UINT_MAX; u++)	// { dg-error "invalid controlling predicate" }
+    ;
+}
diff --git a/gcc/testsuite/gcc.dg/gomp/pr39495-1.c b/gcc/testsuite/gcc.dg/gomp/pr39495-1.c
new file mode 100644
index 0000000..cc165ca
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/pr39495-1.c
@@ -0,0 +1,95 @@
+/* PR c/39495 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+#define INT_MIN (-__INT_MAX__ - 1)
+#define INT_MAX __INT_MAX__
+#define UINT_MAX (2U * __INT_MAX__ + 1)
+
+int
+foo (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN + 1; i--)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i >= INT_MIN + 1; i--)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN; i--)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX - 1; i++)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i <= INT_MAX - 1; i++)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX; i++)
+    ;
+#pragma omp for
+  for (u = 6; u > 1; u--)
+    ;
+#pragma omp for
+  for (u = 6; u >= 1; u--)
+    ;
+#pragma omp for
+  for (u = 6; u > 0; u--)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX - 1; u++)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u <= UINT_MAX - 1; u++)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX; u++)
+    ;
+}
+
+int
+bar (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN + 1; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i >= INT_MIN + 1; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i > INT_MIN; i -= 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX - 1; i += 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i <= INT_MAX - 1; i += 2)
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i < INT_MAX; i += 2)
+    ;
+#pragma omp for
+  for (u = 6; u > 1; u -= 2)
+    ;
+#pragma omp for
+  for (u = 6; u >= 1; u -= 2)
+    ;
+#pragma omp for
+  for (u = 6; u > 0; u -= 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX - 1; u += 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u <= UINT_MAX - 1; u += 2)
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u < UINT_MAX; u += 2)
+    ;
+}
diff --git a/gcc/testsuite/gcc.dg/gomp/pr39495-2.c b/gcc/testsuite/gcc.dg/gomp/pr39495-2.c
new file mode 100644
index 0000000..e463696
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/pr39495-2.c
@@ -0,0 +1,39 @@
+/* PR c/39495 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+#define INT_MIN (-__INT_MAX__ - 1)
+#define INT_MAX __INT_MAX__
+#define UINT_MAX (2U * __INT_MAX__ + 1)
+
+int
+foo (void)
+{
+  int i;
+  unsigned int u;
+
+#pragma omp for
+  for (i = INT_MIN + 6; i != INT_MIN; i--)	/* { dg-error "invalid controlling predicate" "" { xfail *-*-* } } */
+    ;
+#pragma omp for
+  for (i = INT_MIN + 6; i == INT_MIN; i--)	/* { dg-error "invalid controlling predicate" } */
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i != INT_MAX; i++)	/* { dg-error "invalid controlling predicate" "" { xfail *-*-* }  } */
+    ;
+#pragma omp for
+  for (i = INT_MAX - 6; i == INT_MAX; i++)	/* { dg-error "invalid controlling predicate" } */
+    ;
+#pragma omp for
+  for (u = 6; u != 0; u--)			/* { dg-error "invalid controlling predicate" "" { xfail *-*-* }  } */
+    ;
+#pragma omp for
+  for (u = 6; u == 0; u--)			/* { dg-error "invalid controlling predicate" } */
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u != UINT_MAX; u++)	/* { dg-error "invalid controlling predicate" "" { xfail *-*-* }  } */
+    ;
+#pragma omp for
+  for (u = UINT_MAX - 6; u == UINT_MAX; u++)	/* { dg-error "invalid controlling predicate" } */
+    ;
+}