From b728809a02fef76ee32c9180c895a78aa07a5836 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Mon, 29 Jan 2024 21:35:24 +0100 Subject: [PATCH] nir/builder: Fix compilation with gcc-13 when tsan is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/compiler/nir/nir_builder.h: In function ‘nir_build_deref_follower’: ../src/compiler/nir/nir_builder.h:1607:1: error: control reaches end of non-void function [-Werror=return-type] 1607 | } Fixes: 4a4e1757381c65653fd6a81cf4e969ddff926ed5 nir: Support deref instructions in lower_var_copies Signed-off-by: Gert Wollny Part-of: (cherry picked from commit 0ab3b3c641fa67f1f538c3b9e21f6a1dcb802081) --- .pick_status.json | 2 +- src/compiler/nir/nir_builder.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 *