diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 8e3c99ce98f..d75d161bc97 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -316,8 +316,7 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
    }
 
    st_set_prog_affected_state_flags(prog);
-
-   st_finalize_nir_before_variants(nir);
+   nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
 
    char *msg = NULL;
    if (st->allow_st_finalize_nir_twice) {
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 83093f10d4f..1d5b83b3270 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -346,12 +346,6 @@ st_release_program(struct st_context *st, struct gl_program **p)
    _mesa_reference_program(st->ctx, p, NULL);
 }
 
-void
-st_finalize_nir_before_variants(struct nir_shader *nir)
-{
-   nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
-}
-
 static void
 st_prog_to_nir_postprocess(struct st_context *st, nir_shader *nir,
                            struct gl_program *prog)
@@ -374,9 +368,9 @@ st_prog_to_nir_postprocess(struct st_context *st, nir_shader *nir,
    NIR_PASS(_, nir, nir_opt_constant_folding);
    gl_nir_opts(nir);
 
+   nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
    /* This must be done after optimizations to assign IO bases. */
    nir_recompute_io_bases(nir, nir_var_shader_in | nir_var_shader_out);
-   st_finalize_nir_before_variants(nir);
 
    if (st->allow_st_finalize_nir_twice) {
       st_serialize_base_nir(prog, nir);
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 7dbe8111456..0ee9c4e524d 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -359,9 +359,6 @@ st_release_program(struct st_context *st, struct gl_program **p);
 extern void
 st_destroy_program_variants(struct st_context *st);
 
-extern void
-st_finalize_nir_before_variants(struct nir_shader *nir);
-
 extern void
 st_prepare_vertex_program(struct gl_program *stvp);