spirv-tools: Remove default copy constructor in header

Fixes build with when clang libc++ runtime is used.

(From OE-Core rev: b92dfcb4b02f6f0971ff5f78b9c6ef4ab751e889)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2022-08-16 10:27:54 -07:00
committed by Richard Purdie
parent b00f391a1e
commit 37c4ec6028
2 changed files with 37 additions and 1 deletions

View File

@@ -0,0 +1,34 @@
From a90ccc240501bf3362b23f67771f65b7dec2ccf9 Mon Sep 17 00:00:00 2001
From: Jamie Madill <jmadill@chromium.org>
Date: Fri, 29 Jul 2022 14:26:37 -0400
Subject: [PATCH] Remove default copy constructor in header. (#4879)
A recent libc++ roll in Chrome warned of a deprecated copy. We're
still looking if this is a bug in libc++ or a valid warning, but
removing the redundant line is a safe workaround or fix in either
case.
See discussion in https://crrev.com/c/3791771
Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/pull/4879]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
source/opt/merge_return_pass.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h
index a35cf269..d15db2f6 100644
--- a/source/opt/merge_return_pass.h
+++ b/source/opt/merge_return_pass.h
@@ -118,8 +118,6 @@ class MergeReturnPass : public MemPass {
StructuredControlState(Instruction* break_merge, Instruction* merge)
: break_merge_(break_merge), current_merge_(merge) {}
- StructuredControlState(const StructuredControlState&) = default;
-
bool InBreakable() const { return break_merge_; }
bool InStructuredFlow() const { return CurrentMergeId() != 0; }
--
2.37.2

View File

@@ -8,7 +8,9 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRCREV = "c94501352d545e84c821ce031399e76d1af32d18"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \
file://0001-Remove-default-copy-constructor-in-header.-4879.patch \
"
PE = "1"
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"