diff --git a/.pick_status.json b/.pick_status.json
index 464fec27fd9..48a83c743b9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3434,7 +3434,7 @@
         "description": "aco/isel: fix output args init stack buffer overflow",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "eb249bb18e250dca198332def96a1ad921cfd77b",
         "notes": null
diff --git a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp
index d351dccf21d..cf484dd3747 100644
--- a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp
+++ b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp
@@ -696,7 +696,7 @@ init_context(isel_context* ctx, nir_shader* shader)
                                       (uint8_t*)shader->constant_data,
                                       (uint8_t*)shader->constant_data + shader->constant_data_size);
 
-   BITSET_CLEAR_RANGE(ctx->output_args, 0, BITSET_SIZE(ctx->output_args));
+   BITSET_ZERO(ctx->output_args);
 }
 
 void