diff --git a/src/gallium/drivers/d3d12/d3d12_compiler.cpp b/src/gallium/drivers/d3d12/d3d12_compiler.cpp
index 73b9a79e065..6682096458e 100644
--- a/src/gallium/drivers/d3d12/d3d12_compiler.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_compiler.cpp
@@ -268,32 +268,30 @@ missing_dual_src_outputs(struct d3d12_context *ctx)
    const nir_shader *s = fs->initial;
 
    unsigned indices_seen = 0;
-   nir_foreach_function(function, s) {
-      if (function->impl) {
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr(instr, block) {
-               if (instr->type != nir_instr_type_intrinsic)
-                  continue;
+   nir_foreach_function_impl(impl, s) {
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr(instr, block) {
+            if (instr->type != nir_instr_type_intrinsic)
+               continue;
 
-               nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-               if (intr->intrinsic != nir_intrinsic_store_deref)
-                  continue;
+            nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+            if (intr->intrinsic != nir_intrinsic_store_deref)
+               continue;
 
-               nir_variable *var = nir_intrinsic_get_var(intr, 0);
-               if (var->data.mode != nir_var_shader_out)
-                  continue;
+            nir_variable *var = nir_intrinsic_get_var(intr, 0);
+            if (var->data.mode != nir_var_shader_out)
+               continue;
 
-               unsigned index = var->data.index;
-               if (var->data.location > FRAG_RESULT_DATA0)
-                  index = var->data.location - FRAG_RESULT_DATA0;
-               else if (var->data.location != FRAG_RESULT_COLOR &&
-                        var->data.location != FRAG_RESULT_DATA0)
-                  continue;
+            unsigned index = var->data.index;
+            if (var->data.location > FRAG_RESULT_DATA0)
+               index = var->data.location - FRAG_RESULT_DATA0;
+            else if (var->data.location != FRAG_RESULT_COLOR &&
+                     var->data.location != FRAG_RESULT_DATA0)
+               continue;
 
-               indices_seen |= 1u << index;
-               if ((indices_seen & 3) == 3)
-                  return 0;
-            }
+            indices_seen |= 1u << index;
+            if ((indices_seen & 3) == 3)
+               return 0;
          }
       }
    }
@@ -1425,8 +1423,8 @@ static unsigned
 scan_texture_use(nir_shader *nir)
 {
    unsigned result = 0;
-   nir_foreach_function(func, nir) {
-      nir_foreach_block(block, func->impl) {
+   nir_foreach_function_impl(impl, nir) {
+      nir_foreach_block(block, impl) {
          nir_foreach_instr(instr, block) {
             if (instr->type == nir_instr_type_tex) {
                auto tex = nir_instr_as_tex(instr);
diff --git a/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c b/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c
index b3f9693a0ec..d871916bdac 100644
--- a/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c
+++ b/src/gallium/drivers/d3d12/d3d12_lower_point_sprite.c
@@ -285,21 +285,19 @@ d3d12_lower_point_sprite(nir_shader *shader,
                                      next_inputs_read);
    }
 
-   nir_foreach_function(function, shader) {
-      if (function->impl) {
-         nir_builder builder = nir_builder_create(function->impl);
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               if (instr->type == nir_instr_type_intrinsic)
-                  progress |= lower_instr(nir_instr_as_intrinsic(instr),
-                                          &builder,
-                                          &state);
-            }
+   nir_foreach_function_impl(impl, shader) {
+      nir_builder builder = nir_builder_create(impl);
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            if (instr->type == nir_instr_type_intrinsic)
+               progress |= lower_instr(nir_instr_as_intrinsic(instr),
+                                       &builder,
+                                       &state);
          }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 
    shader->info.gs.output_primitive = GL_TRIANGLE_STRIP;
diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
index 70ee70adbb6..5e4c7332d46 100644
--- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c
+++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
@@ -92,19 +92,17 @@ d3d12_lower_yflip(nir_shader *nir)
        nir->info.stage != MESA_SHADER_GEOMETRY)
       return;
 
-   nir_foreach_function(function, nir) {
-      if (function->impl) {
-         nir_builder b = nir_builder_create(function->impl);
+   nir_foreach_function_impl(impl, nir) {
+      nir_builder b = nir_builder_create(impl);
 
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               lower_pos_write(&b, instr, &flip);
-            }
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            lower_pos_write(&b, instr, &flip);
          }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 }
 
@@ -149,19 +147,17 @@ d3d12_lower_depth_range(nir_shader *nir)
 {
    assert(nir->info.stage == MESA_SHADER_FRAGMENT);
    nir_variable *depth_transform = NULL;
-   nir_foreach_function(function, nir) {
-      if (function->impl) {
-         nir_builder b = nir_builder_create(function->impl);
+   nir_foreach_function_impl(impl, nir) {
+      nir_builder b = nir_builder_create(impl);
 
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               lower_pos_read(&b, instr, &depth_transform);
-            }
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            lower_pos_read(&b, instr, &depth_transform);
          }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 }
 
@@ -245,19 +241,17 @@ d3d12_lower_uint_cast(nir_shader *nir, bool is_signed)
    if (nir->info.stage != MESA_SHADER_FRAGMENT)
       return;
 
-   nir_foreach_function(function, nir) {
-      if (function->impl) {
-         nir_builder b = nir_builder_create(function->impl);
+   nir_foreach_function_impl(impl, nir) {
+      nir_builder b = nir_builder_create(impl);
 
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               lower_uint_color_write(&b, instr, is_signed);
-            }
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            lower_uint_color_write(&b, instr, is_signed);
          }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 }
 
@@ -414,24 +408,22 @@ d3d12_nir_invert_depth(nir_shader *shader, unsigned viewport_mask, bool clip_hal
       return;
 
    struct invert_depth_state state = { viewport_mask, clip_halfz };
-   nir_foreach_function(function, shader) {
-      if (function->impl) {
-         nir_builder b = nir_builder_create(function->impl);
+   nir_foreach_function_impl(impl, shader) {
+      nir_builder b = nir_builder_create(impl);
 
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               invert_depth_instr(&b, instr, &state);
-            }
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            invert_depth_instr(&b, instr, &state);
          }
-
-         if (state.store_pos_instr) {
-            b.cursor = nir_after_block(function->impl->end_block);
-            invert_depth_impl(&b, &state);
-         }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      if (state.store_pos_instr) {
+         b.cursor = nir_after_block(impl->end_block);
+         invert_depth_impl(&b, &state);
+      }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 }
 
@@ -535,22 +527,20 @@ d3d12_lower_state_vars(nir_shader *nir, struct d3d12_shader *shader)
       }
    }
 
-   nir_foreach_function(function, nir) {
-      if (function->impl) {
-         nir_builder builder = nir_builder_create(function->impl);
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               if (instr->type == nir_instr_type_intrinsic)
-                  progress |= lower_instr(nir_instr_as_intrinsic(instr),
-                                          &builder,
-                                          shader,
-                                          binding);
-            }
+   nir_foreach_function_impl(impl, nir) {
+      nir_builder builder = nir_builder_create(impl);
+      nir_foreach_block(block, impl) {
+         nir_foreach_instr_safe(instr, block) {
+            if (instr->type == nir_instr_type_intrinsic)
+               progress |= lower_instr(nir_instr_as_intrinsic(instr),
+                                       &builder,
+                                       shader,
+                                       binding);
          }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
       }
+
+      nir_metadata_preserve(impl, nir_metadata_block_index |
+                                  nir_metadata_dominance);
    }
 
    if (progress) {
@@ -1008,13 +998,10 @@ d3d12_write_0_to_new_varying(nir_shader *s, nir_variable *var)
    if (s->info.stage == MESA_SHADER_TESS_CTRL && !var->data.patch)
       return;
 
-   nir_foreach_function(func, s) {
-      if (!func->impl)
-         continue;
+   nir_foreach_function_impl(impl, s) {
+      nir_builder b = nir_builder_create(impl);
 
-      nir_builder b = nir_builder_create(func->impl);
-
-      nir_foreach_block(block, func->impl) {
+      nir_foreach_block(block, impl) {
          b.cursor = nir_before_block(block);
          if (s->info.stage != MESA_SHADER_GEOMETRY) {
             write_0(&b, nir_build_deref_var(&b, var));
@@ -1033,6 +1020,6 @@ d3d12_write_0_to_new_varying(nir_shader *s, nir_variable *var)
          }
       }
 
-      nir_metadata_preserve(func->impl, nir_metadata_block_index | nir_metadata_dominance);
+      nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance);
    }
 }