diff --git a/.pick_status.json b/.pick_status.json
index 35b9d55b1e6..9ba809bbcc6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1234,7 +1234,7 @@
         "description": "nir: Use STACK_ARRAY instead of NIR_VLA",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c11833ab24dcba26de1b0a5805e35a5d6761514e",
         "notes": null
diff --git a/src/compiler/nir/nir_functions.c b/src/compiler/nir/nir_functions.c
index 5d5f66293be..d4b3e652f1c 100644
--- a/src/compiler/nir/nir_functions.c
+++ b/src/compiler/nir/nir_functions.c
@@ -22,10 +22,10 @@
  */
 
 #include "util/u_printf.h"
+#include "util/stack_array.h"
 #include "nir.h"
 #include "nir_builder.h"
 #include "nir_control_flow.h"
-#include "nir_vla.h"
 
 /*
  * TODO: write a proper inliner for GPUs.
@@ -240,12 +240,13 @@ inline_functions_pass(nir_builder *b,
     * to an SSA value first.
     */
    const unsigned num_params = call->num_params;
-   NIR_VLA(nir_def *, params, num_params);
+   STACK_ARRAY(nir_def *, params, num_params);
    for (unsigned i = 0; i < num_params; i++) {
       params[i] = call->params[i].ssa;
    }
 
    nir_inline_function_impl(b, call->callee->impl, params, NULL);
+   STACK_ARRAY_FINISH(params);
    return true;
 }