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