From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 9 Feb 2017 15:17:55 +0000 (+0100)
Subject: omp-offload.c (oacc_loop_auto_partitions): Use || instead of | to avoid warning.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=891ba5eb6d5df2674a79114a0645d3a467987eb0;p=gcc.git

omp-offload.c (oacc_loop_auto_partitions): Use || instead of | to avoid warning.

	* omp-offload.c (oacc_loop_auto_partitions): Use || instead of |
	to avoid warning.

From-SVN: r245306
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 416961b6321..863678a195e 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 6fbe4ff753a..11696b86c72 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.  */