OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backport "Fix condition folding in c_parser_omp_for_loop" 

2017-12-10  Tom de Vries  <tom@codesourcery.com>

	backport from trunk:
	2017-09-16  Tom de Vries  <tom@codesourcery.com>

	PR c/81875
	* c-parser.c (c_parser_omp_for_loop): Fold only operands of cond, not
	cond itself.

	* testsuite/libgomp.c/pr81875.c: New test.

From-SVN: r255531
This commit is contained in:
Tom de Vries 2017-12-10 20:52:54 +00:00 committed by Tom de Vries
parent 07f59edb30
commit 3a15e0edf8
4 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/c/ChangeLog
View File

@ -1,3 +1,12 @@
2017-12-10 Tom de Vries <tom@codesourcery.com>
backport from trunk:
PR c/81875
2017-09-16 Tom de Vries <tom@codesourcery.com>
* c-parser.c (c_parser_omp_for_loop): Fold only operands of cond, not
cond itself.
2017-09-30 Jakub Jelinek <jakub@redhat.com>
Backported from mainline

9
gcc/c/c-parser.c
View File

@ -15032,7 +15032,14 @@ c_parser_omp_for_loop (location_t loc, c_parser *parser, enum tree_code code,
cond = cond_expr.value;
cond = c_objc_common_truthvalue_conversion (cond_loc, cond);
cond = c_fully_fold (cond, false, NULL);
if (COMPARISON_CLASS_P (cond))
{
tree op0 = TREE_OPERAND (cond, 0), op1 = TREE_OPERAND (cond, 1);
op0 = c_fully_fold (op0, false, NULL);
op1 = c_fully_fold (op1, false, NULL);
TREE_OPERAND (cond, 0) = op0;
TREE_OPERAND (cond, 1) = op1;
}
switch (cond_expr.original_code)
{
case GT_EXPR:

8
libgomp/ChangeLog
View File

@ -1,3 +1,11 @@
2017-12-10 Tom de Vries <tom@codesourcery.com>
backport from trunk:
PR c/81875
2017-09-16 Tom de Vries <tom@codesourcery.com>
* testsuite/libgomp.c/pr81875.c: New test.
2017-09-15 Jakub Jelinek <jakub@redhat.com>
Backported from mainline

46
libgomp/testsuite/libgomp.c/pr81875.c Normal file
View File

@ -0,0 +1,46 @@
/* { dg-do run } */
extern
#ifdef __cplusplus
"C"
#endif
void abort (void);
#define N 32ULL
int a[N];
const unsigned long long c = 0x7fffffffffffffffULL;
void
f2_tpf_static32 (void)
{
unsigned long long i;
#pragma omp for
for (i = c + N; i > c; i -= 1ULL)
a[i - 1ULL - c] -= 4;
}
__attribute__((noinline, noclone)) int
test_tpf_static32 (void)
{
int i, j, k;
for (i = 0; i < N; i++)
a[i] = i - 25;
f2_tpf_static32 ();
for (i = 0; i < N; i++)
if (a[i] != i - 29)
return 1;
return 0;
}
int
main ()
{
if (test_tpf_static32 ())
abort ();
return 0;
}