diff mbox series

[05/30] spirv-tools: upgrade 1.4.341.0 -> 1.4.350.0

Message ID 20260616191628.2014553-5-alex.kanavin@gmail.com
State New
Headers show
Series [01/30] gstreamer1.0: disable an intermittently failing test | expand

Commit Message

Alexander Kanavin June 16, 2026, 7:16 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...sue-with-gcc-16-replaeces-PR-6542-65.patch | 50 -------------------
 ..._1.4.341.0.bb => spirv-tools_1.4.350.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch
 rename meta/recipes-graphics/spir/{spirv-tools_1.4.341.0.bb => spirv-tools_1.4.350.0.bb} (93%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch b/meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch
deleted file mode 100644
index ce58b6b8c0..0000000000
--- a/meta/recipes-graphics/spir/spirv-tools/0001-opt-Fix-build-issue-with-gcc-16-replaeces-PR-6542-65.patch
+++ /dev/null
@@ -1,50 +0,0 @@ 
-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);
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.4.341.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.4.350.0.bb
similarity index 93%
rename from meta/recipes-graphics/spir/spirv-tools_1.4.341.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.4.350.0.bb
index 5e7167ebe8..b7ae50764b 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.4.341.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.4.350.0.bb
@@ -7,9 +7,8 @@  SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "fbe4f3ad913c44fe8700545f8ffe35d1382b7093"
+SRCREV = "0539c81f69a3daeb706fd3477dca61435b475156"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https;tag=vulkan-sdk-${PV} \
-    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: