diff --git a/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch b/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch index 01684c6b96..ce08d7e384 100644 --- a/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch +++ b/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 20:50:26 -0400 -Subject: [PATCH 01/29] Fix spelling/language errors +Subject: [PATCH 01/30] Fix spelling/language errors --- llvm/include/llvm/Support/ErrorHandling.h | 2 +- diff --git a/upstream_utils/llvm_patches/0002-Remove-StringRef-ArrayRef-and-Optional.patch b/upstream_utils/llvm_patches/0002-Remove-StringRef-ArrayRef-and-Optional.patch index 9a20b10ed7..4eea7fa92f 100644 --- a/upstream_utils/llvm_patches/0002-Remove-StringRef-ArrayRef-and-Optional.patch +++ b/upstream_utils/llvm_patches/0002-Remove-StringRef-ArrayRef-and-Optional.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:09:18 -0400 -Subject: [PATCH 02/29] Remove StringRef, ArrayRef, and Optional +Subject: [PATCH 02/30] Remove StringRef, ArrayRef, and Optional --- llvm/include/llvm/ADT/PointerUnion.h | 1 - diff --git a/upstream_utils/llvm_patches/0003-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch b/upstream_utils/llvm_patches/0003-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch index 5f28b5a5f6..14492dd1e0 100644 --- a/upstream_utils/llvm_patches/0003-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch +++ b/upstream_utils/llvm_patches/0003-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:12:41 -0400 -Subject: [PATCH 03/29] Wrap std::min/max calls in parens, for Windows warnings +Subject: [PATCH 03/30] Wrap std::min/max calls in parens, for Windows warnings --- llvm/include/llvm/ADT/DenseMap.h | 4 ++-- diff --git a/upstream_utils/llvm_patches/0004-Change-unique_function-storage-size.patch b/upstream_utils/llvm_patches/0004-Change-unique_function-storage-size.patch index a2895e2b45..28f8f35a49 100644 --- a/upstream_utils/llvm_patches/0004-Change-unique_function-storage-size.patch +++ b/upstream_utils/llvm_patches/0004-Change-unique_function-storage-size.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:13:55 -0400 -Subject: [PATCH 04/29] Change unique_function storage size +Subject: [PATCH 04/30] Change unique_function storage size --- llvm/include/llvm/ADT/FunctionExtras.h | 4 ++-- diff --git a/upstream_utils/llvm_patches/0005-Threading-updates.patch b/upstream_utils/llvm_patches/0005-Threading-updates.patch index 0a23b94131..70897fdcf0 100644 --- a/upstream_utils/llvm_patches/0005-Threading-updates.patch +++ b/upstream_utils/llvm_patches/0005-Threading-updates.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:17:19 -0400 -Subject: [PATCH 05/29] Threading updates +Subject: [PATCH 05/30] Threading updates - Remove guards for threads and exception - Prefer scope gaurd over lock gaurd diff --git a/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch b/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch index c44d5739b6..659b48653b 100644 --- a/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch +++ b/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:28:13 -0400 -Subject: [PATCH 06/29] \#ifdef guard safety +Subject: [PATCH 06/30] \#ifdef guard safety Prevents redefinition if someone is pulling in real LLVM, since the macros are in global namespace --- diff --git a/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch b/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch index ebf6383860..afb49ad5fd 100644 --- a/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch +++ b/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:37:34 -0400 -Subject: [PATCH 07/29] Explicitly use std:: +Subject: [PATCH 07/30] Explicitly use std:: --- llvm/include/llvm/ADT/SmallSet.h | 2 +- diff --git a/upstream_utils/llvm_patches/0008-Remove-format_provider.patch b/upstream_utils/llvm_patches/0008-Remove-format_provider.patch index 9e571fadce..6a77d840f5 100644 --- a/upstream_utils/llvm_patches/0008-Remove-format_provider.patch +++ b/upstream_utils/llvm_patches/0008-Remove-format_provider.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:53:50 -0400 -Subject: [PATCH 08/29] Remove format_provider +Subject: [PATCH 08/30] Remove format_provider --- llvm/include/llvm/Support/Chrono.h | 109 ------------------------ diff --git a/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch b/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch index 17c5ca645d..1c6fec2e0c 100644 --- a/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch +++ b/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 13:34:07 -0400 -Subject: [PATCH 09/29] Add compiler warning pragmas +Subject: [PATCH 09/30] Add compiler warning pragmas --- llvm/include/llvm/ADT/FunctionExtras.h | 11 +++++++++++ diff --git a/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch b/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch index 276095a2cb..a6b0f68e94 100644 --- a/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch +++ b/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 13:43:50 -0400 -Subject: [PATCH 10/29] Remove unused functions +Subject: [PATCH 10/30] Remove unused functions --- llvm/include/llvm/ADT/SmallString.h | 80 ------ diff --git a/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch b/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch index cd9aebd200..fd60e00ca1 100644 --- a/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch +++ b/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Thu, 5 May 2022 23:18:34 -0400 -Subject: [PATCH 11/29] Detemplatize SmallVectorBase +Subject: [PATCH 11/30] Detemplatize SmallVectorBase --- llvm/include/llvm/ADT/SmallVector.h | 21 +++++++----------- diff --git a/upstream_utils/llvm_patches/0012-Add-vectors-to-raw_ostream.patch b/upstream_utils/llvm_patches/0012-Add-vectors-to-raw_ostream.patch index 7eb3bc1614..52f261ce7a 100644 --- a/upstream_utils/llvm_patches/0012-Add-vectors-to-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0012-Add-vectors-to-raw_ostream.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 13:48:59 -0400 -Subject: [PATCH 12/29] Add vectors to raw_ostream +Subject: [PATCH 12/30] Add vectors to raw_ostream --- llvm/include/llvm/Support/raw_ostream.h | 115 ++++++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0013-Extra-collections-features.patch b/upstream_utils/llvm_patches/0013-Extra-collections-features.patch index b382882128..98e7f066bc 100644 --- a/upstream_utils/llvm_patches/0013-Extra-collections-features.patch +++ b/upstream_utils/llvm_patches/0013-Extra-collections-features.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 3 May 2022 22:16:10 -0400 -Subject: [PATCH 13/29] Extra collections features +Subject: [PATCH 13/30] Extra collections features --- llvm/include/llvm/ADT/StringMap.h | 103 +++++++++++++++++++++++++++++- diff --git a/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch b/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch index 4ce681f494..83bdd934de 100644 --- a/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch +++ b/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 4 May 2022 00:01:00 -0400 -Subject: [PATCH 14/29] EpochTracker ABI macro +Subject: [PATCH 14/30] EpochTracker ABI macro --- llvm/include/llvm/ADT/EpochTracker.h | 2 +- diff --git a/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch b/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch index 7002d4d550..e3d0377546 100644 --- a/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch +++ b/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Thu, 5 May 2022 18:09:45 -0400 -Subject: [PATCH 15/29] Delete numbers from MathExtras +Subject: [PATCH 15/30] Delete numbers from MathExtras --- llvm/include/llvm/Support/MathExtras.h | 36 -------------------------- diff --git a/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch b/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch index 6ac72ce51c..08ebb1d503 100644 --- a/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch +++ b/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 3 May 2022 22:50:24 -0400 -Subject: [PATCH 16/29] Add lerp and sgn +Subject: [PATCH 16/30] Add lerp and sgn --- llvm/include/llvm/Support/MathExtras.h | 20 ++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0017-Fixup-includes.patch b/upstream_utils/llvm_patches/0017-Fixup-includes.patch index c27473d65d..cf293c139d 100644 --- a/upstream_utils/llvm_patches/0017-Fixup-includes.patch +++ b/upstream_utils/llvm_patches/0017-Fixup-includes.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 16:38:11 -0400 -Subject: [PATCH 17/29] Fixup includes +Subject: [PATCH 17/30] Fixup includes --- llvm/include/llvm/ADT/StringMap.h | 4 ++++ diff --git a/upstream_utils/llvm_patches/0018-Use-std-is_trivially_copy_constructible.patch b/upstream_utils/llvm_patches/0018-Use-std-is_trivially_copy_constructible.patch index 6871467bc0..b67c4f3d1e 100644 --- a/upstream_utils/llvm_patches/0018-Use-std-is_trivially_copy_constructible.patch +++ b/upstream_utils/llvm_patches/0018-Use-std-is_trivially_copy_constructible.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 16:42:09 -0400 -Subject: [PATCH 18/29] Use std::is_trivially_copy_constructible +Subject: [PATCH 18/30] Use std::is_trivially_copy_constructible --- llvm/include/llvm/ADT/PointerIntPair.h | 12 ---- diff --git a/upstream_utils/llvm_patches/0019-Windows-support.patch b/upstream_utils/llvm_patches/0019-Windows-support.patch index cd3e65a946..14d9fc4da4 100644 --- a/upstream_utils/llvm_patches/0019-Windows-support.patch +++ b/upstream_utils/llvm_patches/0019-Windows-support.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 3 May 2022 20:22:38 -0400 -Subject: [PATCH 19/29] Windows support +Subject: [PATCH 19/30] Windows support --- .../llvm/Support/Windows/WindowsSupport.h | 45 +++++---- diff --git a/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch b/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch index 7b371ec1e9..ea7575c8e5 100644 --- a/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch +++ b/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 16:46:20 -0400 -Subject: [PATCH 20/29] Prefer fmtlib +Subject: [PATCH 20/30] Prefer fmtlib --- llvm/lib/Support/ErrorHandling.cpp | 20 ++++++-------------- diff --git a/upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch b/upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch index ff6cf8ba16..14093446d3 100644 --- a/upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch +++ b/upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 16:49:36 -0400 -Subject: [PATCH 21/29] Prefer wpi's fs.h +Subject: [PATCH 21/30] Prefer wpi's fs.h --- llvm/include/llvm/Support/raw_ostream.h | 7 ++----- diff --git a/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch b/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch index 8e59c27fce..5a42498772 100644 --- a/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch +++ b/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 19:16:51 -0400 -Subject: [PATCH 22/29] Remove unused functions +Subject: [PATCH 22/30] Remove unused functions --- llvm/include/llvm/Support/DJB.h | 3 - diff --git a/upstream_utils/llvm_patches/0023-OS-specific-changes.patch b/upstream_utils/llvm_patches/0023-OS-specific-changes.patch index a5f1a8843d..4ef327dccb 100644 --- a/upstream_utils/llvm_patches/0023-OS-specific-changes.patch +++ b/upstream_utils/llvm_patches/0023-OS-specific-changes.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 19:30:43 -0400 -Subject: [PATCH 23/29] OS-specific changes +Subject: [PATCH 23/30] OS-specific changes --- llvm/lib/Support/ErrorHandling.cpp | 13 +++++++------ diff --git a/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch b/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch index e3a7924295..2da05d94ff 100644 --- a/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch +++ b/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Mon, 9 May 2022 00:04:30 -0400 -Subject: [PATCH 24/29] Use SmallVector for UTF conversion +Subject: [PATCH 24/30] Use SmallVector for UTF conversion --- llvm/include/llvm/Support/ConvertUTF.h | 6 +++--- diff --git a/upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch b/upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch index 88ca3b0630..bfbe6b3bc8 100644 --- a/upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Thu, 19 May 2022 00:58:36 -0400 -Subject: [PATCH 25/29] Prefer to use static pointers in raw_ostream +Subject: [PATCH 25/30] Prefer to use static pointers in raw_ostream See #1401 --- diff --git a/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch b/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch index 0b7feb4b11..b342a27416 100644 --- a/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch +++ b/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Thu, 19 May 2022 01:12:41 -0400 -Subject: [PATCH 26/29] constexpr endian byte swap +Subject: [PATCH 26/30] constexpr endian byte swap --- llvm/include/llvm/Support/Endian.h | 4 +++- diff --git a/upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch b/upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch index 53872585c2..555fbd3ab7 100644 --- a/upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch +++ b/upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 10 Aug 2022 17:07:52 -0700 -Subject: [PATCH 27/29] Copy type traits from STLExtras.h into PointerUnion.h +Subject: [PATCH 27/30] Copy type traits from STLExtras.h into PointerUnion.h --- llvm/include/llvm/ADT/PointerUnion.h | 46 ++++++++++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0028-Remove-StringMap-test-for-llvm-sort.patch b/upstream_utils/llvm_patches/0028-Remove-StringMap-test-for-llvm-sort.patch index 526ab220ba..1cb9dc54b0 100644 --- a/upstream_utils/llvm_patches/0028-Remove-StringMap-test-for-llvm-sort.patch +++ b/upstream_utils/llvm_patches/0028-Remove-StringMap-test-for-llvm-sort.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 10 Aug 2022 22:35:00 -0700 -Subject: [PATCH 28/29] Remove StringMap test for llvm::sort() +Subject: [PATCH 28/30] Remove StringMap test for llvm::sort() --- llvm/unittests/ADT/StringMapTest.cpp | 14 -------------- diff --git a/upstream_utils/llvm_patches/0029-Fix-docs-typo-in-SmallVector.patch b/upstream_utils/llvm_patches/0029-Fix-docs-typo-in-SmallVector.patch index 0cdbe1d2ca..90e9bdebfb 100644 --- a/upstream_utils/llvm_patches/0029-Fix-docs-typo-in-SmallVector.patch +++ b/upstream_utils/llvm_patches/0029-Fix-docs-typo-in-SmallVector.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Thu, 8 Jun 2023 18:49:52 -0400 -Subject: [PATCH 29/29] Fix docs typo in SmallVector +Subject: [PATCH 29/30] Fix docs typo in SmallVector --- llvm/include/llvm/ADT/SmallVector.h | 2 +- diff --git a/upstream_utils/llvm_patches/0030-Unused-variable-in-release-mode.patch b/upstream_utils/llvm_patches/0030-Unused-variable-in-release-mode.patch new file mode 100644 index 0000000000..a22b54d33a --- /dev/null +++ b/upstream_utils/llvm_patches/0030-Unused-variable-in-release-mode.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Leander Schulten +Date: Mon, 10 Jul 2023 00:53:43 +0200 +Subject: [PATCH 30/30] Unused variable in release mode + +--- + llvm/include/llvm/ADT/DenseMap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h +index 975c3b97e2cbf09225299c421406ad2bbe4ef125..ada70d6c826d8f5bb65e502be15317692febb55c 100644 +--- a/llvm/include/llvm/ADT/DenseMap.h ++++ b/llvm/include/llvm/ADT/DenseMap.h +@@ -126,7 +126,7 @@ public: + for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) + P->getFirst() = EmptyKey; + } else { +- unsigned NumEntries = getNumEntries(); ++ [[maybe_unused]] unsigned NumEntries = getNumEntries(); + for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) { + if (!KeyInfoT::isEqual(P->getFirst(), EmptyKey)) { + if (!KeyInfoT::isEqual(P->getFirst(), TombstoneKey)) { diff --git a/upstream_utils/update_llvm.py b/upstream_utils/update_llvm.py index 5a6b7de35c..31a345befb 100755 --- a/upstream_utils/update_llvm.py +++ b/upstream_utils/update_llvm.py @@ -199,6 +199,7 @@ def main(): "0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch", "0028-Remove-StringMap-test-for-llvm-sort.patch", "0029-Fix-docs-typo-in-SmallVector.patch", + "0030-Unused-variable-in-release-mode.patch", ]: git_am( os.path.join(wpilib_root, "upstream_utils/llvm_patches", f), diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h index b1ffd436cb..4135bc3915 100644 --- a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h +++ b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h @@ -126,7 +126,7 @@ public: for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) P->getFirst() = EmptyKey; } else { - unsigned NumEntries = getNumEntries(); + [[maybe_unused]] unsigned NumEntries = getNumEntries(); for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) { if (!KeyInfoT::isEqual(P->getFirst(), EmptyKey)) { if (!KeyInfoT::isEqual(P->getFirst(), TombstoneKey)) {