From ccb326675337071a329968b55723d4ab716ce1ec Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 3 Jan 2026 16:31:26 -0500 Subject: [PATCH] [upstream_utils] Remove patch that results in building with NDEBUG causing ODR issues (#8540) --- ...move-StringRef-ArrayRef-and-Optional.patch | 2 +- ...-calls-in-parens-for-Windows-warning.patch | 2 +- ...-Change-unique_function-storage-size.patch | 2 +- .../llvm_patches/0004-Threading-updates.patch | 2 +- .../0005-ifdef-guard-safety.patch | 2 +- .../0006-Explicitly-use-std.patch | 2 +- .../0007-Remove-format_provider.patch | 2 +- .../0008-Add-compiler-warning-pragmas.patch | 2 +- .../0009-Remove-unused-functions.patch | 2 +- .../0010-Detemplatize-SmallVectorBase.patch | 2 +- .../0011-Add-vectors-to-raw_ostream.patch | 2 +- .../0012-Extra-collections-features.patch | 2 +- ...0013-Delete-numbers-from-MathExtras.patch} | 2 +- .../0013-EpochTracker-ABI-macro.patch | 22 ------------------- ...-sgn.patch => 0014-Add-lerp-and-sgn.patch} | 2 +- ...cludes.patch => 0015-Fixup-includes.patch} | 2 +- ...std-is_trivially_copy_constructible.patch} | 2 +- ...pport.patch => 0017-Windows-support.patch} | 2 +- ...8-Remove-call-to-RtlGetLastNtStatus.patch} | 2 +- ...-fmtlib.patch => 0019-Prefer-fmtlib.patch} | 2 +- ...s.h.patch => 0020-Prefer-wpi-s-fs.h.patch} | 2 +- ...tch => 0021-Remove-unused-functions.patch} | 2 +- ...s.patch => 0022-OS-specific-changes.patch} | 2 +- ...-Use-SmallVector-for-UTF-conversion.patch} | 2 +- ...-use-static-pointers-in-raw_ostream.patch} | 2 +- ... => 0025-constexpr-endian-byte-swap.patch} | 2 +- ...from-STLExtras.h-into-PointerUnion..patch} | 2 +- ...027-Unused-variable-in-release-mode.patch} | 2 +- ...r.patch => 0028-Use-C-20-bit-header.patch} | 2 +- ...-Remove-DenseMap-GTest-printer-test.patch} | 2 +- ...raw_ostream-Add-SetNumBytesInBuffer.patch} | 2 +- ...aw_ostream-Replace-errnoAsErrorCode.patch} | 2 +- ...0032-type_traits.h-Add-is_constexpr.patch} | 2 +- ...ve-auto-conversion-from-raw_ostream.patch} | 2 +- ...ch => 0034-Add-SmallVector-erase_if.patch} | 2 +- ...-Fix-AlignedCharArrayUnion-for-C-23.patch} | 2 +- ...-Fix-minIntN-and-maxIntN-assertions.patch} | 2 +- .../llvm/include/wpi/EpochTracker.h | 2 +- 38 files changed, 37 insertions(+), 59 deletions(-) rename upstream_utils/llvm_patches/{0014-Delete-numbers-from-MathExtras.patch => 0013-Delete-numbers-from-MathExtras.patch} (98%) delete mode 100644 upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch rename upstream_utils/llvm_patches/{0015-Add-lerp-and-sgn.patch => 0014-Add-lerp-and-sgn.patch} (96%) rename upstream_utils/llvm_patches/{0016-Fixup-includes.patch => 0015-Fixup-includes.patch} (99%) rename upstream_utils/llvm_patches/{0017-Use-std-is_trivially_copy_constructible.patch => 0016-Use-std-is_trivially_copy_constructible.patch} (95%) rename upstream_utils/llvm_patches/{0018-Windows-support.patch => 0017-Windows-support.patch} (99%) rename upstream_utils/llvm_patches/{0019-Remove-call-to-RtlGetLastNtStatus.patch => 0018-Remove-call-to-RtlGetLastNtStatus.patch} (97%) rename upstream_utils/llvm_patches/{0020-Prefer-fmtlib.patch => 0019-Prefer-fmtlib.patch} (98%) rename upstream_utils/llvm_patches/{0021-Prefer-wpi-s-fs.h.patch => 0020-Prefer-wpi-s-fs.h.patch} (96%) rename upstream_utils/llvm_patches/{0022-Remove-unused-functions.patch => 0021-Remove-unused-functions.patch} (99%) rename upstream_utils/llvm_patches/{0023-OS-specific-changes.patch => 0022-OS-specific-changes.patch} (97%) rename upstream_utils/llvm_patches/{0024-Use-SmallVector-for-UTF-conversion.patch => 0023-Use-SmallVector-for-UTF-conversion.patch} (99%) rename upstream_utils/llvm_patches/{0025-Prefer-to-use-static-pointers-in-raw_ostream.patch => 0024-Prefer-to-use-static-pointers-in-raw_ostream.patch} (95%) rename upstream_utils/llvm_patches/{0026-constexpr-endian-byte-swap.patch => 0025-constexpr-endian-byte-swap.patch} (94%) rename upstream_utils/llvm_patches/{0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch => 0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch} (97%) rename upstream_utils/llvm_patches/{0028-Unused-variable-in-release-mode.patch => 0027-Unused-variable-in-release-mode.patch} (94%) rename upstream_utils/llvm_patches/{0029-Use-C-20-bit-header.patch => 0028-Use-C-20-bit-header.patch} (99%) rename upstream_utils/llvm_patches/{0030-Remove-DenseMap-GTest-printer-test.patch => 0029-Remove-DenseMap-GTest-printer-test.patch} (94%) rename upstream_utils/llvm_patches/{0031-raw_ostream-Add-SetNumBytesInBuffer.patch => 0030-raw_ostream-Add-SetNumBytesInBuffer.patch} (93%) rename upstream_utils/llvm_patches/{0032-raw_ostream-Replace-errnoAsErrorCode.patch => 0031-raw_ostream-Replace-errnoAsErrorCode.patch} (94%) rename upstream_utils/llvm_patches/{0033-type_traits.h-Add-is_constexpr.patch => 0032-type_traits.h-Add-is_constexpr.patch} (94%) rename upstream_utils/llvm_patches/{0034-Remove-auto-conversion-from-raw_ostream.patch => 0033-Remove-auto-conversion-from-raw_ostream.patch} (95%) rename upstream_utils/llvm_patches/{0035-Add-SmallVector-erase_if.patch => 0034-Add-SmallVector-erase_if.patch} (95%) rename upstream_utils/llvm_patches/{0036-Fix-AlignedCharArrayUnion-for-C-23.patch => 0035-Fix-AlignedCharArrayUnion-for-C-23.patch} (96%) rename upstream_utils/llvm_patches/{0037-Fix-minIntN-and-maxIntN-assertions.patch => 0036-Fix-minIntN-and-maxIntN-assertions.patch} (95%) diff --git a/upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch b/upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch index 5ed1d49ac6..ae1f814f47 100644 --- a/upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch +++ b/upstream_utils/llvm_patches/0001-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 01/37] Remove StringRef, ArrayRef, and Optional +Subject: [PATCH 01/36] Remove StringRef, ArrayRef, and Optional --- llvm/include/llvm/ADT/PointerUnion.h | 1 - diff --git a/upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch b/upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch index 2632f58d90..b21e044ef1 100644 --- a/upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch +++ b/upstream_utils/llvm_patches/0002-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 02/37] Wrap std::min/max calls in parens, for Windows warnings +Subject: [PATCH 02/36] Wrap std::min/max calls in parens, for Windows warnings --- llvm/include/llvm/ADT/DenseMap.h | 4 ++-- diff --git a/upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch b/upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch index 0b7955d834..22a98b4278 100644 --- a/upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch +++ b/upstream_utils/llvm_patches/0003-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 03/37] Change unique_function storage size +Subject: [PATCH 03/36] Change unique_function storage size --- llvm/include/llvm/ADT/FunctionExtras.h | 4 ++-- diff --git a/upstream_utils/llvm_patches/0004-Threading-updates.patch b/upstream_utils/llvm_patches/0004-Threading-updates.patch index f4d05c5f7e..a1e88cebf6 100644 --- a/upstream_utils/llvm_patches/0004-Threading-updates.patch +++ b/upstream_utils/llvm_patches/0004-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 04/37] Threading updates +Subject: [PATCH 04/36] Threading updates - Remove guards for threads and exception - Prefer scope gaurd over lock gaurd diff --git a/upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch b/upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch index 4e0f30d925..6dcd4c91cc 100644 --- a/upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch +++ b/upstream_utils/llvm_patches/0005-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 05/37] \#ifdef guard safety +Subject: [PATCH 05/36] \#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/0006-Explicitly-use-std.patch b/upstream_utils/llvm_patches/0006-Explicitly-use-std.patch index d9859e71e5..e2c81eca55 100644 --- a/upstream_utils/llvm_patches/0006-Explicitly-use-std.patch +++ b/upstream_utils/llvm_patches/0006-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 06/37] Explicitly use std:: +Subject: [PATCH 06/36] Explicitly use std:: --- llvm/include/llvm/ADT/SmallSet.h | 2 +- diff --git a/upstream_utils/llvm_patches/0007-Remove-format_provider.patch b/upstream_utils/llvm_patches/0007-Remove-format_provider.patch index 8227e9e9f0..1cd071f60b 100644 --- a/upstream_utils/llvm_patches/0007-Remove-format_provider.patch +++ b/upstream_utils/llvm_patches/0007-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 07/37] Remove format_provider +Subject: [PATCH 07/36] Remove format_provider --- llvm/include/llvm/Support/Chrono.h | 114 ------------------------ diff --git a/upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch b/upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch index 6d8bcecd49..01a99ad652 100644 --- a/upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch +++ b/upstream_utils/llvm_patches/0008-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 08/37] Add compiler warning pragmas +Subject: [PATCH 08/36] Add compiler warning pragmas --- llvm/include/llvm/ADT/FunctionExtras.h | 11 +++++++++++ diff --git a/upstream_utils/llvm_patches/0009-Remove-unused-functions.patch b/upstream_utils/llvm_patches/0009-Remove-unused-functions.patch index f174a5fd7b..20763b3641 100644 --- a/upstream_utils/llvm_patches/0009-Remove-unused-functions.patch +++ b/upstream_utils/llvm_patches/0009-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 09/37] Remove unused functions +Subject: [PATCH 09/36] Remove unused functions --- llvm/include/llvm/ADT/SmallString.h | 77 ------ diff --git a/upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch b/upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch index 295e339caa..d784205b01 100644 --- a/upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch +++ b/upstream_utils/llvm_patches/0010-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 10/37] Detemplatize SmallVectorBase +Subject: [PATCH 10/36] Detemplatize SmallVectorBase --- llvm/include/llvm/ADT/SmallVector.h | 35 ++++++++++----------------- diff --git a/upstream_utils/llvm_patches/0011-Add-vectors-to-raw_ostream.patch b/upstream_utils/llvm_patches/0011-Add-vectors-to-raw_ostream.patch index 431c847e43..3bab41b93f 100644 --- a/upstream_utils/llvm_patches/0011-Add-vectors-to-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0011-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 11/37] Add vectors to raw_ostream +Subject: [PATCH 11/36] Add vectors to raw_ostream --- llvm/include/llvm/Support/raw_ostream.h | 115 ++++++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0012-Extra-collections-features.patch b/upstream_utils/llvm_patches/0012-Extra-collections-features.patch index 2b34fbc768..557dc158de 100644 --- a/upstream_utils/llvm_patches/0012-Extra-collections-features.patch +++ b/upstream_utils/llvm_patches/0012-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 12/37] Extra collections features +Subject: [PATCH 12/36] Extra collections features --- llvm/lib/Support/raw_ostream.cpp | 8 ++++++++ diff --git a/upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch b/upstream_utils/llvm_patches/0013-Delete-numbers-from-MathExtras.patch similarity index 98% rename from upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch rename to upstream_utils/llvm_patches/0013-Delete-numbers-from-MathExtras.patch index ca2d69fc00..8a8d53f272 100644 --- a/upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch +++ b/upstream_utils/llvm_patches/0013-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 14/37] Delete numbers from MathExtras +Subject: [PATCH 13/36] Delete numbers from MathExtras --- llvm/include/llvm/Support/MathExtras.h | 36 -------------------------- diff --git a/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch b/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch deleted file mode 100644 index 7f74ecd937..0000000000 --- a/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: PJ Reiniger -Date: Wed, 4 May 2022 00:01:00 -0400 -Subject: [PATCH 13/37] EpochTracker ABI macro - ---- - llvm/include/llvm/ADT/EpochTracker.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/include/llvm/ADT/EpochTracker.h b/llvm/include/llvm/ADT/EpochTracker.h -index fc41d6f2c92d2f9876c741067b5645a74663db04..56d0acda2c1a0e390cfed086fa298b650c4a561f 100644 ---- a/llvm/include/llvm/ADT/EpochTracker.h -+++ b/llvm/include/llvm/ADT/EpochTracker.h -@@ -22,7 +22,7 @@ - - namespace llvm { - --#if LLVM_ENABLE_ABI_BREAKING_CHECKS -+#ifndef NDEBUG //ifndef LLVM_ENABLE_ABI_BREAKING_CHECKS - #define LLVM_DEBUGEPOCHBASE_HANDLEBASE_EMPTYBASE - - /// A base class for data structure classes wishing to make iterators diff --git a/upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch b/upstream_utils/llvm_patches/0014-Add-lerp-and-sgn.patch similarity index 96% rename from upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch rename to upstream_utils/llvm_patches/0014-Add-lerp-and-sgn.patch index 010525fcaa..95c7149057 100644 --- a/upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch +++ b/upstream_utils/llvm_patches/0014-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 15/37] Add lerp and sgn +Subject: [PATCH 14/36] Add lerp and sgn --- llvm/include/llvm/Support/MathExtras.h | 21 +++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0016-Fixup-includes.patch b/upstream_utils/llvm_patches/0015-Fixup-includes.patch similarity index 99% rename from upstream_utils/llvm_patches/0016-Fixup-includes.patch rename to upstream_utils/llvm_patches/0015-Fixup-includes.patch index df4c50a7a0..3fd231c33f 100644 --- a/upstream_utils/llvm_patches/0016-Fixup-includes.patch +++ b/upstream_utils/llvm_patches/0015-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 16/37] Fixup includes +Subject: [PATCH 15/36] Fixup includes --- llvm/include/llvm/Support/PointerLikeTypeTraits.h | 1 + diff --git a/upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch b/upstream_utils/llvm_patches/0016-Use-std-is_trivially_copy_constructible.patch similarity index 95% rename from upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch rename to upstream_utils/llvm_patches/0016-Use-std-is_trivially_copy_constructible.patch index 40adf0eab9..b7552f2b33 100644 --- a/upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch +++ b/upstream_utils/llvm_patches/0016-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 17/37] Use std::is_trivially_copy_constructible +Subject: [PATCH 16/36] Use std::is_trivially_copy_constructible --- llvm/include/llvm/Support/type_traits.h | 16 ---------------- diff --git a/upstream_utils/llvm_patches/0018-Windows-support.patch b/upstream_utils/llvm_patches/0017-Windows-support.patch similarity index 99% rename from upstream_utils/llvm_patches/0018-Windows-support.patch rename to upstream_utils/llvm_patches/0017-Windows-support.patch index dc981328e1..4d041a5eb4 100644 --- a/upstream_utils/llvm_patches/0018-Windows-support.patch +++ b/upstream_utils/llvm_patches/0017-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 18/37] Windows support +Subject: [PATCH 17/36] Windows support --- .../llvm/Support/Windows/WindowsSupport.h | 45 +++++---- diff --git a/upstream_utils/llvm_patches/0019-Remove-call-to-RtlGetLastNtStatus.patch b/upstream_utils/llvm_patches/0018-Remove-call-to-RtlGetLastNtStatus.patch similarity index 97% rename from upstream_utils/llvm_patches/0019-Remove-call-to-RtlGetLastNtStatus.patch rename to upstream_utils/llvm_patches/0018-Remove-call-to-RtlGetLastNtStatus.patch index 2c32a57ed1..1b3b1eb448 100644 --- a/upstream_utils/llvm_patches/0019-Remove-call-to-RtlGetLastNtStatus.patch +++ b/upstream_utils/llvm_patches/0018-Remove-call-to-RtlGetLastNtStatus.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 17 Sep 2024 21:19:52 -0700 -Subject: [PATCH 19/37] Remove call to RtlGetLastNtStatus() +Subject: [PATCH 18/36] Remove call to RtlGetLastNtStatus() --- llvm/lib/Support/ErrorHandling.cpp | 23 ----------------------- diff --git a/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch b/upstream_utils/llvm_patches/0019-Prefer-fmtlib.patch similarity index 98% rename from upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch rename to upstream_utils/llvm_patches/0019-Prefer-fmtlib.patch index 1d741d0685..a6ec743970 100644 --- a/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch +++ b/upstream_utils/llvm_patches/0019-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/37] Prefer fmtlib +Subject: [PATCH 19/36] 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/0020-Prefer-wpi-s-fs.h.patch similarity index 96% rename from upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch rename to upstream_utils/llvm_patches/0020-Prefer-wpi-s-fs.h.patch index 5967160f63..69576f03a5 100644 --- a/upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch +++ b/upstream_utils/llvm_patches/0020-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/37] Prefer wpi's fs.h +Subject: [PATCH 20/36] 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/0021-Remove-unused-functions.patch similarity index 99% rename from upstream_utils/llvm_patches/0022-Remove-unused-functions.patch rename to upstream_utils/llvm_patches/0021-Remove-unused-functions.patch index 2188642a17..e8b3b3a4c4 100644 --- a/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch +++ b/upstream_utils/llvm_patches/0021-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/37] Remove unused functions +Subject: [PATCH 21/36] Remove unused functions --- llvm/include/llvm/Support/raw_ostream.h | 5 +- diff --git a/upstream_utils/llvm_patches/0023-OS-specific-changes.patch b/upstream_utils/llvm_patches/0022-OS-specific-changes.patch similarity index 97% rename from upstream_utils/llvm_patches/0023-OS-specific-changes.patch rename to upstream_utils/llvm_patches/0022-OS-specific-changes.patch index b17df98e16..b08cf77b4a 100644 --- a/upstream_utils/llvm_patches/0023-OS-specific-changes.patch +++ b/upstream_utils/llvm_patches/0022-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/37] OS-specific changes +Subject: [PATCH 22/36] OS-specific changes --- llvm/lib/Support/ErrorHandling.cpp | 16 +++++++--------- diff --git a/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch b/upstream_utils/llvm_patches/0023-Use-SmallVector-for-UTF-conversion.patch similarity index 99% rename from upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch rename to upstream_utils/llvm_patches/0023-Use-SmallVector-for-UTF-conversion.patch index ea78ec5aa4..bb096a2b05 100644 --- a/upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch +++ b/upstream_utils/llvm_patches/0023-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/37] Use SmallVector for UTF conversion +Subject: [PATCH 23/36] 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/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch similarity index 95% rename from upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch rename to upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch index d81f6a13d8..dd87e46a7b 100644 --- a/upstream_utils/llvm_patches/0025-Prefer-to-use-static-pointers-in-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0024-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/37] Prefer to use static pointers in raw_ostream +Subject: [PATCH 24/36] 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/0025-constexpr-endian-byte-swap.patch similarity index 94% rename from upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch rename to upstream_utils/llvm_patches/0025-constexpr-endian-byte-swap.patch index 67ba72a8ca..ed8e269a9f 100644 --- a/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch +++ b/upstream_utils/llvm_patches/0025-constexpr-endian-byte-swap.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 1 Mar 2024 11:56:17 -0800 -Subject: [PATCH 26/37] constexpr endian byte swap +Subject: [PATCH 25/36] 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/0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch similarity index 97% rename from upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch rename to upstream_utils/llvm_patches/0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch index d64c7d19b8..28831db7bc 100644 --- a/upstream_utils/llvm_patches/0027-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch +++ b/upstream_utils/llvm_patches/0026-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/37] Copy type traits from STLExtras.h into PointerUnion.h +Subject: [PATCH 26/36] Copy type traits from STLExtras.h into PointerUnion.h --- llvm/include/llvm/ADT/PointerUnion.h | 46 ++++++++++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0028-Unused-variable-in-release-mode.patch b/upstream_utils/llvm_patches/0027-Unused-variable-in-release-mode.patch similarity index 94% rename from upstream_utils/llvm_patches/0028-Unused-variable-in-release-mode.patch rename to upstream_utils/llvm_patches/0027-Unused-variable-in-release-mode.patch index 9da7f8677f..8ad8af32c7 100644 --- a/upstream_utils/llvm_patches/0028-Unused-variable-in-release-mode.patch +++ b/upstream_utils/llvm_patches/0027-Unused-variable-in-release-mode.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Mon, 10 Jul 2023 00:53:43 +0200 -Subject: [PATCH 28/37] Unused variable in release mode +Subject: [PATCH 27/36] Unused variable in release mode --- llvm/include/llvm/ADT/DenseMap.h | 2 +- diff --git a/upstream_utils/llvm_patches/0029-Use-C-20-bit-header.patch b/upstream_utils/llvm_patches/0028-Use-C-20-bit-header.patch similarity index 99% rename from upstream_utils/llvm_patches/0029-Use-C-20-bit-header.patch rename to upstream_utils/llvm_patches/0028-Use-C-20-bit-header.patch index 87767d948e..770880b1db 100644 --- a/upstream_utils/llvm_patches/0029-Use-C-20-bit-header.patch +++ b/upstream_utils/llvm_patches/0028-Use-C-20-bit-header.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 11 Jul 2023 22:56:09 -0700 -Subject: [PATCH 29/37] Use C++20 header +Subject: [PATCH 28/36] Use C++20 header --- llvm/include/llvm/ADT/DenseMap.h | 3 +- diff --git a/upstream_utils/llvm_patches/0030-Remove-DenseMap-GTest-printer-test.patch b/upstream_utils/llvm_patches/0029-Remove-DenseMap-GTest-printer-test.patch similarity index 94% rename from upstream_utils/llvm_patches/0030-Remove-DenseMap-GTest-printer-test.patch rename to upstream_utils/llvm_patches/0029-Remove-DenseMap-GTest-printer-test.patch index c7d2302696..f66810259d 100644 --- a/upstream_utils/llvm_patches/0030-Remove-DenseMap-GTest-printer-test.patch +++ b/upstream_utils/llvm_patches/0029-Remove-DenseMap-GTest-printer-test.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 30 Jul 2023 14:17:37 -0700 -Subject: [PATCH 30/37] Remove DenseMap GTest printer test +Subject: [PATCH 29/36] Remove DenseMap GTest printer test LLVM modifies internal GTest headers to support it, which we can't do. --- diff --git a/upstream_utils/llvm_patches/0031-raw_ostream-Add-SetNumBytesInBuffer.patch b/upstream_utils/llvm_patches/0030-raw_ostream-Add-SetNumBytesInBuffer.patch similarity index 93% rename from upstream_utils/llvm_patches/0031-raw_ostream-Add-SetNumBytesInBuffer.patch rename to upstream_utils/llvm_patches/0030-raw_ostream-Add-SetNumBytesInBuffer.patch index b2e14af00f..801bb60254 100644 --- a/upstream_utils/llvm_patches/0031-raw_ostream-Add-SetNumBytesInBuffer.patch +++ b/upstream_utils/llvm_patches/0030-raw_ostream-Add-SetNumBytesInBuffer.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 29 Oct 2023 23:00:08 -0700 -Subject: [PATCH 31/37] raw_ostream: Add SetNumBytesInBuffer +Subject: [PATCH 30/36] raw_ostream: Add SetNumBytesInBuffer --- llvm/include/llvm/Support/raw_ostream.h | 5 +++++ diff --git a/upstream_utils/llvm_patches/0032-raw_ostream-Replace-errnoAsErrorCode.patch b/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch similarity index 94% rename from upstream_utils/llvm_patches/0032-raw_ostream-Replace-errnoAsErrorCode.patch rename to upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch index c0a79ca629..bb0ca0261a 100644 --- a/upstream_utils/llvm_patches/0032-raw_ostream-Replace-errnoAsErrorCode.patch +++ b/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 17 Sep 2024 15:30:31 -0700 -Subject: [PATCH 32/37] raw_ostream: Replace errnoAsErrorCode() +Subject: [PATCH 31/36] raw_ostream: Replace errnoAsErrorCode() --- llvm/lib/Support/raw_ostream.cpp | 4 ++-- diff --git a/upstream_utils/llvm_patches/0033-type_traits.h-Add-is_constexpr.patch b/upstream_utils/llvm_patches/0032-type_traits.h-Add-is_constexpr.patch similarity index 94% rename from upstream_utils/llvm_patches/0033-type_traits.h-Add-is_constexpr.patch rename to upstream_utils/llvm_patches/0032-type_traits.h-Add-is_constexpr.patch index 51d178286f..5c5e3208b9 100644 --- a/upstream_utils/llvm_patches/0033-type_traits.h-Add-is_constexpr.patch +++ b/upstream_utils/llvm_patches/0032-type_traits.h-Add-is_constexpr.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 2 Dec 2023 15:21:32 -0800 -Subject: [PATCH 33/37] type_traits.h: Add is_constexpr() +Subject: [PATCH 32/36] type_traits.h: Add is_constexpr() --- llvm/include/llvm/Support/type_traits.h | 5 +++++ diff --git a/upstream_utils/llvm_patches/0034-Remove-auto-conversion-from-raw_ostream.patch b/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch similarity index 95% rename from upstream_utils/llvm_patches/0034-Remove-auto-conversion-from-raw_ostream.patch rename to upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch index 571783f649..2a326fbfdc 100644 --- a/upstream_utils/llvm_patches/0034-Remove-auto-conversion-from-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 17 Mar 2024 14:51:11 -0700 -Subject: [PATCH 34/37] Remove auto-conversion from raw_ostream +Subject: [PATCH 33/36] Remove auto-conversion from raw_ostream --- llvm/lib/Support/raw_ostream.cpp | 11 +---------- diff --git a/upstream_utils/llvm_patches/0035-Add-SmallVector-erase_if.patch b/upstream_utils/llvm_patches/0034-Add-SmallVector-erase_if.patch similarity index 95% rename from upstream_utils/llvm_patches/0035-Add-SmallVector-erase_if.patch rename to upstream_utils/llvm_patches/0034-Add-SmallVector-erase_if.patch index 357fadc03e..8e7500976d 100644 --- a/upstream_utils/llvm_patches/0035-Add-SmallVector-erase_if.patch +++ b/upstream_utils/llvm_patches/0034-Add-SmallVector-erase_if.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 18 Jun 2024 09:07:33 -0700 -Subject: [PATCH 35/37] Add SmallVector erase_if() +Subject: [PATCH 34/36] Add SmallVector erase_if() --- llvm/include/llvm/ADT/SmallVector.h | 8 ++++++++ diff --git a/upstream_utils/llvm_patches/0036-Fix-AlignedCharArrayUnion-for-C-23.patch b/upstream_utils/llvm_patches/0035-Fix-AlignedCharArrayUnion-for-C-23.patch similarity index 96% rename from upstream_utils/llvm_patches/0036-Fix-AlignedCharArrayUnion-for-C-23.patch rename to upstream_utils/llvm_patches/0035-Fix-AlignedCharArrayUnion-for-C-23.patch index b71b47d0e8..7203296dba 100644 --- a/upstream_utils/llvm_patches/0036-Fix-AlignedCharArrayUnion-for-C-23.patch +++ b/upstream_utils/llvm_patches/0035-Fix-AlignedCharArrayUnion-for-C-23.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 13 Jul 2024 15:24:30 -0700 -Subject: [PATCH 36/37] Fix AlignedCharArrayUnion for C++23 +Subject: [PATCH 35/36] Fix AlignedCharArrayUnion for C++23 --- llvm/include/llvm/Support/AlignOf.h | 14 +++++--------- diff --git a/upstream_utils/llvm_patches/0037-Fix-minIntN-and-maxIntN-assertions.patch b/upstream_utils/llvm_patches/0036-Fix-minIntN-and-maxIntN-assertions.patch similarity index 95% rename from upstream_utils/llvm_patches/0037-Fix-minIntN-and-maxIntN-assertions.patch rename to upstream_utils/llvm_patches/0036-Fix-minIntN-and-maxIntN-assertions.patch index f9ca8d5035..f9a70c52d7 100644 --- a/upstream_utils/llvm_patches/0037-Fix-minIntN-and-maxIntN-assertions.patch +++ b/upstream_utils/llvm_patches/0036-Fix-minIntN-and-maxIntN-assertions.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 23 Dec 2024 22:56:29 -0800 -Subject: [PATCH 37/37] Fix minIntN() and maxIntN() assertions +Subject: [PATCH 36/36] Fix minIntN() and maxIntN() assertions --- llvm/include/llvm/Support/MathExtras.h | 4 ++-- diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h index 8cb122a7d5..037a70bf27 100644 --- a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h +++ b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h @@ -21,7 +21,7 @@ namespace wpi { -#ifndef NDEBUG //ifndef LLVM_ENABLE_ABI_BREAKING_CHECKS +#if LLVM_ENABLE_ABI_BREAKING_CHECKS #define LLVM_DEBUGEPOCHBASE_HANDLEBASE_EMPTYBASE /// A base class for data structure classes wishing to make iterators