diff --git a/.pick_status.json b/.pick_status.json
index 59651630e04..f6b602506c2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,7 @@
         "description": "nir: Fix MSVC warning C4334 (32bit shift cast to 64bit)",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/compiler/nir/nir_builtin_builder.c b/src/compiler/nir/nir_builtin_builder.c
index 7b2cca4f212..7118e1102ba 100644
--- a/src/compiler/nir/nir_builtin_builder.c
+++ b/src/compiler/nir/nir_builtin_builder.c
@@ -76,7 +76,7 @@ nir_nextafter(nir_builder *b, nir_ssa_def *x, nir_ssa_def *y)
    nir_ssa_def *conddir = nir_flt(b, x, y);
    nir_ssa_def *condzero = nir_feq(b, x, zero);
 
-   uint64_t sign_mask = 1 << (x->bit_size - 1);
+   uint64_t sign_mask = 1ull << (x->bit_size - 1);
    uint64_t min_abs = 1;
 
    if (nir_is_denorm_flush_to_zero(b->shader->info.float_controls_execution_mode, x->bit_size)) {
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c
index d26b13ea120..1969b09de47 100644
--- a/src/compiler/nir/nir_opt_copy_prop_vars.c
+++ b/src/compiler/nir/nir_opt_copy_prop_vars.c
@@ -108,7 +108,7 @@ static bool
 value_equals_store_src(struct value *value, nir_intrinsic_instr *intrin)
 {
    assert(intrin->intrinsic == nir_intrinsic_store_deref);
-   uintptr_t write_mask = nir_intrinsic_write_mask(intrin);
+   nir_component_mask_t write_mask = nir_intrinsic_write_mask(intrin);
 
    for (unsigned i = 0; i < intrin->num_components; i++) {
       if ((write_mask & (1 << i)) &&
diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c
index 1f6270233bf..3c73d342ca1 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c
@@ -1538,7 +1538,7 @@ ntt_emit_load_input(struct ntt_compile *c, nir_intrinsic_instr *instr)
           * emit the extra TGSI interp instruction, we can just read the
           * input.
           */
-         if (c->centroid_inputs & (1 << nir_intrinsic_base(instr))) {
+         if (c->centroid_inputs & (1ull << nir_intrinsic_base(instr))) {
             ntt_store(c, &instr->dest, input);
          } else {
             ureg_INTERP_CENTROID(c->ureg, ntt_get_dest(c, &instr->dest),
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 242a0e40fa6..c915eebb3e5 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -362,7 +362,7 @@ ttn_emit_declaration(struct ttn_compile *c)
             c->inputs[idx] = var;
 
             for (int i = 0; i < array_size; i++)
-               b->shader->info.inputs_read |= 1 << (var->data.location + i);
+               b->shader->info.inputs_read |= 1ull << (var->data.location + i);
 
             break;
          case TGSI_FILE_OUTPUT: {