From 79ab2c3e5764f6ac5e20338dc2c6c750eed9abd2 Mon Sep 17 00:00:00 2001
From: Andrii Simiklit <andrii.simiklit@globallogic.com>
Date: Mon, 22 Jul 2019 18:00:34 +0300
Subject: [PATCH] nir: use | instead of || operator

warning: use of logical '||' with constant operand
note: use '|' for a bitwise operation

Fixes: 758fdce9fee ("nir: Add some generic helpers for writing lowering passes")
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Signed-off-by: Andrii Simiklit <andrii.simiklit@globallogic.com>
---
 src/compiler/nir/nir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index e09cb71bb35..0e2face3109 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -1838,7 +1838,7 @@ nir_function_impl_lower_instructions(nir_function_impl *impl,
    nir_builder b;
    nir_builder_init(&b, impl);
 
-   nir_metadata preserved = nir_metadata_block_index ||
+   nir_metadata preserved = nir_metadata_block_index |
                             nir_metadata_dominance;
 
    bool progress = false;
-- 
2.30.2