spirv-tools: backport a fix for building with gcc-16
PATCH 1/1 spirv-tools: backport a fix for building with gcc-16
From: Martin Jansa <[email protected]>
Fixes:
https://errors.yoctoproject.org/Errors/Details/905195/
when building on host with gcc-16
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Mathieu Dubois-Briand <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
--- ...sue-with-gcc-16-replaeces-PR-6542-65.patch | 50 +++++++++++++++++++ .../spir/spirv-tools_1.4.328.1.bb | 3 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch
meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch new file +50 -0
@@ -0,0 +1,50 @@ +From aab5c96b7eb237b8bcd15e28f8aff068842db4b7 Mon Sep 17 00:00:00 2001 +From: David Neto <[email protected]> +Date: Tue, 3 Mar 2026 12:11:47 -0500 +Subject: [PATCH] opt: Fix build issue with gcc 16 (replaeces PR #6542) + (#6567) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compiling with gcc 16 throws this error: + +FAILED: [code=1] +source/opt/CMakeFiles/SPIRV-Tools-opt.dir/decoration_manager.cpp.o + source/opt/decoration_manager.cpp: In member function +‘spvtools::opt::analysis::DecorationManager::CloneDecorations(unsigned +int, unsigned int)’: + source/opt/decoration_manager.cpp:546:27: error: +‘MEM[(unsigned int &)&op + 24]’ may be used uninitialized +[-Werror=maybe-uninitialized] + +546 | if (op.words[0] == from) { // add new pair of operands: (to, +literal) + source/opt/decoration_manager.cpp:545:19: note: ‘op’ declared here + 545 | Operand op = inst->GetOperand(i); + | ^~ + cc1plus: all warnings being treated as errors + +Make sure that the vector is not empty before using it. + +Co-authored-by: José Expósito <[email protected]> +Signed-off-by: Martin Jansa <[email protected]> +Upstream-Status: Backport [c28f5937bce369dde1d645299a8c9873da43dc72] +--- + source/opt/decoration_manager.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/source/opt/decoration_manager.cpp b/source/opt/decoration_manager.cpp +index 3e95dbc35..bee7d9482 100644 +--- a/source/opt/decoration_manager.cpp ++++ b/source/opt/decoration_manager.cpp +@@ -543,7 +543,8 @@ void DecorationManager::CloneDecorations(uint32_t from, uint32_t to) { + const uint32_t num_operands = inst->NumOperands(); + for (uint32_t i = 1; i < num_operands; i += 2) { + Operand op = inst->GetOperand(i); +- if (op.words[0] == from) { // add new pair of operands: (to, literal) ++ if (!op.words.empty() && ++ op.words[0] == from) { // add new pair of operands: (to, literal) + inst->AddOperand( + Operand(spv_operand_type_t::SPV_OPERAND_TYPE_ID, {to})); + op = inst->GetOperand(i + 1);
meta/recipes-graphics/spir/spirv-tools_1.4.328.1.bb +2 -1
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "7f2d9ee926f98fc77a3ed1e1e0f113b8c9c49458" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=vulkan-sdk-1.4.328;protocol=https \ - " + file://0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch \ +" PE = "1" # These recipes need to be updated in lockstep with each other: # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools