[Mesa-dev] [PATCH 1/2] nir: Add missing parentheses

Alyssa Rosenzweig alyssa at rosenzweig.io
Tue Mar 12 02:30:50 UTC 2019


Fixes a gcc warning (and a theoretical NULL dereference error, though I
suppose shortcircuiting avoids that).

Signed-off-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>
---
 src/compiler/nir/nir_loop_analyze.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_loop_analyze.c b/src/compiler/nir/nir_loop_analyze.c
index bc116f4d1d7..c8304611b28 100644
--- a/src/compiler/nir/nir_loop_analyze.c
+++ b/src/compiler/nir/nir_loop_analyze.c
@@ -843,7 +843,7 @@ try_find_trip_count_vars_in_iand(nir_alu_instr **alu,
    }
 
    /* Try the other iand src if needed */
-   if (*ind == NULL || *ind && (*ind)->type != basic_induction ||
+   if (*ind == NULL || (*ind && (*ind)->type != basic_induction) ||
        !is_var_constant(*limit)) {
       src = iand->src[1].src.ssa;
       if (src->parent_instr->type == nir_instr_type_alu) {
-- 
2.20.1



More information about the mesa-dev mailing list