diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/omp-offload.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 416961b..863678a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2017-02-09 Jakub Jelinek <jakub@redhat.com> + * omp-offload.c (oacc_loop_auto_partitions): Use || instead of | + to avoid warning. + PR c/79413 * gimplify.h (is_gimple_sizepos): Only test for INTEGER_CST constants, not arbitrary TREE_CONSTANT. diff --git a/gcc/omp-offload.c b/gcc/omp-offload.c index 6fbe4ff..11696b8 100644 --- a/gcc/omp-offload.c +++ b/gcc/omp-offload.c @@ -1252,7 +1252,7 @@ oacc_loop_auto_partitions (oacc_loop *loop, unsigned outer_mask, noisy = false; #endif - if (assign && (!outer_assign | loop->inner)) + if (assign && (!outer_assign || loop->inner)) { /* Allocate outermost and non-innermost loops at the outermost non-innermost available level. */ |