From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 14 Feb 2019 20:33:34 +0000 (-0600)
Subject: nir: Silence a couple of warnings in release builds
X-Git-Tag: upstream/19.3.0~9808
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b14d7a6b6098f9fdb317f5f647543e5de2550c22;p=platform%2Fupstream%2Fmesa.git

nir: Silence a couple of warnings in release builds

[28/716] Compiling C object 'src/compiler/nir/068b2c8@@nir@sta/nir_gather_xfb_info.c.o'.
../src/compiler/nir/nir_gather_xfb_info.c: In function ‘nir_gather_xfb_info’:
../src/compiler/nir/nir_gather_xfb_info.c:171:13: warning: variable ‘max_offset’ set but not used [-Wunused-but-set-variable]
    unsigned max_offset[NIR_MAX_XFB_BUFFERS] = {0};
             ^~~~~~~~~~
[36/716] Compiling C object 'src/compiler/nir/068b2c8@@nir@sta/nir_instr_set.c.o'.
../src/compiler/nir/nir_instr_set.c:502:1: warning: ‘instr_each_src_and_dest_is_ssa’ defined but not used [-Wunused-function]
 instr_each_src_and_dest_is_ssa(nir_instr *instr)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
---

diff --git a/src/compiler/nir/nir_gather_xfb_info.c b/src/compiler/nir/nir_gather_xfb_info.c
index 96f0ece..176bf89 100644
--- a/src/compiler/nir/nir_gather_xfb_info.c
+++ b/src/compiler/nir/nir_gather_xfb_info.c
@@ -167,6 +167,7 @@ nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx)
    qsort(xfb->outputs, xfb->output_count, sizeof(xfb->outputs[0]),
          compare_xfb_output_offsets);
 
+#ifndef NDEBUG
    /* Finally, do a sanity check */
    unsigned max_offset[NIR_MAX_XFB_BUFFERS] = {0};
    for (unsigned i = 0; i < xfb->output_count; i++) {
@@ -175,6 +176,7 @@ nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx)
       unsigned slots = util_bitcount(xfb->outputs[i].component_mask);
       max_offset[xfb->outputs[i].buffer] = xfb->outputs[i].offset + slots * 4;
    }
+#endif
 
    return xfb;
 }
diff --git a/src/compiler/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c
index c795efb..8f4e971 100644
--- a/src/compiler/nir/nir_instr_set.c
+++ b/src/compiler/nir/nir_instr_set.c
@@ -498,7 +498,7 @@ dest_is_ssa(nir_dest *dest, void *data)
    return dest->is_ssa;
 }
 
-static bool
+static inline bool
 instr_each_src_and_dest_is_ssa(nir_instr *instr)
 {
    if (!nir_foreach_dest(instr, dest_is_ssa, NULL) ||