diff --git a/.pick_status.json b/.pick_status.json
index cc6a58d9158..d195c8c6255 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3091,7 +3091,7 @@
         "description": "nir: fix nir_ishl_imm",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e227bb9fd58268788a79449ed247311744210279"
     },
diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h
index d954cb98803..359684d10d6 100644
--- a/src/compiler/nir/nir_builder.h
+++ b/src/compiler/nir/nir_builder.h
@@ -838,9 +838,8 @@ nir_ishl_imm(nir_builder *build, nir_ssa_def *x, uint32_t y)
 {
    if (y == 0) {
       return x;
-   } else if (y >= x->bit_size) {
-      return nir_imm_intN_t(build, 0, x->bit_size);
    } else {
+      assert (y < x->bit_size);
       return nir_ishl(build, x, nir_imm_int(build, y));
    }
 }