diff --git a/src/panfrost/bifrost/bi_opt_constant_fold.c b/src/panfrost/bifrost/bi_opt_constant_fold.c
index bebf393bc24..bf174fbc05c 100644
--- a/src/panfrost/bifrost/bi_opt_constant_fold.c
+++ b/src/panfrost/bifrost/bi_opt_constant_fold.c
@@ -28,6 +28,15 @@
  * adding a new pattern here, check why you need it and whether we can avoid
  * generating the constant BIR at all. */
 
+static inline uint32_t
+bi_source_value(const bi_instr *I, unsigned s)
+{
+        if (s < I->nr_srcs)
+                return bi_apply_swizzle(I->src[s].value, I->src[s].swizzle);
+        else
+                return 0;
+}
+
 uint32_t
 bi_fold_constant(bi_instr *I, bool *unsupported)
 {
@@ -42,10 +51,10 @@ bi_fold_constant(bi_instr *I, bool *unsupported)
         }
 
         /* Grab the sources */
-        uint32_t a = bi_apply_swizzle(I->src[0].value, I->src[0].swizzle);
-        uint32_t b = bi_apply_swizzle(I->src[1].value, I->src[1].swizzle);
-        uint32_t c = bi_apply_swizzle(I->src[2].value, I->src[2].swizzle);
-        uint32_t d = bi_apply_swizzle(I->src[3].value, I->src[3].swizzle);
+        uint32_t a = bi_source_value(I, 0);
+        uint32_t b = bi_source_value(I, 1);
+        uint32_t c = bi_source_value(I, 2);
+        uint32_t d = bi_source_value(I, 3);
 
         /* Evaluate the instruction */
         switch (I->op) {
diff --git a/src/panfrost/bifrost/bi_opt_message_preload.c b/src/panfrost/bifrost/bi_opt_message_preload.c
index 87d70085508..c2d43a67836 100644
--- a/src/panfrost/bifrost/bi_opt_message_preload.c
+++ b/src/panfrost/bifrost/bi_opt_message_preload.c
@@ -137,7 +137,7 @@ bi_opt_message_preload(bi_context *ctx)
                  * moves are free.
                  */
                 b.cursor = bi_before_block(block);
-                for (unsigned i = 0; i < collect->nr_srcs; ++i) {
+                bi_foreach_src(collect, i) {
                         unsigned reg = (nr_preload * 4) + i;
 
                         collect->src[i] = bi_mov_i32(&b, bi_register(reg));
diff --git a/src/panfrost/bifrost/bi_opt_push_ubo.c b/src/panfrost/bifrost/bi_opt_push_ubo.c
index 8b00418206d..5d38cd081e9 100644
--- a/src/panfrost/bifrost/bi_opt_push_ubo.c
+++ b/src/panfrost/bifrost/bi_opt_push_ubo.c
@@ -163,7 +163,7 @@ bi_opt_push_ubo(bi_context *ctx)
                 bi_instr *vec = bi_collect_i32_to(&b, ins->dest[0]);
                 vec->nr_srcs = bi_opcode_props[ins->op].sr_count;
 
-                for (unsigned w = 0; w < vec->nr_srcs; ++w) {
+                bi_foreach_src(vec, w) {
                         /* FAU is grouped in pairs (2 x 4-byte) */
                         unsigned base =
                                 pan_lookup_pushed_ubo(ctx->info.push, ubo,
diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index ff42a0836c8..b3b6cbf5646 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -302,7 +302,7 @@ bi_get_src_slot(bi_registers *regs, unsigned reg)
 static inline enum bifrost_packed_src
 bi_get_src_new(bi_instr *ins, bi_registers *regs, unsigned s)
 {
-        if (!ins)
+        if (!ins || s >= ins->nr_srcs)
                 return 0;
 
         bi_index src = ins->src[s];
diff --git a/src/panfrost/bifrost/bi_ra.c b/src/panfrost/bifrost/bi_ra.c
index 86f00ea0d74..7fc6a44e469 100644
--- a/src/panfrost/bifrost/bi_ra.c
+++ b/src/panfrost/bifrost/bi_ra.c
@@ -728,7 +728,7 @@ bi_lower_vector(bi_context *ctx)
                         assert(dest.offset == 0);
                         assert((bi_is_ssa(dest) || I->nr_srcs == 1) && "nir_lower_phis_to_scalar");
 
-                        for (unsigned i = 0; i < I->nr_srcs; ++i) {
+                        bi_foreach_src(I, i) {
                                 if (bi_is_null(I->src[i]))
                                         continue;
 
@@ -764,14 +764,12 @@ bi_lower_vector(bi_context *ctx)
 static bool
 bi_is_tied(const bi_instr *I)
 {
-        if (bi_is_null(I->src[0]))
-                return false;
-
         return (I->op == BI_OPCODE_TEXC ||
                 I->op == BI_OPCODE_TEXC_DUAL ||
                 I->op == BI_OPCODE_ATOM_RETURN_I32 ||
                 I->op == BI_OPCODE_AXCHG_I32 ||
-                I->op == BI_OPCODE_ACMPXCHG_I32);
+                I->op == BI_OPCODE_ACMPXCHG_I32) &&
+                !bi_is_null(I->src[0]);
 }
 
 /*
diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/bifrost/bi_schedule.c
index 3f028608c40..a06b416b6ac 100644
--- a/src/panfrost/bifrost/bi_schedule.c
+++ b/src/panfrost/bifrost/bi_schedule.c
@@ -655,6 +655,7 @@ bi_reads_temps(bi_instr *ins, unsigned src)
 static bool
 bi_impacted_t_modifiers(bi_instr *I, unsigned src)
 {
+        assert(src < I->nr_srcs);
         enum bi_swizzle swizzle = I->src[src].swizzle;
 
         switch (I->op) {
@@ -881,6 +882,7 @@ bi_update_fau(struct bi_clause_state *clause,
 static bool
 bi_tuple_is_new_src(bi_instr *instr, struct bi_reg_state *reg, unsigned src_idx)
 {
+        assert(src_idx < instr->nr_srcs);
         bi_index src = instr->src[src_idx];
 
         /* Only consider sources which come from the register file */
@@ -1971,6 +1973,7 @@ bi_schedule_block(bi_context *ctx, bi_block *block)
 static bool
 bi_check_fau_src(bi_instr *ins, unsigned s, uint32_t *constants, unsigned *cwords, bi_index *fau)
 {
+        assert(s < ins->nr_srcs);
         bi_index src = ins->src[s];
 
         /* Staging registers can't have FAU accesses */
diff --git a/src/panfrost/bifrost/bi_scoreboard.c b/src/panfrost/bifrost/bi_scoreboard.c
index b10304019ca..04aa07b0c1f 100644
--- a/src/panfrost/bifrost/bi_scoreboard.c
+++ b/src/panfrost/bifrost/bi_scoreboard.c
@@ -153,7 +153,7 @@ bi_write_mask(bi_instr *I)
          * Obscurely, ATOM_CX is sr_write but can ignore the staging register in
          * certain circumstances; this does not require consideration.
          */
-        if (bi_opcode_props[I->op].sr_write && I->nr_dests &&
+        if (bi_opcode_props[I->op].sr_write && I->nr_dests && I->nr_srcs &&
             bi_is_null(I->dest[0]) && !bi_is_null(I->src[0])) {
 
                 unsigned reg = I->src[0].value;
diff --git a/src/panfrost/bifrost/valhall/va_optimize.c b/src/panfrost/bifrost/valhall/va_optimize.c
index 6a2c036ba28..06711872584 100644
--- a/src/panfrost/bifrost/valhall/va_optimize.c
+++ b/src/panfrost/bifrost/valhall/va_optimize.c
@@ -44,6 +44,8 @@ va_op_add_imm(enum bi_opcode op)
 static bool
 va_is_add_imm(bi_instr *I, unsigned s)
 {
+   assert(s < I->nr_srcs);
+
    return I->src[s].swizzle == BI_SWIZZLE_H01 &&
           !I->src[s].abs && !I->src[s].neg && !I->clamp && !I->round;
 }
@@ -63,6 +65,8 @@ va_choose_imm(bi_instr *I)
 static void
 va_lower_mov_imm(bi_instr *I)
 {
+   assert(I->nr_srcs == 1);
+
    if (I->src[0].type == BI_INDEX_CONSTANT) {
       I->op = BI_OPCODE_IADD_IMM_I32;
       I->index = I->src[0].value;