mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

spirv-tools: backport a fix for building with gcc-16

Browse Source 
Fixes:
https://errors.yoctoproject.org/Errors/Details/905195/
when building on host with gcc-16

(From OE-Core rev: 7df9bc5569cf5942bca56e86db5fa92b41a32a1b)

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4801e63d1284f3fa5006f0e24f560130c2a0a4c)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
Martin Jansa
2026-04-10 16:55:16 +02:00
committed by Paul Barker
parent 3eff1fd733
commit d6e1a6e317
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch
+50
View File
@@ -0,0 +1,50 @@
From aab5c96b7eb237b8bcd15e28f8aff068842db4b7 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
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 <jose.exposito89@gmail.com>
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
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.3.275.0.bb
+3 -1
View File
@@ -8,7 +8,9 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;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