diff --git a/.pick_status.json b/.pick_status.json
index 5dfde9de4f4..1f4a6fe1c8a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -644,7 +644,7 @@
         "description": "nir/lower_int64: Fix compilation with gcc-13 and tsan enabled",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "bf7a11424650af2ac9e8f546741fb6ab2ed3b8d7",
         "notes": null
diff --git a/src/compiler/nir/nir_lower_int64.c b/src/compiler/nir/nir_lower_int64.c
index fdd578bf0a7..9f805a95a9c 100644
--- a/src/compiler/nir/nir_lower_int64.c
+++ b/src/compiler/nir/nir_lower_int64.c
@@ -1344,6 +1344,7 @@ lower_int64_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin)
    default:
       unreachable("Unsupported intrinsic");
    }
+   return NULL;
 }
 
 static bool