From 3bd66758f52de9a65612dcb8ca0992b55e8071c3 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Mon, 29 Jan 2024 21:28:17 +0100 Subject: [PATCH] nir/lower_int64: Fix compilation with gcc-13 and tsan enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/compiler/nir/nir_lower_int64.c: In function ‘lower_int64_intrinsic’: ../src/compiler/nir/nir_lower_int64.c:1347:1: error: control reaches end of non-void function [-Werror=return-type] 1347 | } Fixes: bf7a11424650af2ac9e8f546741fb6ab2ed3b8d7 nir/lower_int64: Add lowering for some 64-bit subgroup ops Signed-off-by: Gert Wollny Part-of: (cherry picked from commit 80a1b91601172be9c13d5f3ef63f126ecdaa1c15) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_int64.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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