diff --git a/.github/workflows/upstream-utils.yml b/.github/workflows/upstream-utils.yml index 07a5827169..587c7a6b3b 100644 --- a/.github/workflows/upstream-utils.yml +++ b/.github/workflows/upstream-utils.yml @@ -35,101 +35,121 @@ jobs: cd upstream_utils ./apriltag.py clone ./apriltag.py copy-src + ./apriltag.py format-patch - name: Run argparse_lib.py run: | cd upstream_utils ./argparse_lib.py clone ./argparse_lib.py copy-src + ./argparse_lib.py format-patch - name: Run eigen.py run: | cd upstream_utils ./eigen.py clone ./eigen.py copy-src + ./eigen.py format-patch - name: Run expected.py run: | cd upstream_utils ./expected.py clone ./expected.py copy-src + ./expected.py format-patch - name: Run fmt.py run: | cd upstream_utils ./fmt.py clone ./fmt.py copy-src + ./fmt.py format-patch - name: Run gcem.py run: | cd upstream_utils ./gcem.py clone ./gcem.py copy-src + ./gcem.py format-patch - name: Run gl3w.py run: | cd upstream_utils ./gl3w.py clone ./gl3w.py copy-src + ./gl3w.py format-patch - name: Run glfw.py run: | cd upstream_utils ./glfw.py clone ./glfw.py copy-src + ./glfw.py format-patch - name: Run googletest.py run: | cd upstream_utils ./googletest.py clone ./googletest.py copy-src + ./googletest.py format-patch - name: Run imgui.py run: | cd upstream_utils ./imgui.py clone ./imgui.py copy-src + ./imgui.py format-patch - name: Run implot.py run: | cd upstream_utils ./implot.py clone ./implot.py copy-src + ./implot.py format-patch - name: Run json.py run: | cd upstream_utils ./json.py clone ./json.py copy-src + ./json.py format-patch - name: Run libuv.py run: | cd upstream_utils ./libuv.py clone ./libuv.py copy-src + ./libuv.py format-patch - name: Run llvm.py run: | cd upstream_utils ./llvm.py clone ./llvm.py copy-src + ./llvm.py format-patch - name: Run mpack.py run: | cd upstream_utils ./mpack.py clone ./mpack.py copy-src + ./mpack.py format-patch - name: Run stack_walker.py run: | cd upstream_utils ./stack_walker.py clone ./stack_walker.py copy-src + ./stack_walker.py format-patch - name: Run memory.py run: | cd upstream_utils ./memory.py clone ./memory.py copy-src + ./memory.py format-patch - name: Run protobuf.py run: | cd upstream_utils ./protobuf.py clone ./protobuf.py copy-src + ./protobuf.py format-patch - name: Run sleipnir.py run: | cd upstream_utils ./sleipnir.py clone ./sleipnir.py copy-src + ./sleipnir.py format-patch - name: Run stb.py run: | cd upstream_utils ./stb.py clone ./stb.py copy-src + ./stb.py format-patch - name: Add untracked files to index so they count as changes run: git add -A - name: Check output diff --git a/upstream_utils/argparse_lib.py b/upstream_utils/argparse_lib.py index 6adfd39e64..644193701c 100755 --- a/upstream_utils/argparse_lib.py +++ b/upstream_utils/argparse_lib.py @@ -26,7 +26,7 @@ def copy_upstream_src(wpilib_root): def main(): - name = "argparse" + name = "argparse_lib" url = "https://github.com/p-ranav/argparse" # master on 2024-09-11 tag = "fd13c2859131ab463e617a5a8abcc69eb7e1d897" 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 d14c5fadca..260b22ad86 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/38] Remove StringRef, ArrayRef, and Optional +Subject: [PATCH 01/36] Remove StringRef, ArrayRef, and Optional --- llvm/include/llvm/ADT/PointerUnion.h | 1 - @@ -30,7 +30,7 @@ Subject: [PATCH 01/38] Remove StringRef, ArrayRef, and Optional llvm/unittests/ADT/SmallVectorTest.cpp | 30 +---- llvm/unittests/Support/ConvertUTFTest.cpp | 41 ++++--- llvm/unittests/Support/xxhashTest.cpp | 4 +- - 30 files changed, 282 insertions(+), 323 deletions(-) + 26 files changed, 232 insertions(+), 271 deletions(-) diff --git a/llvm/include/llvm/ADT/PointerUnion.h b/llvm/include/llvm/ADT/PointerUnion.h index 7d4ed02b622626bb8043acb57b8ce7ed97a5f949..8ac68dbc0a791b8ac0e0ca865e69024cb642aa70 100644 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 8bf413f44f..1e4335b5e8 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/38] 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 ab7ab706bc..ff920af4b5 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/38] 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 56c31c5934..894050c88d 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/38] 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 f03d7633c3..50d93406cf 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/38] \#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 0f1e9a278b..baa83c2b34 100644 --- a/upstream_utils/llvm_patches/0006-Explicitly-use-std.patch +++ b/upstream_utils/llvm_patches/0006-Explicitly-use-std.patch @@ -1,14 +1,14 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 7 May 2022 22:37:34 -0400 -Subject: [PATCH 06/38] Explicitly use std:: +Subject: [PATCH 06/36] Explicitly use std:: --- llvm/include/llvm/ADT/SmallSet.h | 2 +- llvm/lib/Support/ErrorHandling.cpp | 2 +- llvm/unittests/ADT/SmallPtrSetTest.cpp | 2 +- llvm/unittests/ADT/SmallSetTest.cpp | 10 +++++----- - 5 files changed, 9 insertions(+), 9 deletions(-) + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h index aeee5f97799aea7e7588d7afba1e47b4fa3d8c7b..4969dfb0d61c2fad805c9cb7bc0184ea6d47bf23 100644 diff --git a/upstream_utils/llvm_patches/0007-Remove-format_provider.patch b/upstream_utils/llvm_patches/0007-Remove-format_provider.patch index ad565c536e..914aeb183e 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/38] 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 fce8b82807..f5996fd966 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/38] 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 7b99fa5d92..071e789129 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/38] Remove unused functions +Subject: [PATCH 09/36] Remove unused functions --- llvm/include/llvm/ADT/SmallString.h | 79 ------ diff --git a/upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch b/upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch index c4ed938400..cdb642e87c 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/38] 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 82ac7bfaf0..d961010745 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/38] 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 d0c4a2838a..6db0699ad1 100644 --- a/upstream_utils/llvm_patches/0012-Extra-collections-features.patch +++ b/upstream_utils/llvm_patches/0012-Extra-collections-features.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 3 May 2022 22:16:10 -0400 -Subject: [PATCH 12/38] Extra collections features +Subject: [PATCH 12/36] Extra collections features --- - llvm/lib/Support/raw_ostream.cpp | 8 +++ - 2 files changed, 110 insertions(+), 1 deletion(-) + llvm/lib/Support/raw_ostream.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp index 57d3091fd5cc5b416e814f9f33811f0fa7afe9cf..5bec803ccc76ce287b7ff3ea037d5e490a7af20c 100644 diff --git a/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch b/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch index 9e03b73391..d142b8e81a 100644 --- a/upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch +++ b/upstream_utils/llvm_patches/0013-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 13/38] EpochTracker ABI macro +Subject: [PATCH 13/36] EpochTracker ABI macro --- llvm/include/llvm/ADT/EpochTracker.h | 2 +- diff --git a/upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch b/upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch index 4a5858f54e..ebf7baf9c7 100644 --- a/upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch +++ b/upstream_utils/llvm_patches/0014-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/38] Delete numbers from MathExtras +Subject: [PATCH 14/36] Delete numbers from MathExtras --- llvm/include/llvm/Support/MathExtras.h | 36 -------------------------- diff --git a/upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch b/upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch index 71015dc78f..92a744d351 100644 --- a/upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch +++ b/upstream_utils/llvm_patches/0015-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/38] Add lerp and sgn +Subject: [PATCH 15/36] Add lerp and sgn --- llvm/include/llvm/Support/MathExtras.h | 20 ++++++++++++++++++++ diff --git a/upstream_utils/llvm_patches/0016-Fixup-includes.patch b/upstream_utils/llvm_patches/0016-Fixup-includes.patch index 17c463f8d9..caa2953a66 100644 --- a/upstream_utils/llvm_patches/0016-Fixup-includes.patch +++ b/upstream_utils/llvm_patches/0016-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/38] Fixup includes +Subject: [PATCH 16/36] Fixup includes --- llvm/include/llvm/Support/PointerLikeTypeTraits.h | 1 + @@ -11,7 +11,7 @@ Subject: [PATCH 16/38] Fixup includes llvm/unittests/ADT/SmallPtrSetTest.cpp | 2 ++ llvm/unittests/ADT/SmallVectorTest.cpp | 1 + llvm/unittests/Support/ConvertUTFTest.cpp | 2 ++ - 10 files changed, 25 insertions(+), 9 deletions(-) + 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/llvm/include/llvm/Support/PointerLikeTypeTraits.h b/llvm/include/llvm/Support/PointerLikeTypeTraits.h index 1b15f930bd87d97d51824af5e62ea5f222a6b4c9..acadd5e89a1651cfbad67a5b1b0933d1f288d094 100644 diff --git a/upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch b/upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch index a2e3b73681..486d887d58 100644 --- a/upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch +++ b/upstream_utils/llvm_patches/0017-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/38] Use std::is_trivially_copy_constructible +Subject: [PATCH 17/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/0018-Windows-support.patch index 1ebecd096e..15e423509b 100644 --- a/upstream_utils/llvm_patches/0018-Windows-support.patch +++ b/upstream_utils/llvm_patches/0018-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/38] Windows support +Subject: [PATCH 18/36] Windows support --- .../llvm/Support/Windows/WindowsSupport.h | 45 +++++---- diff --git a/upstream_utils/llvm_patches/0019-Prefer-fmtlib.patch b/upstream_utils/llvm_patches/0019-Prefer-fmtlib.patch index f31e60ce50..c2704d278c 100644 --- a/upstream_utils/llvm_patches/0019-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 19/38] Prefer fmtlib +Subject: [PATCH 19/36] Prefer fmtlib --- llvm/lib/Support/ErrorHandling.cpp | 20 ++++++-------------- diff --git a/upstream_utils/llvm_patches/0020-Prefer-wpi-s-fs.h.patch b/upstream_utils/llvm_patches/0020-Prefer-wpi-s-fs.h.patch index c2d54e64e0..ad4189436d 100644 --- a/upstream_utils/llvm_patches/0020-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 20/38] 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/0021-Remove-unused-functions.patch b/upstream_utils/llvm_patches/0021-Remove-unused-functions.patch index 810f018c26..c326bc4cbe 100644 --- a/upstream_utils/llvm_patches/0021-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 21/38] 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/0022-OS-specific-changes.patch b/upstream_utils/llvm_patches/0022-OS-specific-changes.patch index 590d1703d1..91f1302b16 100644 --- a/upstream_utils/llvm_patches/0022-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 22/38] OS-specific changes +Subject: [PATCH 22/36] OS-specific changes --- llvm/lib/Support/ErrorHandling.cpp | 16 +++++++--------- diff --git a/upstream_utils/llvm_patches/0023-Use-SmallVector-for-UTF-conversion.patch b/upstream_utils/llvm_patches/0023-Use-SmallVector-for-UTF-conversion.patch index 080ae752cc..bb096a2b05 100644 --- a/upstream_utils/llvm_patches/0023-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 23/38] 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/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch b/upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch index 7bf01d9f80..ecab45a58b 100644 --- a/upstream_utils/llvm_patches/0024-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 24/38] 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/0025-constexpr-endian-byte-swap.patch b/upstream_utils/llvm_patches/0025-constexpr-endian-byte-swap.patch index 8b7b95589c..5b13f98db0 100644 --- a/upstream_utils/llvm_patches/0025-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 25/38] 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/0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch b/upstream_utils/llvm_patches/0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch index b7d90f2604..28831db7bc 100644 --- a/upstream_utils/llvm_patches/0026-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 26/38] 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 f684d88f08..252180c3f3 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/38] 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 ac42a82f7c..5837769168 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/38] 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 5b86831fc8..f99bf81998 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/38] 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-Replace-deprecated-std-aligned_storage_t.patch b/upstream_utils/llvm_patches/0030-Replace-deprecated-std-aligned_storage_t.patch similarity index 95% rename from upstream_utils/llvm_patches/0031-Replace-deprecated-std-aligned_storage_t.patch rename to upstream_utils/llvm_patches/0030-Replace-deprecated-std-aligned_storage_t.patch index 771617ae48..d4746e17fd 100644 --- a/upstream_utils/llvm_patches/0031-Replace-deprecated-std-aligned_storage_t.patch +++ b/upstream_utils/llvm_patches/0030-Replace-deprecated-std-aligned_storage_t.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 15 Sep 2023 18:26:50 -0700 -Subject: [PATCH 31/38] Replace deprecated std::aligned_storage_t +Subject: [PATCH 30/36] Replace deprecated std::aligned_storage_t --- llvm/include/llvm/ADT/FunctionExtras.h | 4 ++-- diff --git a/upstream_utils/llvm_patches/0032-raw_ostream-Add-SetNumBytesInBuffer.patch b/upstream_utils/llvm_patches/0031-raw_ostream-Add-SetNumBytesInBuffer.patch similarity index 93% rename from upstream_utils/llvm_patches/0032-raw_ostream-Add-SetNumBytesInBuffer.patch rename to upstream_utils/llvm_patches/0031-raw_ostream-Add-SetNumBytesInBuffer.patch index 43bca8bbd3..d3955d000b 100644 --- a/upstream_utils/llvm_patches/0032-raw_ostream-Add-SetNumBytesInBuffer.patch +++ b/upstream_utils/llvm_patches/0031-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 32/38] raw_ostream: Add SetNumBytesInBuffer +Subject: [PATCH 31/36] raw_ostream: Add SetNumBytesInBuffer --- llvm/include/llvm/Support/raw_ostream.h | 5 +++++ 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 aad2b7f43f..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/38] 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-Add-back-removed-raw_string_ostream-write_impl.patch b/upstream_utils/llvm_patches/0033-Add-back-removed-raw_string_ostream-write_impl.patch similarity index 94% rename from upstream_utils/llvm_patches/0034-Add-back-removed-raw_string_ostream-write_impl.patch rename to upstream_utils/llvm_patches/0033-Add-back-removed-raw_string_ostream-write_impl.patch index 87eb80ad90..8ec4eaf0be 100644 --- a/upstream_utils/llvm_patches/0034-Add-back-removed-raw_string_ostream-write_impl.patch +++ b/upstream_utils/llvm_patches/0033-Add-back-removed-raw_string_ostream-write_impl.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 1 Mar 2024 11:37:36 -0800 -Subject: [PATCH 34/38] Add back removed raw_string_ostream::write_impl() +Subject: [PATCH 33/36] Add back removed raw_string_ostream::write_impl() --- llvm/lib/Support/raw_ostream.cpp | 8 ++++++++ diff --git a/upstream_utils/llvm_patches/0035-Remove-auto-conversion-from-raw_ostream.patch b/upstream_utils/llvm_patches/0034-Remove-auto-conversion-from-raw_ostream.patch similarity index 95% rename from upstream_utils/llvm_patches/0035-Remove-auto-conversion-from-raw_ostream.patch rename to upstream_utils/llvm_patches/0034-Remove-auto-conversion-from-raw_ostream.patch index 6ffcc21eb7..b0fa86f2fb 100644 --- a/upstream_utils/llvm_patches/0035-Remove-auto-conversion-from-raw_ostream.patch +++ b/upstream_utils/llvm_patches/0034-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 35/38] Remove auto-conversion from raw_ostream +Subject: [PATCH 34/36] Remove auto-conversion from raw_ostream --- llvm/lib/Support/raw_ostream.cpp | 9 --------- diff --git a/upstream_utils/llvm_patches/0036-Add-SmallVector-erase_if.patch b/upstream_utils/llvm_patches/0035-Add-SmallVector-erase_if.patch similarity index 95% rename from upstream_utils/llvm_patches/0036-Add-SmallVector-erase_if.patch rename to upstream_utils/llvm_patches/0035-Add-SmallVector-erase_if.patch index 409f76234f..5e7c254c04 100644 --- a/upstream_utils/llvm_patches/0036-Add-SmallVector-erase_if.patch +++ b/upstream_utils/llvm_patches/0035-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 36/38] Add SmallVector erase_if() +Subject: [PATCH 35/36] Add SmallVector erase_if() --- llvm/include/llvm/ADT/SmallVector.h | 8 ++++++++ diff --git a/upstream_utils/llvm_patches/0037-Fix-AlignedCharArrayUnion-for-C-23.patch b/upstream_utils/llvm_patches/0036-Fix-AlignedCharArrayUnion-for-C-23.patch similarity index 96% rename from upstream_utils/llvm_patches/0037-Fix-AlignedCharArrayUnion-for-C-23.patch rename to upstream_utils/llvm_patches/0036-Fix-AlignedCharArrayUnion-for-C-23.patch index ad7376c521..bfde974f4c 100644 --- a/upstream_utils/llvm_patches/0037-Fix-AlignedCharArrayUnion-for-C-23.patch +++ b/upstream_utils/llvm_patches/0036-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 37/38] Fix AlignedCharArrayUnion for C++23 +Subject: [PATCH 36/36] Fix AlignedCharArrayUnion for C++23 --- llvm/include/llvm/Support/AlignOf.h | 14 +++++--------- diff --git a/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch b/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch index 74f2050d1e..cbd24986e2 100644 --- a/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch +++ b/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch @@ -15,7 +15,7 @@ Subject: [PATCH 3/4] Use namespace for C++ 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/mpack/mpack-common.c b/src/mpack/mpack-common.c -index 2c133a3303f7a2a10ac7d11a9eb3ee5a04a8335c..e5b4ab0007df2c4108791534b1aa4f9da4f1742a 100644 +index fb76a432bbe9e0ce6e39ffc29cbae3bc273efa83..1f9c078c2215436cc999a9447abe66250031e775 100644 --- a/src/mpack/mpack-common.c +++ b/src/mpack/mpack-common.c @@ -24,6 +24,7 @@ @@ -51,7 +51,7 @@ index 81576d1e0e7b942e93a27a6dd5a75a751dba2384..44f00ffc5387b5646d700b174283dec1 +} // namespace mpack MPACK_SILENCE_WARNINGS_END diff --git a/src/mpack/mpack-node.c b/src/mpack/mpack-node.c -index 3d4b0f4e69f9e026ad48dec30ac091a024ef30cf..016531360ef27a2003489c1cb4c9aa2f1a7d0865 100644 +index 8af1562d4bc27ec708d3af9e3d3cc03ae9719005..a1fdf4fa00c99ee00bbe36d1ee6911bf8d6be1f2 100644 --- a/src/mpack/mpack-node.c +++ b/src/mpack/mpack-node.c @@ -24,6 +24,7 @@ @@ -100,7 +100,7 @@ index 79604c90828ebbeae52eb3d6c13afeec6b861fa9..27a2f9eeb10cc8c6aa274a5e1b0c96be #else #define MPACK_EXTERN_C_BEGIN /*nothing*/ diff --git a/src/mpack/mpack-reader.c b/src/mpack/mpack-reader.c -index c6d2223ef8208f4b918b8890ca81915cb2494bb0..e3cbe7a7086f0fcd0a1ce5e5004ce410fb0e457a 100644 +index dfac4c2dd51e2d6f18b029a729c9929d8356e03d..da49bda12c7b900561460e49edf8382c99b19cae 100644 --- a/src/mpack/mpack-reader.c +++ b/src/mpack/mpack-reader.c @@ -24,6 +24,7 @@ @@ -118,7 +118,7 @@ index c6d2223ef8208f4b918b8890ca81915cb2494bb0..e3cbe7a7086f0fcd0a1ce5e5004ce410 +} // namespace mpack MPACK_SILENCE_WARNINGS_END diff --git a/src/mpack/mpack-writer.c b/src/mpack/mpack-writer.c -index 4d052b14d83851a45a4899b96904ed661664008c..272f861979103495627887b0d3edfad117bff748 100644 +index 029b0651549c783c9c4076244b76fa8f2974d4f8..f72b538659afa39a43359292487ff6fe2370eeb2 100644 --- a/src/mpack/mpack-writer.c +++ b/src/mpack/mpack-writer.c @@ -24,6 +24,7 @@ @@ -129,14 +129,14 @@ index 4d052b14d83851a45a4899b96904ed661664008c..272f861979103495627887b0d3edfad1 #if MPACK_WRITER -@@ -1772,4 +1773,5 @@ void mpack_complete_array(mpack_writer_t* writer) { +@@ -1827,4 +1828,5 @@ void mpack_complete_array(mpack_writer_t* writer) { #endif // MPACK_BUILDER #endif // MPACK_WRITER +} // namespace mpack MPACK_SILENCE_WARNINGS_END diff --git a/src/mpack/mpack-writer.h b/src/mpack/mpack-writer.h -index c239ee6441e753cba46f2ab5a6136eead9c30fb4..abeee1a6eb960b0ce61203ae75eb7c7488186860 100644 +index d842a3fc48fbd5693553fcf7693e2dc06f1a2b5e..5fcd009ccaf24ef2e76c24042167e15d538214d9 100644 --- a/src/mpack/mpack-writer.h +++ b/src/mpack/mpack-writer.h @@ -1168,6 +1168,7 @@ MPACK_EXTERN_C_END diff --git a/upstream_utils/mpack_patches/0004-Group-doxygen-into-MPack-module.patch b/upstream_utils/mpack_patches/0004-Group-doxygen-into-MPack-module.patch index a29662386c..b3e56098e9 100644 --- a/upstream_utils/mpack_patches/0004-Group-doxygen-into-MPack-module.patch +++ b/upstream_utils/mpack_patches/0004-Group-doxygen-into-MPack-module.patch @@ -15,7 +15,7 @@ Subject: [PATCH 4/4] Group doxygen into MPack module 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/mpack/mpack-common.h b/src/mpack/mpack-common.h -index 1c6b8d472f9591575973db8f7573ce98c5a6169d..14f7dd05c0f9cdc3689bb357f8aac9c8d0671f45 100644 +index 3e77e07829df769eea03992cd7e8bd232f0804a1..e1ba820c58b6886fed2d8a19aee6df3027b648e2 100644 --- a/src/mpack/mpack-common.h +++ b/src/mpack/mpack-common.h @@ -40,7 +40,8 @@ MPACK_EXTERN_C_BEGIN @@ -43,7 +43,7 @@ index 02a1abc0cbe0250636d4a82c21517fba36484608..e62536e46bcab4fdf6bca1d3ea74ee5d * The MPack Expect API allows you to easily read MessagePack data when you * expect it to follow a predefined schema. diff --git a/src/mpack/mpack-node.h b/src/mpack/mpack-node.h -index 52142c4f9965c690e4227a6f89354e1e65b9b6a4..4c1289c834398a20f0c25f86e17e57a31832d623 100644 +index 26046e8c191eb44fe9e2b33aa003b9830d4b4b16..b410932b7f01165983b40ac47971039ca077d505 100644 --- a/src/mpack/mpack-node.h +++ b/src/mpack/mpack-node.h @@ -36,7 +36,8 @@ MPACK_EXTERN_C_BEGIN @@ -85,7 +85,7 @@ index 092e2ba2c36f8709b912d24b4d12974e81c82678..f981683512a60c0c2b5363b7f27cbd87 * The MPack Reader API contains functions for imperatively reading dynamically * typed data from a MessagePack stream. diff --git a/src/mpack/mpack-writer.h b/src/mpack/mpack-writer.h -index abeee1a6eb960b0ce61203ae75eb7c7488186860..03fdb7592b0bcaeeeaaf2f8c64c0fb30ba5e1292 100644 +index 5fcd009ccaf24ef2e76c24042167e15d538214d9..325d0db9d7fd66a48ee7564ef39d33100561bdbf 100644 --- a/src/mpack/mpack-writer.h +++ b/src/mpack/mpack-writer.h @@ -40,7 +40,8 @@ struct mpack_track_t; diff --git a/upstream_utils/stack_walker_patches/0001-Add-advapi-pragma.patch b/upstream_utils/stack_walker_patches/0001-Add-advapi-pragma.patch index d85bd5ea5e..599a7120c4 100644 --- a/upstream_utils/stack_walker_patches/0001-Add-advapi-pragma.patch +++ b/upstream_utils/stack_walker_patches/0001-Add-advapi-pragma.patch @@ -13,9 +13,9 @@ index 89545f8612d0d099d48fcf4184a2f2a30cf8577f..b2bcbaa447c5db1a3bcc155fb317ebc8 +++ b/Main/StackWalker/StackWalker.cpp @@ -91,6 +91,7 @@ #include - + #pragma comment(lib, "version.lib") // for "VerQueryValue" +#pragma comment(lib, "Advapi32.lib") // for "GetUserName" - + #pragma warning(disable : 4826) #if _MSC_VER >= 1900