diff --git a/.pick_status.json b/.pick_status.json
index 43846d4767a..be7ed2da4be 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -634,7 +634,7 @@
         "description": "nir/builder: Fix compilation with gcc-13 when tsan is enabled",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4a4e1757381c65653fd6a81cf4e969ddff926ed5",
         "notes": null
diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h
index 475aac42c7c..9e88b78b9fb 100644
--- a/src/compiler/nir/nir_builder.h
+++ b/src/compiler/nir/nir_builder.h
@@ -1604,6 +1604,7 @@ nir_build_deref_follower(nir_builder *b, nir_deref_instr *parent,
    default:
       unreachable("Invalid deref instruction type");
    }
+   return NULL;
 }
 
 static inline nir_def *