diff options
| author | Tom de Vries <tom@codesourcery.com> | 2017-12-10 20:52:54 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2017-12-10 20:52:54 +0000 |
| commit | 3a15e0edf82b058e91b8bc74ae64dfa10dc6473a (patch) | |
| tree | 976acc4139d9cea08dd21aaa6d2fadd0ba144065 /gcc/c | |
| parent | 07f59edb304928ce26ade359105acbe8bfb79333 (diff) | |
| download | gcc-3a15e0edf82b058e91b8bc74ae64dfa10dc6473a.zip gcc-3a15e0edf82b058e91b8bc74ae64dfa10dc6473a.tar.gz gcc-3a15e0edf82b058e91b8bc74ae64dfa10dc6473a.tar.bz2 | |
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
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/c/c-parser.c | 9 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 20492cf..011a8a0 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -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 diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 988369e..101afb8 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -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: |