From 195d9ffdf243d912e67cd978112243f4d1cd337d Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sun, 10 Dec 2017 21:37:08 +0000 Subject: [PATCH] Backport "Fix condition folding in c_parser_omp_for_loop" 2017-12-10 Tom de Vries backport from trunk: 2017-09-16 Tom de Vries 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: r255532 --- gcc/c/ChangeLog | 9 ++++++ gcc/c/c-parser.c | 9 +++++- libgomp/ChangeLog | 8 +++++ libgomp/testsuite/libgomp.c/pr81875.c | 46 +++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 libgomp/testsuite/libgomp.c/pr81875.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index ee10fbeb25fb..1a9c04045a6f 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,12 @@ +2017-12-10 Tom de Vries + + backport from trunk: + PR c/81875 + 2017-09-16 Tom de Vries + + * c-parser.c (c_parser_omp_for_loop): Fold only operands of cond, not + cond itself. + 2017-07-04 Release Manager * GCC 6.4.0 released. diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 4044bb58c876..fc20bad8d992 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -14767,7 +14767,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: diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a8db5f768343..a5e99d38a5ef 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2017-12-10 Tom de Vries + + backport from trunk: + PR c/81875 + 2017-09-16 Tom de Vries + + * testsuite/libgomp.c/pr81875.c: New test. + 2017-09-15 Jakub Jelinek Backported from mainline diff --git a/libgomp/testsuite/libgomp.c/pr81875.c b/libgomp/testsuite/libgomp.c/pr81875.c new file mode 100644 index 000000000000..3067d49a492c --- /dev/null +++ b/libgomp/testsuite/libgomp.c/pr81875.c @@ -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; +} -- 2.47.2