diff --git a/src/compiler/nir/nir_gather_xfb_info.c b/src/compiler/nir/nir_gather_xfb_info.c
index 96f0ece5e75..176bf899003 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 c795efbca6a..8f4e971b89a 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) ||