mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-22 17:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jakub Jelinek 2009-03-19 16:34:00 +01:00 committed by Jakub Jelinek
parent 58929c1068
commit ea1199ee95
9 changed files with 307 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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.

21
gcc/c-omp.c
View File

@ -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)

6
gcc/cp/ChangeLog
View File

@ -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.

13
gcc/cp/parser.c
View File

@ -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;

6
gcc/testsuite/ChangeLog
View File

@ -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.

95
gcc/testsuite/g++.dg/gomp/pr39495-1.C Normal file
View File

@ -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)
;
}

39
gcc/testsuite/g++.dg/gomp/pr39495-2.C Normal file
View File

@ -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" }
;
}

95
gcc/testsuite/gcc.dg/gomp/pr39495-1.c Normal file
View File

@ -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)
;
}

39
gcc/testsuite/gcc.dg/gomp/pr39495-2.c Normal file
View File

@ -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" } */
;
}