[upstream_utils] Zero out commit hashes and show 40 digits in index hashes (#5336)

2026-06-25 01:41:43 +00:00 · 2023-05-16 09:41:46 -07:00
parent e909f2e687
commit abc19bcb43
49 changed files with 257 additions and 261 deletions
--- a/upstream_utils/README.md
+++ b/upstream_utils/README.md
@@ -11,10 +11,9 @@ Each thirdparty library has a Python script for updating it. They generally:

 `upstream_utils.py` contains utilities common to these update scripts.

-Patches are generated in the thirdparty repo with
-`git format-patch --no-signature` so they can be applied as individual commits
-and easily rebased onto newer versions. Each library has its own patch directory
-(e.g., `lib_patches`).
+Patches are generated in the thirdparty repo with git's format-patch command so
+they can be applied as individual commits and easily rebased onto newer
+versions. Each library has its own patch directory (e.g., `lib_patches`).

 ## Updating thirdparty library version

@@ -47,7 +46,7 @@ git rebase 2.0

 Generate patch files for the new version.
 ```bash
-git format-patch 2.0..HEAD --no-signature
+git format-patch 2.0..HEAD --zero-commit --abbrev=40 --no-signature
 ```

 Move the patch files to `upstream_utils`.
--- a/upstream_utils/eigen_patches/0001-Disable-warnings.patch
+++ b/upstream_utils/eigen_patches/0001-Disable-warnings.patch
@@ -1,14 +1,14 @@
-From 3bfc3d1e3cbc9d7032446cc4aa6246d1c7750901 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Wed, 18 May 2022 09:14:24 -0700
-Subject: [PATCH] Disable warnings
+Subject: [PATCH 1/3] Disable warnings

 ---
 Eigen/src/Core/util/DisableStupidWarnings.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

 diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h
-index fe0cfec..d973255 100755
+index fe0cfec0bc2461ac44abca8f3d05b468d3c60fd9..d973255943c55709f318888bd0d243c73c327ad1 100755
 --- a/Eigen/src/Core/util/DisableStupidWarnings.h
 +++ b/Eigen/src/Core/util/DisableStupidWarnings.h
@@ -71,6 +71,17 @@
--- a/upstream_utils/eigen_patches/0002-Intellisense-fix.patch
+++ b/upstream_utils/eigen_patches/0002-Intellisense-fix.patch
@@ -1,14 +1,14 @@
-From 94882f4460897f92dfe9f95ec33629094f8e76a2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Johnson <johnson.peter@gmail.com>
 Date: Fri, 20 Jan 2023 23:41:56 -0800
-Subject: [PATCH 2/2] Intellisense fix
+Subject: [PATCH 2/3] Intellisense fix

 ---
 Eigen/src/Core/util/Macros.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

 diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h
-index 986c3d4..81986b9 100644
+index 986c3d44db94c8ba339792b6738c47cdd2c5acbc..81986b9447824c440e004f38a220393ef5a089c6 100644
 --- a/Eigen/src/Core/util/Macros.h
 +++ b/Eigen/src/Core/util/Macros.h
@@ -58,6 +58,16 @@
--- a/upstream_utils/eigen_patches/0003-Eigen-Sparse-fix-warnings-Wunused-but-set-variable.patch
+++ b/upstream_utils/eigen_patches/0003-Eigen-Sparse-fix-warnings-Wunused-but-set-variable.patch
@@ -1,7 +1,7 @@
-From 7846c7387c1cb09cef7329630012ea1aefe64cf9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Laurent Rineau <laurent.rineau@cgal.org>
 Date: Tue, 11 Oct 2022 17:37:04 +0000
-Subject: [PATCH] Eigen/Sparse: fix warnings -Wunused-but-set-variable
+Subject: [PATCH 3/3] Eigen/Sparse: fix warnings -Wunused-but-set-variable

 ---
 Eigen/src/SparseCore/TriangularSolver.h        | 4 ++--
@@ -9,10 +9,10 @@ Subject: [PATCH] Eigen/Sparse: fix warnings -Wunused-but-set-variable
 2 files changed, 2 insertions(+), 7 deletions(-)

 diff --git a/Eigen/src/SparseCore/TriangularSolver.h b/Eigen/src/SparseCore/TriangularSolver.h
-index 79c867c25..a9fbeebc1 100644
+index f9c56ba79800e209dcf3f18ba37dbb8023488bca..7cb2c2665f0e24924da88f11c0fe3ca0c0af52e3 100644
 --- a/Eigen/src/SparseCore/TriangularSolver.h
 +++ b/Eigen/src/SparseCore/TriangularSolver.h
-@@ -272,11 +272,11 @@ struct sparse_solve_triangular_sparse_selector<Lhs,Rhs,Mode,UpLo,ColMajor>
+@@ -270,11 +270,11 @@ struct sparse_solve_triangular_sparse_selector<Lhs,Rhs,Mode,UpLo,ColMajor>
       }
 
 
@@ -27,10 +27,10 @@ index 79c867c25..a9fbeebc1 100644
 //         std::cout << it.value() << "  ";
         // FIXME use insertBack
 diff --git a/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h b/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h
-index 7bed85de5..2a8d80b24 100644
+index 6f75d500e5f831f414175ce46dbceffa0acd5539..7aecbcad8ed2703000d62cfd5d88d983c69a7423 100644
 --- a/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h
 +++ b/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h
-@@ -77,8 +77,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
+@@ -75,8 +75,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
   // Identify the relaxed supernodes by postorder traversal of the etree
   Index snode_start; // beginning of a snode 
   StorageIndex k;
@@ -39,7 +39,7 @@ index 7bed85de5..2a8d80b24 100644
   StorageIndex l; 
   for (j = 0; j < n; )
   {
-@@ -90,7 +88,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
+@@ -88,7 +86,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
       parent = et(j);
     }
     // Found a supernode in postordered etree, j is the last column 
@@ -47,7 +47,7 @@ index 7bed85de5..2a8d80b24 100644
     k = StorageIndex(n);
     for (Index i = snode_start; i <= j; ++i)
       k = (std::min)(k, inv_post(i));
-@@ -99,7 +96,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
+@@ -97,7 +94,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
     {
       // This is also a supernode in the original etree
       relax_end(k) = l; // Record last column 
@@ -55,7 +55,7 @@ index 7bed85de5..2a8d80b24 100644
     }
     else 
     {
-@@ -109,7 +105,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
+@@ -107,7 +103,6 @@ void SparseLUImpl<Scalar,StorageIndex>::heap_relax_snode (const Index n, IndexVe
         if (descendants(i) == 0) 
         {
           relax_end(l) = l;
@@ -63,6 +63,3 @@ index 7bed85de5..2a8d80b24 100644
         }
       }
     }
-- 
-2.40.0
-
--- a/upstream_utils/fmt_patches/0001-Don-t-throw-on-write-failure.patch
+++ b/upstream_utils/fmt_patches/0001-Don-t-throw-on-write-failure.patch
@@ -1,4 +1,4 @@
-From e685209746aabbbed0a9db54694b8ea1ca504163 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Wed, 18 May 2022 10:21:49 -0700
 Subject: [PATCH 1/2] Don't throw on write failure
@@ -10,7 +10,7 @@ Subject: [PATCH 1/2] Don't throw on write failure
 3 files changed, 3 insertions(+), 7 deletions(-)

 diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
-index 22b1ec8..abe4ff1 100644
+index 22b1ec8df0eb14b3f7f21797a19586b50b8423fd..abe4ff13db6287f9c5229df6c4b46beeed020bce 100644
 --- a/include/fmt/format-inl.h
 +++ b/include/fmt/format-inl.h
@@ -79,9 +79,7 @@ FMT_FUNC void report_error(format_func func, int error_code,
@@ -25,7 +25,7 @@ index 22b1ec8..abe4ff1 100644
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
 diff --git a/include/fmt/xchar.h b/include/fmt/xchar.h
-index 3b5bc15..fc3c67f 100644
+index 3b5bc15ca0a1d92d721611ddc70e80f098fb79ae..fc3c67f21c2294b8e73d6ea53f25c877f733082c 100644
 --- a/include/fmt/xchar.h
 +++ b/include/fmt/xchar.h
@@ -200,8 +200,7 @@ inline void vprint(std::FILE* f, wstring_view fmt, wformat_args args) {
@@ -39,7 +39,7 @@ index 3b5bc15..fc3c67f 100644
 
 inline void vprint(wstring_view fmt, wformat_args args) {
 diff --git a/src/os.cc b/src/os.cc
-index f388ead..2c49951 100644
+index f388ead0191b61ae0e5c24692c1f523aae3c9fbb..2c499512b5396830d7f1eb8fb5874586898802dd 100644
 --- a/src/os.cc
 +++ b/src/os.cc
@@ -277,8 +277,7 @@ std::size_t file::read(void* buffer, std::size_t count) {
--- a/upstream_utils/fmt_patches/0002-Suppress-C-20-clang-tidy-warning-false-positive.patch
+++ b/upstream_utils/fmt_patches/0002-Suppress-C-20-clang-tidy-warning-false-positive.patch
@@ -1,4 +1,4 @@
-From 1d8e07241d380d13383a6ff479f3895ef49ce514 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Fri, 2 Sep 2022 15:12:54 -0700
 Subject: [PATCH 2/2] Suppress C++20 clang-tidy warning false positive
@@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Suppress C++20 clang-tidy warning false positive
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/include/fmt/core.h b/include/fmt/core.h
-index f6a37af..5c210bc 100644
+index f6a37af9e35d3d1c623803d39f73c9a85f5aff10..5c210bcb8428dba6419a055b2dd47bd717f5dbab 100644
 --- a/include/fmt/core.h
 +++ b/include/fmt/core.h
@@ -2952,7 +2952,7 @@ class format_string_checker {
--- a/upstream_utils/libuv_patches/0001-Fix-missing-casts.patch
+++ b/upstream_utils/libuv_patches/0001-Fix-missing-casts.patch
@@ -1,4 +1,4 @@
-From d5613423f057b088f6b3753f49162947d5559ad9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:01:25 -0400
 Subject: [PATCH 1/9] Fix missing casts
@@ -47,7 +47,7 @@ Subject: [PATCH 1/9] Fix missing casts
 40 files changed, 166 insertions(+), 162 deletions(-)

 diff --git a/include/uv/unix.h b/include/uv/unix.h
-index ea37d787..420be86c 100644
+index ea37d78768654eef98e10982a6b6ddce934bbbbf..420be86c6f9984486c6420ff710c9dbcad09e411 100644
 --- a/include/uv/unix.h
 +++ b/include/uv/unix.h
@@ -223,7 +223,7 @@ typedef struct {
@@ -60,7 +60,7 @@ index ea37d787..420be86c 100644
   unsigned int nfds;                                                          \
   void* wq[2];                                                                \
 diff --git a/src/fs-poll.c b/src/fs-poll.c
-index 1bac1c56..5a39daed 100644
+index 1bac1c568e36cadd0b68451926c6f045f88342d2..5a39daed095502b2db34f23fcaf0ab04f31f96ff 100644
 --- a/src/fs-poll.c
 +++ b/src/fs-poll.c
@@ -77,7 +77,7 @@ int uv_fs_poll_start(uv_fs_poll_t* handle,
@@ -109,7 +109,7 @@ index 1bac1c56..5a39daed 100644
          last = it, it = it->previous) {
       assert(last->previous != NULL);
 diff --git a/src/inet.c b/src/inet.c
-index ddabf22f..ca8b6ac8 100644
+index ddabf22fa52a0d4d25987c65f59e0e5456406fe3..ca8b6ac8b69779655f69da758aa63d810332c800 100644
 --- a/src/inet.c
 +++ b/src/inet.c
@@ -40,9 +40,9 @@ static int inet_pton6(const char *src, unsigned char *dst);
@@ -148,7 +148,7 @@ index ddabf22f..ca8b6ac8 100644
   default:
     return UV_EAFNOSUPPORT;
 diff --git a/src/strscpy.c b/src/strscpy.c
-index 20df6fcb..6b4cc3bc 100644
+index 20df6fcbed29e9d944c866ddbcd5c09345a426b3..6b4cc3bc741b40b9c2b13d4c06e7090f8083a7ba 100644
 --- a/src/strscpy.c
 +++ b/src/strscpy.c
@@ -27,7 +27,7 @@ ssize_t uv__strscpy(char* d, const char* s, size_t n) {
@@ -161,7 +161,7 @@ index 20df6fcb..6b4cc3bc 100644
   if (i == 0)
     return 0;
 diff --git a/src/threadpool.c b/src/threadpool.c
-index e804c7c4..1241ace1 100644
+index e804c7c4b6f03c843965001f4c2179d349e156d4..1241ace1cc304c14bf1b79cc2a588c1a50ef4507 100644
 --- a/src/threadpool.c
 +++ b/src/threadpool.c
@@ -206,7 +206,7 @@ static void init_threads(void) {
@@ -174,7 +174,7 @@ index e804c7c4..1241ace1 100644
       nthreads = ARRAY_SIZE(default_threads);
       threads = default_threads;
 diff --git a/src/unix/bsd-ifaddrs.c b/src/unix/bsd-ifaddrs.c
-index 11ca9559..c3dd71a1 100644
+index 11ca95591fc38244e931fecd9dd4038d3968af7a..c3dd71a1889bfae08cfdf95acda61e6c3472bd2c 100644
 --- a/src/unix/bsd-ifaddrs.c
 +++ b/src/unix/bsd-ifaddrs.c
@@ -92,7 +92,7 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
@@ -187,7 +187,7 @@ index 11ca9559..c3dd71a1 100644
   if (*addresses == NULL) {
     freeifaddrs(addrs);
 diff --git a/src/unix/core.c b/src/unix/core.c
-index 54c769f3..6353b0e3 100644
+index 54c769f37f2331136c87a37c13fb4e3f9a8f22f9..6353b0e3cc9448aa35dc2ccc9b259277b3fae9a5 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -824,7 +824,7 @@ static unsigned int next_power_of_two(unsigned int val) {
@@ -238,7 +238,7 @@ index 54c769f3..6353b0e3 100644
   if (*envitems == NULL)
     return UV_ENOMEM;
 diff --git a/src/unix/darwin-proctitle.c b/src/unix/darwin-proctitle.c
-index 5288083e..9bd55dd7 100644
+index 5288083ef04fd78d90c34071cc76281adbc310d8..9bd55dd764b845cf8ea441d525b4e136699eb52e 100644
 --- a/src/unix/darwin-proctitle.c
 +++ b/src/unix/darwin-proctitle.c
@@ -128,8 +128,9 @@ int uv__set_process_title(const char* title) {
@@ -254,7 +254,7 @@ index 5288083e..9bd55dd7 100644
   if (display_name_key == NULL || *display_name_key == NULL)
     goto out;
 diff --git a/src/unix/darwin.c b/src/unix/darwin.c
-index 62f04d31..5fbf7342 100644
+index 62f04d315423d5b642294ff588b57d2babacad89..5fbf734218fa17cc61c03402c8b1dd6b66110ecb 100644
 --- a/src/unix/darwin.c
 +++ b/src/unix/darwin.c
@@ -353,7 +353,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -267,7 +267,7 @@ index 62f04d31..5fbf7342 100644
     vm_deallocate(mach_task_self(), (vm_address_t)info, msg_type);
     return UV_ENOMEM;
 diff --git a/src/unix/epoll.c b/src/unix/epoll.c
-index 97348e25..4c057fb3 100644
+index 97348e254b4556908a2d013300f3f9ee61ff230b..4c057fb3da37706906692750fc2fb42951843157 100644
 --- a/src/unix/epoll.c
 +++ b/src/unix/epoll.c
@@ -325,7 +325,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -280,7 +280,7 @@ index 97348e25..4c057fb3 100644
       if (w == NULL) {
         /* File descriptor that we've stopped watching, disarm it.
 diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c
-index 658ff262..6700ff61 100644
+index 658ff262d3738e95b24d8fb8992da905635170f7..6700ff6196245bdce7f14d9edd38607f18812200 100644
 --- a/src/unix/freebsd.c
 +++ b/src/unix/freebsd.c
@@ -215,7 +215,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -302,7 +302,7 @@ index 658ff262..6700ff61 100644
     uv__free(*cpu_infos);
     return UV_ENOMEM;
 diff --git a/src/unix/fs.c b/src/unix/fs.c
-index 933c9c0d..1a615244 100644
+index 933c9c0dc2da40e5bbdc70d73d131f678cafd7fb..1a615244f50dc75e560821f5bfbf5af97e592cc7 100644
 --- a/src/unix/fs.c
 +++ b/src/unix/fs.c
@@ -137,7 +137,7 @@ extern char *mkdtemp(char *template); /* See issue #740 on AIX < 7 */
@@ -396,7 +396,7 @@ index 933c9c0d..1a615244 100644
   if (req->bufs == NULL)
     return UV_ENOMEM;
 diff --git a/src/unix/fsevents.c b/src/unix/fsevents.c
-index bf4f1f6a..648c8a98 100644
+index bf4f1f6a5180ab4f6ef6776bc3f854c0c9fe67cd..648c8a98b817cb9a8bd03e85bf9b2175bb53eb1a 100644
 --- a/src/unix/fsevents.c
 +++ b/src/unix/fsevents.c
@@ -185,7 +185,7 @@ static void (*pFSEventStreamStop)(FSEventStreamRef);
@@ -553,7 +553,7 @@ index bf4f1f6a..648c8a98 100644
   QUEUE_REMOVE(&handle->cf_member);
   state->fsevent_handle_count--;
 diff --git a/src/unix/getaddrinfo.c b/src/unix/getaddrinfo.c
-index 77337ace..41dc3909 100644
+index 77337ace9454e032a392c97cb9aa311f15518956..41dc3909969a643e129847ae3a3252d51feadb27 100644
 --- a/src/unix/getaddrinfo.c
 +++ b/src/unix/getaddrinfo.c
@@ -172,7 +172,7 @@ int uv_getaddrinfo(uv_loop_t* loop,
@@ -587,7 +587,7 @@ index 77337ace..41dc3909 100644
   if (cb) {
     uv__work_submit(loop,
 diff --git a/src/unix/ibmi.c b/src/unix/ibmi.c
-index 8c6ae636..56af31e9 100644
+index 8c6ae636329e5b2e17742fc46b5094237381712a..56af31e979f34b0182aa82dbb3a04d1c5dd747cc 100644
 --- a/src/unix/ibmi.c
 +++ b/src/unix/ibmi.c
@@ -288,7 +288,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -600,7 +600,7 @@ index 8c6ae636..56af31e9 100644
     return UV_ENOMEM;
   }
 diff --git a/src/unix/kqueue.c b/src/unix/kqueue.c
-index 5dac76ae..86eb529b 100644
+index 5dac76ae753c6caf47e2795a715cae74e6e5930c..86eb529bcdaf69591850232084c1b3b2f526f838 100644
 --- a/src/unix/kqueue.c
 +++ b/src/unix/kqueue.c
@@ -281,8 +281,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -624,7 +624,7 @@ index 5dac76ae..86eb529b 100644
       if (w == NULL) {
         /* File descriptor that we've stopped watching, disarm it.
 diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
-index 23a7dafe..85f3fc01 100644
+index 23a7dafec814f6ecbd94e66d513fafe1cf8b3e80..85f3fc0170288577d2e39030dc728de9a694a752 100644
 --- a/src/unix/linux-core.c
 +++ b/src/unix/linux-core.c
@@ -117,7 +117,6 @@ void uv__platform_loop_delete(uv_loop_t* loop) {
@@ -654,7 +654,7 @@ index 23a7dafe..85f3fc01 100644
     freeifaddrs(addrs);
     return UV_ENOMEM;
 diff --git a/src/unix/linux-inotify.c b/src/unix/linux-inotify.c
-index c1bd260e..f5366e96 100644
+index c1bd260e16e5e9fd023cd00cd673951347545d00..f5366e9626ff5eb063f89a63415a6df9eec75f53 100644
 --- a/src/unix/linux-inotify.c
 +++ b/src/unix/linux-inotify.c
@@ -281,12 +281,12 @@ int uv_fs_event_start(uv_fs_event_t* handle,
@@ -673,7 +673,7 @@ index c1bd260e..f5366e96 100644
   w->iterating = 0;
   RB_INSERT(watcher_root, CAST(&handle->loop->inotify_watchers), w);
 diff --git a/src/unix/loop.c b/src/unix/loop.c
-index a88e71c3..2e819cdd 100644
+index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..2e819cdda71f0da2aa957148d3e6df18e027e5c8 100644
 --- a/src/unix/loop.c
 +++ b/src/unix/loop.c
@@ -148,7 +148,7 @@ int uv_loop_fork(uv_loop_t* loop) {
@@ -686,7 +686,7 @@ index a88e71c3..2e819cdd 100644
       continue;
 
 diff --git a/src/unix/netbsd.c b/src/unix/netbsd.c
-index c66333f5..b6886a1c 100644
+index c66333f522c5d43bdb6a2aea4e29d0baa278579f..b6886a1ce5ad2e04c64e0bde4e5709c3dac5a219 100644
 --- a/src/unix/netbsd.c
 +++ b/src/unix/netbsd.c
@@ -206,14 +206,14 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
@@ -707,7 +707,7 @@ index c66333f5..b6886a1c 100644
     uv__free(cp_times);
     uv__free(*cpu_infos);
 diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c
-index f32a94df..62740f73 100644
+index f32a94df38765fb54e7176efe0d172a5a88bccb4..62740f7349889833689d091e8cdd8010c404c28c 100644
 --- a/src/unix/openbsd.c
 +++ b/src/unix/openbsd.c
@@ -72,7 +72,7 @@ int uv_exepath(char* buffer, size_t* size) {
@@ -729,7 +729,7 @@ index f32a94df..62740f73 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/pipe.c b/src/unix/pipe.c
-index e8cfa148..c8ba31da 100644
+index e8cfa1481c3648928eeebceeebb642d358f2a0a8..c8ba31daf847fc206b392327ebf6cd4a5501b2d5 100644
 --- a/src/unix/pipe.c
 +++ b/src/unix/pipe.c
@@ -309,7 +309,7 @@ int uv_pipe_pending_count(uv_pipe_t* handle) {
@@ -751,7 +751,7 @@ index e8cfa148..c8ba31da 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/poll.c b/src/unix/poll.c
-index 7a12e2d1..73647317 100644
+index 7a12e2d1488a9d48712439e62c6637b9e1161f69..7364731757599d647bedc8e44d3930a32b743f5d 100644
 --- a/src/unix/poll.c
 +++ b/src/unix/poll.c
@@ -117,7 +117,7 @@ int uv_poll_stop(uv_poll_t* handle) {
@@ -764,7 +764,7 @@ index 7a12e2d1..73647317 100644
   int events;
 
 diff --git a/src/unix/posix-poll.c b/src/unix/posix-poll.c
-index 0f4bf938..8da038d1 100644
+index 0f4bf93874be89f2c4deb71e7eeca0416e3bd9ff..8da038d1da6dd893a141b14a593a9cc84b7fbf2f 100644
 --- a/src/unix/posix-poll.c
 +++ b/src/unix/posix-poll.c
@@ -61,7 +61,7 @@ static void uv__pollfds_maybe_resize(uv_loop_t* loop) {
@@ -777,7 +777,7 @@ index 0f4bf938..8da038d1 100644
     abort();
 
 diff --git a/src/unix/process.c b/src/unix/process.c
-index f8415368..0916aa45 100644
+index f84153687f799a201e55e465da998ea0b690da0f..0916aa458d4df07fb3b4e9e83f80b9e43c1f82a0 100644
 --- a/src/unix/process.c
 +++ b/src/unix/process.c
@@ -403,7 +403,7 @@ static int posix_spawn_can_use_setsid;
@@ -799,7 +799,7 @@ index f8415368..0916aa45 100644
   if (pipes == NULL)
     goto error;
 diff --git a/src/unix/proctitle.c b/src/unix/proctitle.c
-index 9d1f00dd..8cdec753 100644
+index 9d1f00ddf66e291abd40d0c0052a7f9bd5c03017..8cdec753d003ebe16485db2b47ffb3863a9473ff 100644
 --- a/src/unix/proctitle.c
 +++ b/src/unix/proctitle.c
@@ -65,7 +65,7 @@ char** uv_setup_args(int argc, char** argv) {
@@ -812,7 +812,7 @@ index 9d1f00dd..8cdec753 100644
     return argv;
 
 diff --git a/src/unix/random-sysctl-linux.c b/src/unix/random-sysctl-linux.c
-index 66ba8d74..9ef18df0 100644
+index 66ba8d74ec22b72d318b91d82365f5b9693feb3c..9ef18df01a51aa6a26ae6d1d9660a819d18604d0 100644
 --- a/src/unix/random-sysctl-linux.c
 +++ b/src/unix/random-sysctl-linux.c
@@ -48,7 +48,7 @@ int uv__random_sysctl(void* buf, size_t buflen) {
@@ -825,7 +825,7 @@ index 66ba8d74..9ef18df0 100644
 
   while (p < pe) {
 diff --git a/src/unix/stream.c b/src/unix/stream.c
-index b1f6359e..c6cc50e7 100644
+index b1f6359e0de2c520ed71bd689956de971006bb21..c6cc50e709989f30f4393b509d859663717d1770 100644
 --- a/src/unix/stream.c
 +++ b/src/unix/stream.c
@@ -113,7 +113,7 @@ static void uv__stream_osx_interrupt_select(uv_stream_t* stream) {
@@ -950,7 +950,7 @@ index b1f6359e..c6cc50e7 100644
       uv__close(queued_fds->fds[i]);
     uv__free(handle->queued_fds);
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index d89e5cd1..759cd0c2 100644
+index d89e5cd13ba0ad73913b74f5e5fe4b5f139eb650..759cd0c28518928127837ba82cbf8e761c6223d3 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -59,7 +59,7 @@ int uv_barrier_init(uv_barrier_t* barrier, unsigned int count) {
@@ -982,7 +982,7 @@ index d89e5cd1..759cd0c2 100644
     return UV_ENOMEM;
 
 diff --git a/src/unix/udp.c b/src/unix/udp.c
-index 4d985b88..a130aeaa 100644
+index 4d985b88ba9304d57aea42d9c1b4a9a9e924ddc5..a130aeaa59581176147d5f060156b57ef5ad658a 100644
 --- a/src/unix/udp.c
 +++ b/src/unix/udp.c
@@ -227,11 +227,11 @@ static int uv__udp_recvmmsg(uv_udp_t* handle, uv_buf_t* buf) {
@@ -1018,7 +1018,7 @@ index 4d985b88..a130aeaa 100644
   if (req->bufs == NULL) {
     uv__req_unregister(handle->loop, req);
 diff --git a/src/uv-common.c b/src/uv-common.c
-index efc9eb50..dfb606e3 100644
+index efc9eb50ee3b9ee204f9f16827dc800200f3d094..dfb606e3e842ccb3b2d9327e2b3048c4cfdd0314 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -54,10 +54,10 @@ static uv__allocator_t uv__allocator = {
@@ -1085,7 +1085,7 @@ index efc9eb50..dfb606e3 100644
     return NULL;
 
 diff --git a/src/win/core.c b/src/win/core.c
-index 67af93e6..0752edff 100644
+index 67af93e6571ed4324d80b6dfb2ff93db7b9cd9b1..0752edff3ebdf61e056157ef21109538f6e4b358 100644
 --- a/src/win/core.c
 +++ b/src/win/core.c
@@ -98,7 +98,8 @@ static int uv__loops_add(uv_loop_t* loop) {
@@ -1118,7 +1118,7 @@ index 67af93e6..0752edff 100644
     err = UV_ENOMEM;
     goto fail_timers_alloc;
 diff --git a/src/win/fs-event.c b/src/win/fs-event.c
-index 6758c7c7..15046731 100644
+index 6758c7c78bc1d6a5316a8ae7dc2d1e23cd0f32bc..150467313d576bfe2966b55f3d8cffa23cbb8ea3 100644
 --- a/src/win/fs-event.c
 +++ b/src/win/fs-event.c
@@ -73,7 +73,7 @@ static void uv__relative_path(const WCHAR* filename,
@@ -1140,7 +1140,7 @@ index 6758c7c7..15046731 100644
       goto short_path_done;
     }
 diff --git a/src/win/fs-fd-hash-inl.h b/src/win/fs-fd-hash-inl.h
-index 0b532af1..703a8d8f 100644
+index 0b532af12d4371c2311bd50a66913287a0716f43..703a8d8f87de1089ac8b18bd817d416d48dc442e 100644
 --- a/src/win/fs-fd-hash-inl.h
 +++ b/src/win/fs-fd-hash-inl.h
@@ -146,7 +146,7 @@ INLINE static void uv__fd_hash_add(int fd, struct uv__fd_info_s* info) {
@@ -1153,7 +1153,7 @@ index 0b532af1..703a8d8f 100644
         uv_fatal_error(ERROR_OUTOFMEMORY, "uv__malloc");
       }
 diff --git a/src/win/fs.c b/src/win/fs.c
-index 79230799..8374012f 100644
+index 792307995f60c8ac34b44c6c255102cd227354b7..8374012f0e9ee094eed5db19e5f7d12286052d70 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -285,7 +285,7 @@ static int fs__wide_to_utf8(WCHAR* w_source_ptr,
@@ -1274,7 +1274,7 @@ index 79230799..8374012f 100644
   if (req->fs.info.bufs == NULL) {
     SET_REQ_UV_ERROR(req, UV_ENOMEM, ERROR_OUTOFMEMORY);
 diff --git a/src/win/pipe.c b/src/win/pipe.c
-index 99846181..cd77061a 100644
+index 998461811fb87fafa8ffd43bb9c9f5d88f00c6f9..cd77061a079094b11350a01ddd364e15fa3078bc 100644
 --- a/src/win/pipe.c
 +++ b/src/win/pipe.c
@@ -728,7 +728,7 @@ int uv_pipe_bind(uv_pipe_t* handle, const char* name) {
@@ -1323,7 +1323,7 @@ index 99846181..cd77061a 100644
       *size = 0;
       err = UV_ENOMEM;
 diff --git a/src/win/process.c b/src/win/process.c
-index 24c63339..e857db3e 100644
+index 24c633393fd15dcf87726b174d6b027a969e0f0d..e857db3e98eb24f8de12e6b6d90ae3905cc49ce7 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -616,8 +616,8 @@ error:
@@ -1367,7 +1367,7 @@ index 24c63339..e857db3e 100644
     uv__free(dst_copy);
     return ERROR_OUTOFMEMORY;
 diff --git a/src/win/tcp.c b/src/win/tcp.c
-index b6aa4c51..4cccee42 100644
+index b6aa4c512050e012bdfa1395f0011a5371b11768..4cccee429223cbd6f7b876341982816e4998dc10 100644
 --- a/src/win/tcp.c
 +++ b/src/win/tcp.c
@@ -612,7 +612,7 @@ int uv__tcp_listen(uv_tcp_t* handle, int backlog, uv_connection_cb cb) {
@@ -1380,7 +1380,7 @@ index b6aa4c51..4cccee42 100644
       uv_fatal_error(ERROR_OUTOFMEMORY, "uv__malloc");
     }
 diff --git a/src/win/thread.c b/src/win/thread.c
-index d3b1c96b..9ad60c91 100644
+index d3b1c96b6199a7ff034d8646b76a6a21712702d8..9ad60c9164c8ff26223309a9aa388fa5e4621914 100644
 --- a/src/win/thread.c
 +++ b/src/win/thread.c
@@ -98,7 +98,7 @@ static UINT __stdcall uv__thread_start(void* arg) {
@@ -1402,7 +1402,7 @@ index d3b1c96b..9ad60c91 100644
     return UV_ENOMEM;
 
 diff --git a/src/win/util.c b/src/win/util.c
-index 99432053..c655f532 100644
+index 99432053cc3b242e514268b7aba2e2d83a9e64f2..c655f532dbcc6c63516027caf1453ca4ef817cff 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -164,7 +164,7 @@ int uv_cwd(char* buffer, size_t* size) {
--- a/upstream_utils/libuv_patches/0002-Fix-warnings.patch
+++ b/upstream_utils/libuv_patches/0002-Fix-warnings.patch
@@ -1,4 +1,4 @@
-From f7b4492d37b35a64a3a6c5bbbdb375494095b6ff Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:09:43 -0400
 Subject: [PATCH 2/9] Fix warnings
@@ -21,7 +21,7 @@ Subject: [PATCH 2/9] Fix warnings
 14 files changed, 99 insertions(+), 62 deletions(-)

 diff --git a/include/uv/win.h b/include/uv/win.h
-index 56a4cf11..10d5e8f1 100644
+index 56a4cf1151cd9262062d79c3676b83a287757426..10d5e8f169b04e9d48c87e3760320dba5cd310ce 100644
 --- a/include/uv/win.h
 +++ b/include/uv/win.h
@@ -201,11 +201,16 @@ typedef int (WSAAPI* LPFN_WSARECVFROM)
@@ -42,7 +42,7 @@ index 56a4cf11..10d5e8f1 100644
   typedef PVOID CONDITION_VARIABLE, *PCONDITION_VARIABLE;
 #endif
 diff --git a/src/idna.c b/src/idna.c
-index 93d982ca..36a39a08 100644
+index 93d982ca018f2d39d9c0ffab07998c2c637029eb..36a39a089019fb4c2a35ec84516658c392eec0a3 100644
 --- a/src/idna.c
 +++ b/src/idna.c
@@ -106,7 +106,7 @@ static int uv__idna_toascii_label(const char* s, const char* se,
@@ -55,7 +55,7 @@ index 93d982ca..36a39a08 100644
   unsigned k;
   unsigned n;
 diff --git a/src/inet.c b/src/inet.c
-index ca8b6ac8..1b190255 100644
+index ca8b6ac8b69779655f69da758aa63d810332c800..1b190255ed5f4813428dbb3ba81a50cfd26c5bf1 100644
 --- a/src/inet.c
 +++ b/src/inet.c
@@ -27,6 +27,10 @@
@@ -70,7 +70,7 @@ index ca8b6ac8..1b190255 100644
 #define UV__INET6_ADDRSTRLEN        46
 
 diff --git a/src/threadpool.c b/src/threadpool.c
-index 1241ace1..718972c3 100644
+index 1241ace1cc304c14bf1b79cc2a588c1a50ef4507..718972c33b968ad123e6c8afac230f17282830a8 100644
 --- a/src/threadpool.c
 +++ b/src/threadpool.c
@@ -27,6 +27,10 @@
@@ -85,7 +85,7 @@ index 1241ace1..718972c3 100644
 
 static uv_once_t once = UV_ONCE_INIT;
 diff --git a/src/unix/core.c b/src/unix/core.c
-index 6353b0e3..223c5513 100644
+index 6353b0e3cc9448aa35dc2ccc9b259277b3fae9a5..223c55131b1ca01696792d9305ab33f0d21af73c 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -544,6 +544,16 @@ int uv__accept(int sockfd) {
@@ -117,7 +117,7 @@ index 6353b0e3..223c5513 100644
 #endif
 #pragma GCC diagnostic pop
 diff --git a/src/unix/darwin.c b/src/unix/darwin.c
-index 5fbf7342..eeb35720 100644
+index 5fbf734218fa17cc61c03402c8b1dd6b66110ecb..eeb35720f55bf26363a064443bd02fb9aae682a4 100644
 --- a/src/unix/darwin.c
 +++ b/src/unix/darwin.c
@@ -253,64 +253,68 @@ static int uv__get_cpu_speed(uint64_t* speed) {
@@ -241,7 +241,7 @@ index 5fbf7342..eeb35720 100644
 out:
   if (core_foundation_handle != NULL)
 diff --git a/src/unix/internal.h b/src/unix/internal.h
-index cee35c21..f9d1666d 100644
+index cee35c2106aed2990e28ab7d32335061fe7d6d47..f9d1666d8b2104b7437f11c4e0d9c4ae82ff0e31 100644
 --- a/src/unix/internal.h
 +++ b/src/unix/internal.h
@@ -312,8 +312,8 @@ UV_UNUSED(static void uv__update_time(uv_loop_t* loop)) {
@@ -256,7 +256,7 @@ index cee35c21..f9d1666d 100644
   s = strrchr(path, '/');
   if (s == NULL)
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index 759cd0c2..64726bd6 100644
+index 759cd0c28518928127837ba82cbf8e761c6223d3..64726bd618b930e1aa7e1de3cbceb8aa712ff617 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -244,12 +244,6 @@ int uv_thread_create_ex(uv_thread_t* tid,
@@ -273,7 +273,7 @@ index 759cd0c2..64726bd6 100644
       params->flags & UV_THREAD_HAS_STACK_SIZE ? params->stack_size : 0;
 
 diff --git a/src/uv-common.c b/src/uv-common.c
-index dfb606e3..49026c03 100644
+index dfb606e3e842ccb3b2d9327e2b3048c4cfdd0314..49026c03c53a0779a051b8f6bd5809961f5c54e2 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -758,6 +758,10 @@ void uv__fs_readdir_cleanup(uv_fs_t* req) {
@@ -299,7 +299,7 @@ index dfb606e3..49026c03 100644
 static uv_loop_t default_loop_struct;
 static uv_loop_t* default_loop_ptr;
 diff --git a/src/win/fs-event.c b/src/win/fs-event.c
-index 15046731..3244a4e4 100644
+index 150467313d576bfe2966b55f3d8cffa23cbb8ea3..3244a4e4320d7ce98f226b49b2634c65de89c213 100644
 --- a/src/win/fs-event.c
 +++ b/src/win/fs-event.c
@@ -19,6 +19,8 @@
@@ -312,7 +312,7 @@ index 15046731..3244a4e4 100644
 #include <errno.h>
 #include <stdio.h>
 diff --git a/src/win/fs.c b/src/win/fs.c
-index 8374012f..f71b3c04 100644
+index 8374012f0e9ee094eed5db19e5f7d12286052d70..f71b3c04487a949690fdfd8a6975fd8648acc793 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -19,6 +19,8 @@
@@ -325,7 +325,7 @@ index 8374012f..f71b3c04 100644
 #include <stdlib.h>
 #include <direct.h>
 diff --git a/src/win/pipe.c b/src/win/pipe.c
-index cd77061a..f413a72d 100644
+index cd77061a079094b11350a01ddd364e15fa3078bc..f413a72dab5c9d58bfbc768152314dc347f7469d 100644
 --- a/src/win/pipe.c
 +++ b/src/win/pipe.c
@@ -19,6 +19,8 @@
@@ -338,7 +338,7 @@ index cd77061a..f413a72d 100644
 #include <io.h>
 #include <stdio.h>
 diff --git a/src/win/process.c b/src/win/process.c
-index e857db3e..a49016f6 100644
+index e857db3e98eb24f8de12e6b6d90ae3905cc49ce7..a49016f65601c0127b4c0ba5b538e2556314eb46 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -19,6 +19,8 @@
@@ -351,7 +351,7 @@ index e857db3e..a49016f6 100644
 #include <io.h>
 #include <stdio.h>
 diff --git a/src/win/tty.c b/src/win/tty.c
-index 267ca645..d7522668 100644
+index 267ca64519963ff87b2404f08a60c111e25b89c2..d75226681c2653dc2a5118756b72e0b601cf9701 100644
 --- a/src/win/tty.c
 +++ b/src/win/tty.c
@@ -19,6 +19,8 @@
--- a/upstream_utils/libuv_patches/0003-Preprocessor-cleanup.patch
+++ b/upstream_utils/libuv_patches/0003-Preprocessor-cleanup.patch
@@ -1,4 +1,4 @@
-From dec4f95751a103f132e9674adf184188ec69176f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:19:14 -0400
 Subject: [PATCH 3/9] Preprocessor cleanup
@@ -15,7 +15,7 @@ Subject: [PATCH 3/9] Preprocessor cleanup
 8 files changed, 16 insertions(+), 30 deletions(-)

 diff --git a/include/uv.h b/include/uv.h
-index ee1c94cc..dbaeb1e9 100644
+index ee1c94ccd389915ea7572cce044256a7788025ad..dbaeb1e9dcca2f5170221b14494dba18c6425f6d 100644
 --- a/include/uv.h
 +++ b/include/uv.h
@@ -23,9 +23,6 @@
@@ -67,7 +67,7 @@ index ee1c94cc..dbaeb1e9 100644
 -#endif
 #endif /* UV_H */
 diff --git a/include/uv/unix.h b/include/uv/unix.h
-index 420be86c..256fef37 100644
+index 420be86c6f9984486c6420ff710c9dbcad09e411..256fef37692da6c5dc9f7bb7d21c576b41a36b8c 100644
 --- a/include/uv/unix.h
 +++ b/include/uv/unix.h
@@ -47,14 +47,6 @@
@@ -86,7 +86,7 @@ index 420be86c..256fef37 100644
 # include "uv/darwin.h"
 #elif defined(__DragonFly__)       || \
 diff --git a/include/uv/win.h b/include/uv/win.h
-index 10d5e8f1..0a33366f 100644
+index 10d5e8f169b04e9d48c87e3760320dba5cd310ce..0a33366f3f4b51dbf70691623efe1343ee6b2547 100644
 --- a/include/uv/win.h
 +++ b/include/uv/win.h
@@ -60,11 +60,7 @@ typedef struct pollfd {
@@ -103,7 +103,7 @@ index 10d5e8f1..0a33366f 100644
 #include "uv/tree.h"
 #include "uv/threadpool.h"
 diff --git a/src/unix/internal.h b/src/unix/internal.h
-index f9d1666d..2b654157 100644
+index f9d1666d8b2104b7437f11c4e0d9c4ae82ff0e31..2b6541576bdc977e3b5a15dca4d3ad4410b4a54f 100644
 --- a/src/unix/internal.h
 +++ b/src/unix/internal.h
@@ -192,6 +192,8 @@ struct uv__stream_queued_fds_s {
@@ -116,7 +116,7 @@ index f9d1666d..2b654157 100644
 
 /* core */
 diff --git a/src/win/fs.c b/src/win/fs.c
-index f71b3c04..71c9b169 100644
+index f71b3c04487a949690fdfd8a6975fd8648acc793..71c9b1693bb17e168fb04192c8939c25e03a617d 100644
 --- a/src/win/fs.c
 +++ b/src/win/fs.c
@@ -38,6 +38,7 @@
@@ -128,7 +128,7 @@ index f71b3c04..71c9b169 100644
 #define UV_FS_FREE_PATHS         0x0002
 #define UV_FS_FREE_PTR           0x0008
 diff --git a/src/win/tty.c b/src/win/tty.c
-index d7522668..9753784d 100644
+index d75226681c2653dc2a5118756b72e0b601cf9701..9753784dc0118a12ef45060bf9af673bfaa838d0 100644
 --- a/src/win/tty.c
 +++ b/src/win/tty.c
@@ -42,6 +42,8 @@
@@ -141,7 +141,7 @@ index d7522668..9753784d 100644
 # define InterlockedOr _InterlockedOr
 #endif
 diff --git a/src/win/util.c b/src/win/util.c
-index c655f532..7a5dd2ef 100644
+index c655f532dbcc6c63516027caf1453ca4ef817cff..7a5dd2ef99ba335a146635b61f8d3eba7ff5ef75 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -63,12 +63,20 @@
@@ -166,7 +166,7 @@ index c655f532..7a5dd2ef 100644
 static uint64_t hrtime_frequency_ = 0;
 
 diff --git a/src/win/winsock.c b/src/win/winsock.c
-index a68b0953..7843e9f1 100644
+index a68b095366a78e78675b49a078749f45dbad6015..7843e9f13321c32419cebaacde82d30f471e11d7 100644
 --- a/src/win/winsock.c
 +++ b/src/win/winsock.c
@@ -25,6 +25,7 @@
--- a/upstream_utils/libuv_patches/0004-Cleanup-problematic-language.patch
+++ b/upstream_utils/libuv_patches/0004-Cleanup-problematic-language.patch
@@ -1,4 +1,4 @@
-From 2d06f216dec3abbeaaabb465b945e09856d1b687 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:24:47 -0400
 Subject: [PATCH 4/9] Cleanup problematic language
@@ -8,7 +8,7 @@ Subject: [PATCH 4/9] Cleanup problematic language
 1 file changed, 11 insertions(+), 10 deletions(-)

 diff --git a/src/unix/tty.c b/src/unix/tty.c
-index b4150525..ed81e26a 100644
+index b41505258ff822ef31c62f4a44438b5525a02065..ed81e26a8dcbad52bc31fbd1964ab6de4ea85d13 100644
 --- a/src/unix/tty.c
 +++ b/src/unix/tty.c
@@ -79,7 +79,7 @@ int uv__tcsetattr(int fd, int how, const struct termios *term) {
--- a/upstream_utils/libuv_patches/0005-Use-roborio-time.patch
+++ b/upstream_utils/libuv_patches/0005-Use-roborio-time.patch
@@ -1,4 +1,4 @@
-From 690d487df2e60a01ab811aba34587466a38caead Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:26:03 -0400
 Subject: [PATCH 5/9] Use roborio time
@@ -8,7 +8,7 @@ Subject: [PATCH 5/9] Use roborio time
 1 file changed, 8 insertions(+)

 diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
-index 85f3fc01..12ed7ff1 100644
+index 85f3fc0170288577d2e39030dc728de9a694a752..12ed7ff1129ebeb1c11beeca584bd0519c1e1fe6 100644
 --- a/src/unix/linux-core.c
 +++ b/src/unix/linux-core.c
@@ -67,6 +67,10 @@
--- a/upstream_utils/libuv_patches/0006-Style-comments-cleanup.patch
+++ b/upstream_utils/libuv_patches/0006-Style-comments-cleanup.patch
@@ -1,4 +1,4 @@
-From ad60aa8e1c03cc5f0c88159d37f63b0c063927c7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 26 Apr 2022 15:28:52 -0400
 Subject: [PATCH 6/9] Style / comments cleanup
@@ -13,7 +13,7 @@ Subject: [PATCH 6/9] Style / comments cleanup
 6 files changed, 5 insertions(+), 3 deletions(-)

 diff --git a/src/fs-poll.c b/src/fs-poll.c
-index 5a39daed..1a7ca70d 100644
+index 5a39daed095502b2db34f23fcaf0ab04f31f96ff..1a7ca70d62c71f6eaef2b9985796cc46a6438869 100644
 --- a/src/fs-poll.c
 +++ b/src/fs-poll.c
@@ -34,6 +34,7 @@
@@ -25,7 +25,7 @@ index 5a39daed..1a7ca70d 100644
   uv_fs_poll_t* parent_handle;
   int busy_polling;
 diff --git a/src/unix/core.c b/src/unix/core.c
-index 223c5513..4c23f608 100644
+index 223c55131b1ca01696792d9305ab33f0d21af73c..4c23f608c842bdcb09d621374a0ccb0bda79166e 100644
 --- a/src/unix/core.c
 +++ b/src/unix/core.c
@@ -544,6 +544,7 @@ int uv__accept(int sockfd) {
@@ -37,7 +37,7 @@ index 223c5513..4c23f608 100644
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
 diff --git a/src/unix/thread.c b/src/unix/thread.c
-index 64726bd6..392a0715 100644
+index 64726bd618b930e1aa7e1de3cbceb8aa712ff617..392a0715a85074576ba89d2a415ca55037edf347 100644
 --- a/src/unix/thread.c
 +++ b/src/unix/thread.c
@@ -85,7 +85,6 @@ error2:
@@ -65,7 +65,7 @@ index 64726bd6..392a0715 100644
   struct _uv_barrier* b;
 
 diff --git a/src/uv-common.c b/src/uv-common.c
-index 49026c03..c9a32c03 100644
+index 49026c03c53a0779a051b8f6bd5809961f5c54e2..c9a32c0336777aa3a41cac7cb7a4c23ad3f677da 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -758,6 +758,7 @@ void uv__fs_readdir_cleanup(uv_fs_t* req) {
@@ -77,7 +77,7 @@ index 49026c03..c9a32c03 100644
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wvarargs"
 diff --git a/src/win/process.c b/src/win/process.c
-index a49016f6..8e7835a5 100644
+index a49016f65601c0127b4c0ba5b538e2556314eb46..8e7835a5e90f9fae89fc9a9be2f6945e2814dfa7 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
@@ -35,7 +35,6 @@
@@ -89,7 +89,7 @@ index a49016f6..8e7835a5 100644
 
 
 diff --git a/src/win/winsock.c b/src/win/winsock.c
-index 7843e9f1..cda82bc3 100644
+index 7843e9f13321c32419cebaacde82d30f471e11d7..cda82bc33c2c6e3dbfa9d978b5b40476228452bd 100644
 --- a/src/win/winsock.c
 +++ b/src/win/winsock.c
@@ -25,6 +25,7 @@
--- a/upstream_utils/libuv_patches/0007-Squelch-GCC-12.1-warnings.patch
+++ b/upstream_utils/libuv_patches/0007-Squelch-GCC-12.1-warnings.patch
@@ -1,4 +1,4 @@
-From ee8a72764f602928cc08d16d661602c0aefde050 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Tue, 17 May 2022 21:36:57 -0700
 Subject: [PATCH 7/9] Squelch GCC 12.1 warnings
@@ -9,7 +9,7 @@ Subject: [PATCH 7/9] Squelch GCC 12.1 warnings
 2 files changed, 18 insertions(+)

 diff --git a/src/unix/stream.c b/src/unix/stream.c
-index c6cc50e7..fa25812a 100644
+index c6cc50e709989f30f4393b509d859663717d1770..fa25812a6b6e9b3c221e8ec64db0c54db476fbb0 100644
 --- a/src/unix/stream.c
 +++ b/src/unix/stream.c
@@ -938,7 +938,16 @@ static void uv__write_callbacks(uv_stream_t* stream) {
@@ -30,7 +30,7 @@ index c6cc50e7..fa25812a 100644
   while (!QUEUE_EMPTY(&pq)) {
     /* Pop a req off write_completed_queue. */
 diff --git a/src/uv-common.c b/src/uv-common.c
-index c9a32c03..8ab600df 100644
+index c9a32c0336777aa3a41cac7cb7a4c23ad3f677da..8ab600dfdbcc8fda40f13126f17013f1c39da838 100644
 --- a/src/uv-common.c
 +++ b/src/uv-common.c
@@ -504,7 +504,16 @@ void uv_walk(uv_loop_t* loop, uv_walk_cb walk_cb, void* arg) {
--- a/upstream_utils/libuv_patches/0008-Fix-Win32-warning-suppression-pragma.patch
+++ b/upstream_utils/libuv_patches/0008-Fix-Win32-warning-suppression-pragma.patch
@@ -1,4 +1,4 @@
-From 49d5945dde1d182fd2d75cdf550120951796cb1f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Sat, 21 May 2022 22:58:06 -0700
 Subject: [PATCH 8/9] Fix Win32 warning suppression pragma
@@ -8,7 +8,7 @@ Subject: [PATCH 8/9] Fix Win32 warning suppression pragma
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/win/util.c b/src/win/util.c
-index 7a5dd2ef..d9888aec 100644
+index 7a5dd2ef99ba335a146635b61f8d3eba7ff5ef75..d9888aec7959de4ec49377a71b0dc931e89e5f4e 100644
 --- a/src/win/util.c
 +++ b/src/win/util.c
@@ -1750,7 +1750,7 @@ int uv_os_uname(uv_utsname_t* buffer) {
--- a/upstream_utils/libuv_patches/0009-Avoid-unused-variable-warning-on-Mac.patch
+++ b/upstream_utils/libuv_patches/0009-Avoid-unused-variable-warning-on-Mac.patch
@@ -1,4 +1,4 @@
-From d83eaeff1f53bc3dede8a46a05cdb3ca94d1aac4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Johnson <johnson.peter@gmail.com>
 Date: Sun, 5 Jun 2022 15:40:35 -0700
 Subject: [PATCH 9/9] Avoid unused variable warning on Mac
@@ -8,7 +8,7 @@ Subject: [PATCH 9/9] Avoid unused variable warning on Mac
 1 file changed, 1 insertion(+)

 diff --git a/src/unix/darwin.c b/src/unix/darwin.c
-index eeb35720..ed51a6ad 100644
+index eeb35720f55bf26363a064443bd02fb9aae682a4..ed51a6ad61ca70b06c5e3c5b3a12f1109ac47083 100644
 --- a/src/unix/darwin.c
 +++ b/src/unix/darwin.c
@@ -257,6 +257,7 @@ static int uv__get_cpu_speed(uint64_t* speed) {
--- a/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch
+++ b/upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch
@@ -1,4 +1,4 @@
-From 3d09b3d7b78ffc037a32725cc4002976b908d965 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 20:50:26 -0400
 Subject: [PATCH 01/28] Fix spelling/language errors
@@ -8,7 +8,7 @@ Subject: [PATCH 01/28] Fix spelling/language errors
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/llvm/include/llvm/Support/ErrorHandling.h b/llvm/include/llvm/Support/ErrorHandling.h
-index f980510d3..6791df6be 100644
+index f980510d37f0644bceea5b54e1469625b8115c97..6791df6be3362fa199556ecb2131f971cfef5210 100644
 --- a/llvm/include/llvm/Support/ErrorHandling.h
 +++ b/llvm/include/llvm/Support/ErrorHandling.h
@@ -44,7 +44,7 @@ namespace llvm {
--- 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,4 +1,4 @@
-From afca62cd2f1616bcf2e648dc121a057d59168424 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:09:18 -0400
 Subject: [PATCH 02/28] Remove StringRef, ArrayRef, and Optional
@@ -34,7 +34,7 @@ Subject: [PATCH 02/28] Remove StringRef, ArrayRef, and Optional
 27 files changed, 248 insertions(+), 304 deletions(-)

 diff --git a/llvm/include/llvm/ADT/PointerUnion.h b/llvm/include/llvm/ADT/PointerUnion.h
-index 04d566bbc..1d4cc747c 100644
+index 04d566bbc75e01d4bd648273e1a299de9e1d97b6..1d4cc747ce320e27004170fb0aa76323d2ac22b1 100644
 --- a/llvm/include/llvm/ADT/PointerUnion.h
 +++ b/llvm/include/llvm/ADT/PointerUnion.h
@@ -17,7 +17,6 @@
@@ -46,7 +46,7 @@ index 04d566bbc..1d4cc747c 100644
 #include <algorithm>
 #include <cassert>
 diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
-index 0eed85449..bfe93e997 100644
+index 0eed85449c9d6bf88068c8b5c0f5f10ed9b9ff7b..bfe93e997fc896e82a9b96219967f754df82bcfb 100644
 --- a/llvm/include/llvm/ADT/SmallSet.h
 +++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -14,15 +14,14 @@
@@ -97,7 +97,7 @@ index 0eed85449..bfe93e997 100644
 
   template <typename IterT>
 diff --git a/llvm/include/llvm/ADT/SmallString.h b/llvm/include/llvm/ADT/SmallString.h
-index 874968f0a..50cbdade4 100644
+index 874968f0a13f3e7de07caf1c42794b36e7a5c237..50cbdade405770e80a6a45521a446a28e4177d11 100644
 --- a/llvm/include/llvm/ADT/SmallString.h
 +++ b/llvm/include/llvm/ADT/SmallString.h
@@ -15,8 +15,9 @@
@@ -344,7 +344,7 @@ index 874968f0a..50cbdade4 100644
     return *this;
   }
 diff --git a/llvm/include/llvm/ADT/StringMap.h b/llvm/include/llvm/ADT/StringMap.h
-index 23248093c..8747cdb35 100644
+index 23248093c67e25505e980bc99c067f8e4aff6fd4..8747cdb353a89952e242ccfa5ea8a3e68571d456 100644
 --- a/llvm/include/llvm/ADT/StringMap.h
 +++ b/llvm/include/llvm/ADT/StringMap.h
@@ -60,12 +60,12 @@ protected:
@@ -485,7 +485,7 @@ index 23248093c..8747cdb35 100644
 
 } // end namespace llvm
 diff --git a/llvm/include/llvm/ADT/StringMapEntry.h b/llvm/include/llvm/ADT/StringMapEntry.h
-index 6e13c8618..39976a02b 100644
+index 6e13c8618c851d32466f4b44908ffc9d044140f8..39976a02b5ecbbf5d08a6073708cac0a5aef447d 100644
 --- a/llvm/include/llvm/ADT/StringMapEntry.h
 +++ b/llvm/include/llvm/ADT/StringMapEntry.h
@@ -16,9 +16,8 @@
@@ -563,7 +563,7 @@ index 6e13c8618..39976a02b 100644
     return new (StringMapEntryBase::allocateWithKey(
         sizeof(StringMapEntry), alignof(StringMapEntry), key, allocator))
 diff --git a/llvm/include/llvm/Support/Chrono.h b/llvm/include/llvm/Support/Chrono.h
-index 9c2bd45d2..a7dea19d9 100644
+index 9c2bd45d2803e56ed316d8552d899d87f2fbbb07..a7dea19d9193bcff4bc6b553b80a10b2bc7b64af 100644
 --- a/llvm/include/llvm/Support/Chrono.h
 +++ b/llvm/include/llvm/Support/Chrono.h
@@ -70,7 +70,7 @@ raw_ostream &operator<<(raw_ostream &OS, sys::TimePoint<> TP);
@@ -606,7 +606,7 @@ index 9c2bd45d2..a7dea19d9 100644
     bool show_unit = consumeShowUnit(Style);
 
 diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
-index 80b2dfaec..f5d726ec8 100644
+index 80b2dfaec4273a9831adc92ffa1a2b2059d9659f..f5d726ec8a2c4c39a31a6a557591a99a64caea3a 100644
 --- a/llvm/include/llvm/Support/Compiler.h
 +++ b/llvm/include/llvm/Support/Compiler.h
@@ -312,7 +312,7 @@
@@ -619,7 +619,7 @@ index 80b2dfaec..f5d726ec8 100644
 #define LLVM_GSL_POINTER [[gsl::Pointer]]
 #else
 diff --git a/llvm/include/llvm/Support/ConvertUTF.h b/llvm/include/llvm/Support/ConvertUTF.h
-index 374cdb907..7f1527f51 100644
+index 374cdb907fdc2c41912c2fa606b36e108259fa31..7f1527f51cdf59238607becfb2fdaf4afc91d4b6 100644
 --- a/llvm/include/llvm/Support/ConvertUTF.h
 +++ b/llvm/include/llvm/Support/ConvertUTF.h
@@ -89,12 +89,12 @@
@@ -716,7 +716,7 @@ index 374cdb907..7f1527f51 100644
                             SmallVectorImpl<char> &utf8);
 /// Convert from UTF16 to the current code page used in the system
 diff --git a/llvm/include/llvm/Support/DJB.h b/llvm/include/llvm/Support/DJB.h
-index 8a04a324a..8737cd144 100644
+index 8a04a324a5dc6cccaaa6af7b0e9b340f0755587e..8737cd144c37f9041a781a74e9f2b43384e85761 100644
 --- a/llvm/include/llvm/Support/DJB.h
 +++ b/llvm/include/llvm/Support/DJB.h
@@ -13,13 +13,13 @@
@@ -737,7 +737,7 @@ index 8a04a324a..8737cd144 100644
   return H;
 }
 diff --git a/llvm/include/llvm/Support/ErrorHandling.h b/llvm/include/llvm/Support/ErrorHandling.h
-index 6791df6be..3f726d40b 100644
+index 6791df6be3362fa199556ecb2131f971cfef5210..3f726d40ba7b8987c504cc3d933b137cfbc895d3 100644
 --- a/llvm/include/llvm/Support/ErrorHandling.h
 +++ b/llvm/include/llvm/Support/ErrorHandling.h
@@ -15,10 +15,10 @@
@@ -769,7 +769,7 @@ index 6791df6be..3f726d40b 100644
 
 /// Installs a new bad alloc error handler that should be used whenever a
 diff --git a/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h b/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
-index f7f2d4e54..b5e321b5f 100644
+index f7f2d4e54e705d6f29812dc93d1fb0a3ca2dee12..b5e321b5f74ce35940649b9d1342b3cdf0c4931f 100644
 --- a/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
 +++ b/llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
@@ -35,8 +35,8 @@ public:
@@ -793,7 +793,7 @@ index f7f2d4e54..b5e321b5f 100644
   BufferKind getBufferKind() const override { return MemoryBuffer_Malloc; }
 
 diff --git a/llvm/include/llvm/Support/VersionTuple.h b/llvm/include/llvm/Support/VersionTuple.h
-index 1a1072d22..3d6573bf5 100644
+index 1a1072d228f1164b22fa66ce9d020e9c6a5b1935..3d6573bf5a96e115ef264c7885b91aa3b32ac91e 100644
 --- a/llvm/include/llvm/Support/VersionTuple.h
 +++ b/llvm/include/llvm/Support/VersionTuple.h
@@ -16,14 +16,13 @@
@@ -855,7 +855,7 @@ index 1a1072d22..3d6573bf5 100644
 
 /// Print a version number.
 diff --git a/llvm/include/llvm/Support/Windows/WindowsSupport.h b/llvm/include/llvm/Support/Windows/WindowsSupport.h
-index 917822678..180803fbd 100644
+index 917822678e979690dc09173510f8c62569e467f1..180803fbd3104ddf32c183684f226954c4fb8b0e 100644
 --- a/llvm/include/llvm/Support/Windows/WindowsSupport.h
 +++ b/llvm/include/llvm/Support/Windows/WindowsSupport.h
@@ -35,8 +35,6 @@
@@ -877,7 +877,7 @@ index 917822678..180803fbd 100644
 
 template <typename HandleTraits>
 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index 58adb41cb..9a1dd7a60 100644
+index 58adb41cb0ef6e57011694bc678c9ae13b416904..9a1dd7a6070c20609660bfc63db10a509e54fe2f 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -14,9 +14,7 @@
@@ -1005,7 +1005,7 @@ index 58adb41cb..9a1dd7a60 100644
 
 } // end namespace llvm
 diff --git a/llvm/lib/Support/ConvertUTFWrapper.cpp b/llvm/lib/Support/ConvertUTFWrapper.cpp
-index 392c4c489..396ab0c65 100644
+index 392c4c4890e1666714acaa3630276515e4dec176..396ab0c655ed50707c8725ebd22b1f8be5e0e030 100644
 --- a/llvm/lib/Support/ConvertUTFWrapper.cpp
 +++ b/llvm/lib/Support/ConvertUTFWrapper.cpp
@@ -6,24 +6,24 @@
@@ -1120,7 +1120,7 @@ index 392c4c489..396ab0c65 100644
         Result);
   } else if (sizeof(wchar_t) == 4) {
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index 80c0e0043..8ae8fb8b4 100644
+index 80c0e00439a58078742fe75569a980ea3dd9bdf1..8ae8fb8b40079a5da59f4008b9dc8de258d8cb5a 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -14,7 +14,6 @@
@@ -1169,7 +1169,7 @@ index 80c0e0043..8ae8fb8b4 100644
     (void)written; // If something went wrong, we deliberately just give up.
   }
 diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp
-index 8cafbc7fa..8bad715e4 100644
+index 8cafbc7fad0de3fa672f747feffbf933e88d53ca..8bad715e45cdf894e811020f3c146fc234e8e9f0 100644
 --- a/llvm/lib/Support/SmallVector.cpp
 +++ b/llvm/lib/Support/SmallVector.cpp
@@ -11,7 +11,6 @@
@@ -1199,7 +1199,7 @@ index 8cafbc7fa..8bad715e4 100644
 }
 
 diff --git a/llvm/lib/Support/StringMap.cpp b/llvm/lib/Support/StringMap.cpp
-index 012c785b4..317f4ee43 100644
+index 012c785b4351d13183205099acb214df382510e3..317f4ee43bced6d76031babfae043befc42608b4 100644
 --- a/llvm/lib/Support/StringMap.cpp
 +++ b/llvm/lib/Support/StringMap.cpp
@@ -70,7 +70,7 @@ void StringMapImpl::init(unsigned InitSize) {
@@ -1256,7 +1256,7 @@ index 012c785b4..317f4ee43 100644
   if (Bucket == -1)
     return nullptr;
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 69d4fe96b..e4c318eb8 100644
+index 69d4fe96bee898967e1637d495283bc0281ec255..e4c318eb8265c588f1d84dd1abeafc7fd0d055de 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -159,7 +159,7 @@ raw_ostream &raw_ostream::write_uuid(const uuid_t UUID) {
@@ -1355,7 +1355,7 @@ index 69d4fe96b..e4c318eb8 100644
   if (OutputFileName == "-")
     return Write(outs());
 diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp
-index 4dd314c5c..e505b1907 100644
+index 4dd314c5c90191f733676f037fb476e96f284380..e505b19070bfdc9af45e0c2ae017e6ea50d81c98 100644
 --- a/llvm/unittests/ADT/DenseMapTest.cpp
 +++ b/llvm/unittests/ADT/DenseMapTest.cpp
@@ -481,31 +481,6 @@ TEST(DenseMapCustomTest, ReserveTest) {
@@ -1391,7 +1391,7 @@ index 4dd314c5c..e505b1907 100644
 // In the latter case, "a" == 0, "b" == 1 and so on.
 struct TestDenseMapInfo {
 diff --git a/llvm/unittests/ADT/FunctionExtrasTest.cpp b/llvm/unittests/ADT/FunctionExtrasTest.cpp
-index fc856a976..aff9d61c7 100644
+index fc856a976946bf6decda9b6724cac66afc7bdcd6..aff9d61c7f0d48834123b04b74a2e4f7c86a56d8 100644
 --- a/llvm/unittests/ADT/FunctionExtrasTest.cpp
 +++ b/llvm/unittests/ADT/FunctionExtrasTest.cpp
@@ -249,23 +249,23 @@ TEST(UniqueFunctionTest, Const) {
@@ -1425,7 +1425,7 @@ index fc856a976..aff9d61c7 100644
 TEST(UniqueFunctionTest, SFINAE) {
   EXPECT_EQ("not a function", returns("boo!"));
 diff --git a/llvm/unittests/ADT/HashingTest.cpp b/llvm/unittests/ADT/HashingTest.cpp
-index bb19a5699..0634767a4 100644
+index bb19a569999f2dc3cae4eaff07d4da73c13ff6fd..0634767a456345a980fa43b67aa1937be1fcb8ae 100644
 --- a/llvm/unittests/ADT/HashingTest.cpp
 +++ b/llvm/unittests/ADT/HashingTest.cpp
@@ -277,7 +277,7 @@ TEST(HashingTest, HashCombineRangeGoldenTest) {
@@ -1438,7 +1438,7 @@ index bb19a5699..0634767a4 100644
 #if 0 // Enable this to generate paste-able text for the above structure.
     std::string member_str = "\"" + str.str() + "\",";
 diff --git a/llvm/unittests/ADT/SmallPtrSetTest.cpp b/llvm/unittests/ADT/SmallPtrSetTest.cpp
-index 414298c4e..6f3c94eed 100644
+index 414298c4e67df194dd69bbb674908b920fdfd828..6f3c94eed2737d4e35995454ec7d007cedb1235a 100644
 --- a/llvm/unittests/ADT/SmallPtrSetTest.cpp
 +++ b/llvm/unittests/ADT/SmallPtrSetTest.cpp
@@ -12,7 +12,6 @@
@@ -1450,7 +1450,7 @@ index 414298c4e..6f3c94eed 100644
 #include "gtest/gtest.h"
 
 diff --git a/llvm/unittests/ADT/SmallStringTest.cpp b/llvm/unittests/ADT/SmallStringTest.cpp
-index b207f582e..bee3875d1 100644
+index b207f582e9197fa9ee0f1676b2d3f1f62333b144..bee3875d11c9b793d79ac442312559b11dba9f5f 100644
 --- a/llvm/unittests/ADT/SmallStringTest.cpp
 +++ b/llvm/unittests/ADT/SmallStringTest.cpp
@@ -50,43 +50,43 @@ TEST_F(SmallStringTest, AssignRepeated) {
@@ -1589,7 +1589,7 @@ index b207f582e..bee3875d1 100644
   theString = "hellx xello hell ello world foo bar hello";
   EXPECT_EQ(36U, theString.find("hello"));
 diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp
-index 3fbea5299..fe827546a 100644
+index 3fbea5299501bdb2c36ceb2caf8f2cbda40efdde..fe827546aef2c26b8c5372b2643e84d60683a19a 100644
 --- a/llvm/unittests/ADT/SmallVectorTest.cpp
 +++ b/llvm/unittests/ADT/SmallVectorTest.cpp
@@ -11,7 +11,7 @@
@@ -1627,7 +1627,7 @@ index 3fbea5299..fe827546a 100644
 class SmallVectorReferenceInvalidationTest : public SmallVectorTestBase {
 protected:
 diff --git a/llvm/unittests/ADT/StringMapTest.cpp b/llvm/unittests/ADT/StringMapTest.cpp
-index 817fec6c3..86907ab61 100644
+index 817fec6c37a2a6a443e9cee9a4322b15c10da2b7..86907ab61a2c24effcef3b88c7849482eadd314d 100644
 --- a/llvm/unittests/ADT/StringMapTest.cpp
 +++ b/llvm/unittests/ADT/StringMapTest.cpp
@@ -7,8 +7,6 @@
@@ -1753,7 +1753,7 @@ index 817fec6c3..86907ab61 100644
 
   // Test that the entry can hold at least max size_t.
 diff --git a/llvm/unittests/Support/ConvertUTFTest.cpp b/llvm/unittests/Support/ConvertUTFTest.cpp
-index 7bda6ea28..9c798437a 100644
+index 7bda6ea28ad69c579b29bb656bf019d3b5a4b358..9c798437a12d971a9206cbaff546ebc46c70f0d8 100644
 --- a/llvm/unittests/Support/ConvertUTFTest.cpp
 +++ b/llvm/unittests/Support/ConvertUTFTest.cpp
@@ -7,7 +7,6 @@
--- 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,4 +1,4 @@
-From 5fccde024bea117d90d215390f09c7d779195ea5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:12:41 -0400
 Subject: [PATCH 03/28] Wrap std::min/max calls in parens, for Windows warnings
@@ -12,7 +12,7 @@ Subject: [PATCH 03/28] Wrap std::min/max calls in parens, for Windows warnings
 5 files changed, 21 insertions(+), 21 deletions(-)

 diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
-index 7673b66ca..975c3b97e 100644
+index 7673b66ca42a0c9c16b7cadd6cc21c14a4d21d43..975c3b97e2cbf09225299c421406ad2bbe4ef125 100644
 --- a/llvm/include/llvm/ADT/DenseMap.h
 +++ b/llvm/include/llvm/ADT/DenseMap.h
@@ -390,7 +390,7 @@ protected:
@@ -34,7 +34,7 @@ index 7673b66ca..975c3b97e 100644
       this->BaseT::initEmpty();
       return;
 diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
-index a4a790323..8686f7bb5 100644
+index a4a790323a6b80950de087f623668ab6ad3d935c..8686f7bb5407611979e8cecfe9da292d3a4b4160 100644
 --- a/llvm/include/llvm/ADT/SmallVector.h
 +++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -49,12 +49,12 @@ protected:
@@ -89,7 +89,7 @@ index a4a790323..8686f7bb5 100644
       std::uninitialized_fill_n(this->end(), NumElts - this->size(), Elt);
     else if (NumElts < this->size())
 diff --git a/llvm/include/llvm/Support/ConvertUTF.h b/llvm/include/llvm/Support/ConvertUTF.h
-index 7f1527f51..b085c8a17 100644
+index 7f1527f51cdf59238607becfb2fdaf4afc91d4b6..b085c8a179e8767a258f9feafc8d1111828f10b1 100644
 --- a/llvm/include/llvm/Support/ConvertUTF.h
 +++ b/llvm/include/llvm/Support/ConvertUTF.h
@@ -112,7 +112,7 @@ namespace llvm {
@@ -102,7 +102,7 @@ index 7f1527f51..b085c8a17 100644
 /* Some fundamental constants */
 #define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
 diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
-index 753b1998c..db9fbc148 100644
+index 753b1998c40c0f9d2a178b5e748d620ffd23ac7e..db9fbc148ae3064faa94a23713d1def3b466e899 100644
 --- a/llvm/include/llvm/Support/MathExtras.h
 +++ b/llvm/include/llvm/Support/MathExtras.h
@@ -97,7 +97,7 @@ template <typename T, std::size_t SizeOfT> struct TrailingZerosCounter {
@@ -194,7 +194,7 @@ index 753b1998c..db9fbc148 100644
 
 } // End llvm namespace
 diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp
-index 8bad715e4..a2b4899e1 100644
+index 8bad715e45cdf894e811020f3c146fc234e8e9f0..a2b4899e1ffe0ae19d236f43e2e2e2fe1db14110 100644
 --- a/llvm/lib/Support/SmallVector.cpp
 +++ b/llvm/lib/Support/SmallVector.cpp
@@ -104,7 +104,7 @@ static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
--- 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,4 +1,4 @@
-From 376285281b6173ee3d6650d71148bc173e4a9f7a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:13:55 -0400
 Subject: [PATCH 04/28] Change unique_function storage size
@@ -8,7 +8,7 @@ Subject: [PATCH 04/28] Change unique_function storage size
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h
-index 5a37417dd..8a9d78f41 100644
+index 5a37417ddde5ddf116dd63939c41064330d539d2..8a9d78f41f540f51559c11c1f9f40645165796e5 100644
 --- a/llvm/include/llvm/ADT/FunctionExtras.h
 +++ b/llvm/include/llvm/ADT/FunctionExtras.h
@@ -78,7 +78,7 @@ using EnableIfCallable = std::enable_if_t<llvm::disjunction<
--- a/upstream_utils/llvm_patches/0005-Threading-updates.patch
+++ b/upstream_utils/llvm_patches/0005-Threading-updates.patch
@@ -1,4 +1,4 @@
-From bc86b62f72cbb76a0911996f4b1c6ce476cd1fac Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:17:19 -0400
 Subject: [PATCH 05/28] Threading updates
@@ -12,7 +12,7 @@ Subject: [PATCH 05/28] Threading updates
 3 files changed, 11 insertions(+), 43 deletions(-)

 diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
-index f5d726ec8..ede1cb172 100644
+index f5d726ec8a2c4c39a31a6a557591a99a64caea3a..ede1cb1726f2d2dd89e588489e062368763a4b68 100644
 --- a/llvm/include/llvm/Support/Compiler.h
 +++ b/llvm/include/llvm/Support/Compiler.h
@@ -540,7 +540,6 @@ void AnnotateIgnoreWritesEnd(const char *file, int line);
@@ -36,7 +36,7 @@ index f5d726ec8..ede1cb172 100644
 /// \macro LLVM_ENABLE_EXCEPTIONS
 /// Whether LLVM is built with exception support.
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index 8ae8fb8b4..89440b5ab 100644
+index 8ae8fb8b40079a5da59f4008b9dc8de258d8cb5a..89440b5ab872cbeb5e3fbebfa4550e67aea1486b 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -44,7 +44,6 @@ static void *ErrorHandlerUserData = nullptr;
@@ -151,7 +151,7 @@ index 8ae8fb8b4..89440b5ab 100644
 void llvm::llvm_unreachable_internal(const char *msg, const char *file,
                                      unsigned line) {
 diff --git a/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp
-index a6ae67066..fc798b7ec 100644
+index a6ae67066ea0423334e8ee52106f220cd456e25e..fc798b7ec1b788e232c7374b9968dc71d4f506f0 100644
 --- a/llvm/lib/Support/ManagedStatic.cpp
 +++ b/llvm/lib/Support/ManagedStatic.cpp
@@ -12,23 +12,23 @@
--- a/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch
+++ b/upstream_utils/llvm_patches/0006-ifdef-guard-safety.patch
@@ -1,4 +1,4 @@
-From 008e921f77933f475174d74a6b70309c6fbe0771 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:28:13 -0400
 Subject: [PATCH 06/28] \#ifdef guard safety
@@ -9,7 +9,7 @@ Prevents redefinition if someone is pulling in real LLVM, since the macros are i
 1 file changed, 50 insertions(+)

 diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
-index ede1cb172..8b8260b50 100644
+index ede1cb1726f2d2dd89e588489e062368763a4b68..8b8260b50504876d79bd94ae5b82763088bb74a8 100644
 --- a/llvm/include/llvm/Support/Compiler.h
 +++ b/llvm/include/llvm/Support/Compiler.h
@@ -86,6 +86,7 @@
--- a/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch
+++ b/upstream_utils/llvm_patches/0007-Explicitly-use-std.patch
@@ -1,4 +1,4 @@
-From c26562caae6a685716a8785ad8689833c9996549 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:37:34 -0400
 Subject: [PATCH 07/28] Explicitly use std::
@@ -12,7 +12,7 @@ Subject: [PATCH 07/28] Explicitly use std::
 5 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
-index bfe93e997..403e108fd 100644
+index bfe93e997fc896e82a9b96219967f754df82bcfb..403e108fd361d314762acc317ba6dce7226bb6e5 100644
 --- a/llvm/include/llvm/ADT/SmallSet.h
 +++ b/llvm/include/llvm/ADT/SmallSet.h
@@ -270,7 +270,7 @@ bool operator==(const SmallSet<T, LN, C> &LHS, const SmallSet<T, RN, C> &RHS) {
@@ -25,7 +25,7 @@ index bfe93e997..403e108fd 100644
 
 /// Inequality comparison for SmallSet.
 diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
-index db9fbc148..da843ef79 100644
+index db9fbc148ae3064faa94a23713d1def3b466e899..da843ef79ff9fd1e2b702763fcdc6f33771bef94 100644
 --- a/llvm/include/llvm/Support/MathExtras.h
 +++ b/llvm/include/llvm/Support/MathExtras.h
@@ -586,7 +586,7 @@ inline double Log2(double Value) {
@@ -38,7 +38,7 @@ index db9fbc148..da843ef79 100644
 }
 
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index 89440b5ab..f80e28e87 100644
+index 89440b5ab872cbeb5e3fbebfa4550e67aea1486b..f80e28e8710817aa19ca7c012a0a4eaecc801c83 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -210,7 +210,7 @@ void LLVMResetFatalErrorHandler() {
@@ -51,7 +51,7 @@ index 89440b5ab..f80e28e87 100644
 std::error_code llvm::mapWindowsError(unsigned EV) {
   switch (EV) {
 diff --git a/llvm/unittests/ADT/SmallPtrSetTest.cpp b/llvm/unittests/ADT/SmallPtrSetTest.cpp
-index 6f3c94eed..531f81ab5 100644
+index 6f3c94eed2737d4e35995454ec7d007cedb1235a..531f81ab5b3fc1dcff731230f3cb7649cb90aedf 100644
 --- a/llvm/unittests/ADT/SmallPtrSetTest.cpp
 +++ b/llvm/unittests/ADT/SmallPtrSetTest.cpp
@@ -298,7 +298,7 @@ TEST(SmallPtrSetTest, dereferenceAndIterate) {
@@ -64,7 +64,7 @@ index 6f3c94eed..531f81ab5 100644
     EXPECT_EQ(F - Found + 1, *F);
 }
 diff --git a/llvm/unittests/ADT/StringMapTest.cpp b/llvm/unittests/ADT/StringMapTest.cpp
-index 86907ab61..6d0c0942c 100644
+index 86907ab61a2c24effcef3b88c7849482eadd314d..6d0c0942cdc256a01afbeb1902f53bc9c53198d9 100644
 --- a/llvm/unittests/ADT/StringMapTest.cpp
 +++ b/llvm/unittests/ADT/StringMapTest.cpp
@@ -329,7 +329,7 @@ TEST_F(StringMapTest, IterMapKeysSmallVector) {
--- a/upstream_utils/llvm_patches/0008-Remove-format_provider.patch
+++ b/upstream_utils/llvm_patches/0008-Remove-format_provider.patch
@@ -1,4 +1,4 @@
-From f35fcb2c40caceed14437e65131e9fe1cf94deac Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 7 May 2022 22:53:50 -0400
 Subject: [PATCH 08/28] Remove format_provider
@@ -10,7 +10,7 @@ Subject: [PATCH 08/28] Remove format_provider
 3 files changed, 176 deletions(-)

 diff --git a/llvm/include/llvm/Support/Chrono.h b/llvm/include/llvm/Support/Chrono.h
-index a7dea19d9..9f9a2b5ca 100644
+index a7dea19d9193bcff4bc6b553b80a10b2bc7b64af..9f9a2b5cab270327898cee3f97d9ae7cf77eb564 100644
 --- a/llvm/include/llvm/Support/Chrono.h
 +++ b/llvm/include/llvm/Support/Chrono.h
@@ -10,7 +10,6 @@
@@ -137,7 +137,7 @@ index a7dea19d9..9f9a2b5ca 100644
 
 #endif // LLVM_SUPPORT_CHRONO_H
 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index 9a1dd7a60..a25ca5b7b 100644
+index 9a1dd7a6070c20609660bfc63db10a509e54fe2f..a25ca5b7b556fd9ccd08ad13a6ceae6bedbcb09e 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -28,12 +28,6 @@
@@ -154,7 +154,7 @@ index 9a1dd7a60..a25ca5b7b 100644
 
 namespace sys {
 diff --git a/llvm/unittests/Support/Chrono.cpp b/llvm/unittests/Support/Chrono.cpp
-index 9a08a5c1b..3c049de18 100644
+index 9a08a5c1bfdff409c2240b7d15727d32d6339399..3c049de18c0a80465f4b0a8c054df2602d5e9b1c 100644
 --- a/llvm/unittests/Support/Chrono.cpp
 +++ b/llvm/unittests/Support/Chrono.cpp
@@ -30,37 +30,6 @@ TEST(Chrono, TimeTConversion) {
--- a/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch
+++ b/upstream_utils/llvm_patches/0009-Add-compiler-warning-pragmas.patch
@@ -1,4 +1,4 @@
-From 2c53d8ac36f378fda347f36ef2bc7fbc2038cb93 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 13:34:07 -0400
 Subject: [PATCH 09/28] Add compiler warning pragmas
@@ -17,7 +17,7 @@ Subject: [PATCH 09/28] Add compiler warning pragmas
 10 files changed, 72 insertions(+), 4 deletions(-)

 diff --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h
-index 8a9d78f41..3efa73587 100644
+index 8a9d78f41f540f51559c11c1f9f40645165796e5..3efa73587071b12af07398a4879e7b38c114867f 100644
 --- a/llvm/include/llvm/ADT/FunctionExtras.h
 +++ b/llvm/include/llvm/ADT/FunctionExtras.h
@@ -55,6 +55,13 @@ namespace llvm {
@@ -46,7 +46,7 @@ index 8a9d78f41..3efa73587 100644
 
 #endif // LLVM_ADT_FUNCTIONEXTRAS_H
 diff --git a/llvm/include/llvm/ADT/Hashing.h b/llvm/include/llvm/ADT/Hashing.h
-index 74a87a3d8..47ff1b2bc 100644
+index 74a87a3d8dbbd1b13604fac694ad0294c53ee11c..47ff1b2bcbc14bf522abb66a1728123581c148d8 100644
 --- a/llvm/include/llvm/ADT/Hashing.h
 +++ b/llvm/include/llvm/ADT/Hashing.h
@@ -55,6 +55,11 @@
@@ -71,7 +71,7 @@ index 74a87a3d8..47ff1b2bc 100644
 +
 #endif
 diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
-index 8686f7bb5..1e311ea56 100644
+index 8686f7bb5407611979e8cecfe9da292d3a4b4160..1e311ea56fd1d35505ca6740922c713d97636f09 100644
 --- a/llvm/include/llvm/ADT/SmallVector.h
 +++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -14,6 +14,14 @@
@@ -90,7 +90,7 @@ index 8686f7bb5..1e311ea56 100644
 #include "llvm/Support/type_traits.h"
 #include <algorithm>
 diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
-index da843ef79..fac12dd0e 100644
+index da843ef79ff9fd1e2b702763fcdc6f33771bef94..fac12dd0e4c6316ff4887542dd59adc954f099e4 100644
 --- a/llvm/include/llvm/Support/MathExtras.h
 +++ b/llvm/include/llvm/Support/MathExtras.h
@@ -435,6 +435,11 @@ inline uint64_t maxUIntN(uint64_t N) {
@@ -117,7 +117,7 @@ index da843ef79..fac12dd0e 100644
 inline int64_t maxIntN(int64_t N) {
   assert(N > 0 && N <= 64 && "integer width out of range");
 diff --git a/llvm/include/llvm/Support/MemAlloc.h b/llvm/include/llvm/Support/MemAlloc.h
-index d6012bd5a..01007deb8 100644
+index d6012bd5a6985d8405136039aa85931605cd8a40..01007deb89bba625b1b3ad3e703d0c16ed6f757b 100644
 --- a/llvm/include/llvm/Support/MemAlloc.h
 +++ b/llvm/include/llvm/Support/MemAlloc.h
@@ -22,6 +22,14 @@
@@ -146,7 +146,7 @@ index d6012bd5a..01007deb8 100644
 +
 #endif
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index e4c318eb8..ee01a9522 100644
+index e4c318eb8265c588f1d84dd1abeafc7fd0d055de..ee01a95220806c500d2c0149e9f1e667ea8bf28b 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -10,6 +10,10 @@
@@ -161,7 +161,7 @@ index e4c318eb8..ee01a9522 100644
 #include "llvm/ADT/STLArrayExtras.h"
 #include "llvm/ADT/StringExtras.h"
 diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp
-index e505b1907..9fe83a45d 100644
+index e505b19070bfdc9af45e0c2ae017e6ea50d81c98..9fe83a45d751719b9f99d57f8f5e983824d108f0 100644
 --- a/llvm/unittests/ADT/DenseMapTest.cpp
 +++ b/llvm/unittests/ADT/DenseMapTest.cpp
@@ -6,6 +6,10 @@
@@ -176,7 +176,7 @@ index e505b1907..9fe83a45d 100644
 #include "gtest/gtest.h"
 #include <map>
 diff --git a/llvm/unittests/ADT/MapVectorTest.cpp b/llvm/unittests/ADT/MapVectorTest.cpp
-index 552f9956b..20ebcd753 100644
+index 552f9956bdc2c6148f2e338b02074b7c479994a9..20ebcd753bcce0112f6a2d96ea23ccb6662996bb 100644
 --- a/llvm/unittests/ADT/MapVectorTest.cpp
 +++ b/llvm/unittests/ADT/MapVectorTest.cpp
@@ -6,6 +6,13 @@
@@ -194,7 +194,7 @@ index 552f9956b..20ebcd753 100644
 #include "llvm/ADT/iterator_range.h"
 #include "gtest/gtest.h"
 diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp
-index fe827546a..0e68bad6c 100644
+index fe827546aef2c26b8c5372b2643e84d60683a19a..0e68bad6c4d70737d42fdf385512d117ca7aac4c 100644
 --- a/llvm/unittests/ADT/SmallVectorTest.cpp
 +++ b/llvm/unittests/ADT/SmallVectorTest.cpp
@@ -17,6 +17,10 @@
@@ -209,7 +209,7 @@ index fe827546a..0e68bad6c 100644
 
 namespace {
 diff --git a/llvm/unittests/Support/AlignOfTest.cpp b/llvm/unittests/Support/AlignOfTest.cpp
-index f84895c18..6a50205b1 100644
+index f84895c18602d3936d623ed79c5d9689cd57cc91..6a50205b143b7ff553066f048a45bf4e1ecc475b 100644
 --- a/llvm/unittests/Support/AlignOfTest.cpp
 +++ b/llvm/unittests/Support/AlignOfTest.cpp
@@ -31,10 +31,9 @@ namespace {
--- a/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch
+++ b/upstream_utils/llvm_patches/0010-Remove-unused-functions.patch
@@ -1,4 +1,4 @@
-From df2dc9fdb3d57e01423104a71a6a1d1d6382644a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 13:43:50 -0400
 Subject: [PATCH 10/28] Remove unused functions
@@ -12,7 +12,7 @@ Subject: [PATCH 10/28] Remove unused functions
 5 files changed, 8 insertions(+), 564 deletions(-)

 diff --git a/llvm/include/llvm/ADT/SmallString.h b/llvm/include/llvm/ADT/SmallString.h
-index 50cbdade4..bfa965fd6 100644
+index 50cbdade405770e80a6a45521a446a28e4177d11..bfa965fd68a09d7ca3b332e38585ae37a5982ed0 100644
 --- a/llvm/include/llvm/ADT/SmallString.h
 +++ b/llvm/include/llvm/ADT/SmallString.h
@@ -88,48 +88,12 @@ public:
@@ -116,7 +116,7 @@ index 50cbdade4..bfa965fd6 100644
   // Extra methods.
 
 diff --git a/llvm/include/llvm/Support/Errno.h b/llvm/include/llvm/Support/Errno.h
-index 07df6765d..d9bf68bb3 100644
+index 07df6765d9dbf5d6b88092737e081b441b1ccdc4..d9bf68bb369e524be5453c738ab9faa42f4b8cb8 100644
 --- a/llvm/include/llvm/Support/Errno.h
 +++ b/llvm/include/llvm/Support/Errno.h
@@ -20,15 +20,6 @@
@@ -136,7 +136,7 @@ index 07df6765d..d9bf68bb3 100644
 inline decltype(auto) RetryAfterSignal(const FailT &Fail, const Fun &F,
                                        const Args &... As) {
 diff --git a/llvm/include/llvm/Support/VersionTuple.h b/llvm/include/llvm/Support/VersionTuple.h
-index 3d6573bf5..a28e12adc 100644
+index 3d6573bf5a96e115ef264c7885b91aa3b32ac91e..a28e12adcc251bc3673f6a7c07d96d447aa0da98 100644
 --- a/llvm/include/llvm/Support/VersionTuple.h
 +++ b/llvm/include/llvm/Support/VersionTuple.h
@@ -16,7 +16,6 @@
@@ -194,7 +194,7 @@ index 3d6573bf5..a28e12adc 100644
 
 } // end namespace llvm
 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index a25ca5b7b..d4521c8e2 100644
+index a25ca5b7b556fd9ccd08ad13a6ceae6bedbcb09e..d4521c8e285f3fc404d27a6c528c410121c71f83 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -248,32 +248,6 @@ public:
@@ -381,7 +381,7 @@ index a25ca5b7b..d4521c8e2 100644
 
 #endif // LLVM_SUPPORT_RAW_OSTREAM_H
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index ee01a9522..875eda7ba 100644
+index ee01a95220806c500d2c0149e9f1e667ea8bf28b..875eda7ba440f2ae64dc32ebb0502ad3ad8d2c74 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -19,7 +19,6 @@
--- a/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch
+++ b/upstream_utils/llvm_patches/0011-Detemplatize-SmallVectorBase.patch
@@ -1,4 +1,4 @@
-From ef26f059859d3a0d08b06a70519928bcd5f9bb79 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Thu, 5 May 2022 23:18:34 -0400
 Subject: [PATCH 11/28] Detemplatize SmallVectorBase
@@ -9,7 +9,7 @@ Subject: [PATCH 11/28] Detemplatize SmallVectorBase
 2 files changed, 13 insertions(+), 42 deletions(-)

 diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
-index 1e311ea56..4b6bbdeb2 100644
+index 1e311ea56fd1d35505ca6740922c713d97636f09..4b6bbdeb2ea3e602978733351e352968ccdca36d 100644
 --- a/llvm/include/llvm/ADT/SmallVector.h
 +++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -50,14 +50,14 @@ template <typename IteratorT> class iterator_range;
@@ -69,7 +69,7 @@ index 1e311ea56..4b6bbdeb2 100644
   }
 
 diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp
-index a2b4899e1..bdfc963d7 100644
+index a2b4899e1ffe0ae19d236f43e2e2e2fe1db14110..bdfc963d7ff8ca684e37d08410b92a84d5d27730 100644
 --- a/llvm/lib/Support/SmallVector.cpp
 +++ b/llvm/lib/Support/SmallVector.cpp
@@ -51,10 +51,6 @@ static_assert(sizeof(SmallVector<void *, 1>) ==
--- 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,4 +1,4 @@
-From 342ebd445bb3dae8b0c119a6126a318ad378a377 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 13:48:59 -0400
 Subject: [PATCH 12/28] Add vectors to raw_ostream
@@ -9,7 +9,7 @@ Subject: [PATCH 12/28] Add vectors to raw_ostream
 2 files changed, 162 insertions(+)

 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index d4521c8e2..bf5630ab5 100644
+index d4521c8e285f3fc404d27a6c528c410121c71f83..bf5630ab549d39cedcdaac80672c5122883e125b 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -25,6 +25,7 @@
@@ -155,7 +155,7 @@ index d4521c8e2..bf5630ab5 100644
 class raw_null_ostream : public raw_pwrite_stream {
   /// See raw_ostream::write_impl.
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 875eda7ba..36faf744c 100644
+index 875eda7ba440f2ae64dc32ebb0502ad3ad8d2c74..36faf744cf6c429917a793a363a7d3f22a6d7e67 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -658,6 +658,53 @@ void raw_svector_ostream::pwrite_impl(const char *Ptr, size_t Size,
--- a/upstream_utils/llvm_patches/0013-Extra-collections-features.patch
+++ b/upstream_utils/llvm_patches/0013-Extra-collections-features.patch
@@ -1,4 +1,4 @@
-From 5db7e9f9370a5e04949846cc68eeb13e2c1db187 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 3 May 2022 22:16:10 -0400
 Subject: [PATCH 13/28] Extra collections features
@@ -9,7 +9,7 @@ Subject: [PATCH 13/28] Extra collections features
 2 files changed, 110 insertions(+), 1 deletion(-)

 diff --git a/llvm/include/llvm/ADT/StringMap.h b/llvm/include/llvm/ADT/StringMap.h
-index 8747cdb35..16f13f048 100644
+index 8747cdb353a89952e242ccfa5ea8a3e68571d456..16f13f048415182e061de6ba439eb23ddddb3bdc 100644
 --- a/llvm/include/llvm/ADT/StringMap.h
 +++ b/llvm/include/llvm/ADT/StringMap.h
@@ -42,7 +42,7 @@ protected:
@@ -142,7 +142,7 @@ index 8747cdb35..16f13f048 100644
 
 #endif // LLVM_ADT_STRINGMAP_H
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 36faf744c..95152849c 100644
+index 36faf744cf6c429917a793a363a7d3f22a6d7e67..95152849cb920a61b4906f886f78d76e3fa2b22c 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -76,6 +76,14 @@ constexpr raw_ostream::Colors raw_ostream::WHITE;
--- a/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch
+++ b/upstream_utils/llvm_patches/0014-EpochTracker-ABI-macro.patch
@@ -1,4 +1,4 @@
-From 9951c4b3fea6b2dbe7141070444de8df6ae4ce9b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Wed, 4 May 2022 00:01:00 -0400
 Subject: [PATCH 14/28] EpochTracker ABI macro
@@ -8,7 +8,7 @@ Subject: [PATCH 14/28] EpochTracker ABI macro
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/llvm/include/llvm/ADT/EpochTracker.h b/llvm/include/llvm/ADT/EpochTracker.h
-index b06888494..f35461d1c 100644
+index b06888494466496b0c768e824ee25e2154d20f15..f35461d1c6e424cea6f072d749a6324699f8edd4 100644
 --- a/llvm/include/llvm/ADT/EpochTracker.h
 +++ b/llvm/include/llvm/ADT/EpochTracker.h
@@ -22,7 +22,7 @@
--- a/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch
+++ b/upstream_utils/llvm_patches/0015-Delete-numbers-from-MathExtras.patch
@@ -1,4 +1,4 @@
-From 907608f09061ab272b0a127330b1b24e28d50a9f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Thu, 5 May 2022 18:09:45 -0400
 Subject: [PATCH 15/28] Delete numbers from MathExtras
@@ -8,7 +8,7 @@ Subject: [PATCH 15/28] Delete numbers from MathExtras
 1 file changed, 36 deletions(-)

 diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
-index fac12dd0e..e8f1f2aca 100644
+index fac12dd0e4c6316ff4887542dd59adc954f099e4..e8f1f2aca6106af3885468f686331d8b083630d7 100644
 --- a/llvm/include/llvm/Support/MathExtras.h
 +++ b/llvm/include/llvm/Support/MathExtras.h
@@ -50,42 +50,6 @@ enum ZeroBehavior {
--- a/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch
+++ b/upstream_utils/llvm_patches/0016-Add-lerp-and-sgn.patch
@@ -1,4 +1,4 @@
-From 9ef10e5b331d00d7d5822afdb70c1f2d9981d772 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 3 May 2022 22:50:24 -0400
 Subject: [PATCH 16/28] Add lerp and sgn
@@ -8,7 +8,7 @@ Subject: [PATCH 16/28] Add lerp and sgn
 1 file changed, 20 insertions(+)

 diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
-index e8f1f2aca..8116c58bd 100644
+index e8f1f2aca6106af3885468f686331d8b083630d7..8116c58bd0d6d2b880a5a7c8c5f9ca07217987de 100644
 --- a/llvm/include/llvm/Support/MathExtras.h
 +++ b/llvm/include/llvm/Support/MathExtras.h
@@ -930,6 +930,26 @@ std::enable_if_t<std::is_signed<T>::value, T> MulOverflow(T X, T Y, T &Result) {
--- a/upstream_utils/llvm_patches/0017-Fixup-includes.patch
+++ b/upstream_utils/llvm_patches/0017-Fixup-includes.patch
@@ -1,4 +1,4 @@
-From aa30b80d86cb0774efc094646339b54694ab8398 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 16:38:11 -0400
 Subject: [PATCH 17/28] Fixup includes
@@ -16,7 +16,7 @@ Subject: [PATCH 17/28] Fixup includes
 9 files changed, 24 insertions(+), 10 deletions(-)

 diff --git a/llvm/include/llvm/ADT/StringMap.h b/llvm/include/llvm/ADT/StringMap.h
-index 16f13f048..6ae0e39a1 100644
+index 16f13f048415182e061de6ba439eb23ddddb3bdc..6ae0e39a125ef145ca0887763e55c8150a902047 100644
 --- a/llvm/include/llvm/ADT/StringMap.h
 +++ b/llvm/include/llvm/ADT/StringMap.h
@@ -17,6 +17,10 @@
@@ -31,7 +31,7 @@ index 16f13f048..6ae0e39a1 100644
 #include <initializer_list>
 #include <iterator>
 diff --git a/llvm/include/llvm/ADT/StringMapEntry.h b/llvm/include/llvm/ADT/StringMapEntry.h
-index 39976a02b..cdefc5449 100644
+index 39976a02b5ecbbf5d08a6073708cac0a5aef447d..cdefc5449236a34683e64c1f4eebceae28954017 100644
 --- a/llvm/include/llvm/ADT/StringMapEntry.h
 +++ b/llvm/include/llvm/ADT/StringMapEntry.h
@@ -16,6 +16,10 @@
@@ -46,7 +46,7 @@ index 39976a02b..cdefc5449 100644
 #include <string_view>
 
 diff --git a/llvm/include/llvm/Support/PointerLikeTypeTraits.h b/llvm/include/llvm/Support/PointerLikeTypeTraits.h
-index 1b15f930b..acadd5e89 100644
+index 1b15f930bd87d97d51824af5e62ea5f222a6b4c9..acadd5e89a1651cfbad67a5b1b0933d1f288d094 100644
 --- a/llvm/include/llvm/Support/PointerLikeTypeTraits.h
 +++ b/llvm/include/llvm/Support/PointerLikeTypeTraits.h
@@ -16,6 +16,7 @@
@@ -58,7 +58,7 @@ index 1b15f930b..acadd5e89 100644
 
 namespace llvm {
 diff --git a/llvm/lib/Support/ConvertUTFWrapper.cpp b/llvm/lib/Support/ConvertUTFWrapper.cpp
-index 396ab0c65..cff30f16c 100644
+index 396ab0c655ed50707c8725ebd22b1f8be5e0e030..cff30f16ca907959843dd58ff30f58ead333f17f 100644
 --- a/llvm/lib/Support/ConvertUTFWrapper.cpp
 +++ b/llvm/lib/Support/ConvertUTFWrapper.cpp
@@ -8,6 +8,7 @@
@@ -70,7 +70,7 @@ index 396ab0c65..cff30f16c 100644
 #include "llvm/Support/SwapByteOrder.h"
 #include <string>
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index f80e28e87..ec1a1633a 100644
+index f80e28e8710817aa19ca7c012a0a4eaecc801c83..ec1a1633ae2952857619ba5e55dee3be7bc6aed5 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -28,12 +28,11 @@
@@ -90,7 +90,7 @@ index f80e28e87..ec1a1633a 100644
 
 using namespace llvm;
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 95152849c..878a3a5e9 100644
+index 95152849cb920a61b4906f886f78d76e3fa2b22c..878a3a5e99949da360a93dc51298460cc61d4f3f 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -15,7 +15,8 @@
@@ -129,7 +129,7 @@ index 95152849c..878a3a5e9 100644
 
 using namespace llvm;
 diff --git a/llvm/unittests/ADT/SmallPtrSetTest.cpp b/llvm/unittests/ADT/SmallPtrSetTest.cpp
-index 531f81ab5..3db8b6e37 100644
+index 531f81ab5b3fc1dcff731230f3cb7649cb90aedf..3db8b6e37d31a0a3cc304da8fc4cbbe1d89252b5 100644
 --- a/llvm/unittests/ADT/SmallPtrSetTest.cpp
 +++ b/llvm/unittests/ADT/SmallPtrSetTest.cpp
@@ -15,6 +15,8 @@
@@ -142,7 +142,7 @@ index 531f81ab5..3db8b6e37 100644
 
 TEST(SmallPtrSetTest, Assignment) {
 diff --git a/llvm/unittests/ADT/StringMapTest.cpp b/llvm/unittests/ADT/StringMapTest.cpp
-index 6d0c0942c..de6daf3da 100644
+index 6d0c0942cdc256a01afbeb1902f53bc9c53198d9..de6daf3daf4e59b57fa43df2526c62e854fa65ee 100644
 --- a/llvm/unittests/ADT/StringMapTest.cpp
 +++ b/llvm/unittests/ADT/StringMapTest.cpp
@@ -9,6 +9,7 @@
@@ -154,7 +154,7 @@ index 6d0c0942c..de6daf3da 100644
 #include <tuple>
 using namespace llvm;
 diff --git a/llvm/unittests/Support/ConvertUTFTest.cpp b/llvm/unittests/Support/ConvertUTFTest.cpp
-index 9c798437a..2fee8ad5c 100644
+index 9c798437a12d971a9206cbaff546ebc46c70f0d8..2fee8ad5c01294988457002517dcb8d983cac23d 100644
 --- a/llvm/unittests/Support/ConvertUTFTest.cpp
 +++ b/llvm/unittests/Support/ConvertUTFTest.cpp
@@ -7,6 +7,8 @@
--- 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,4 +1,4 @@
-From 1c3e8a6ff8d8b6c054141503c7318d69319d8d41 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 16:42:09 -0400
 Subject: [PATCH 18/28] Use std::is_trivially_copy_constructible
@@ -9,7 +9,7 @@ Subject: [PATCH 18/28] Use std::is_trivially_copy_constructible
 2 files changed, 2 insertions(+), 101 deletions(-)

 diff --git a/llvm/include/llvm/ADT/PointerIntPair.h b/llvm/include/llvm/ADT/PointerIntPair.h
-index b7ddf8855..a48fb904b 100644
+index b7ddf8855605d23ebe3d7587e4ccc694a72045ac..a48fb904bbf6fa70d8d81bffc34202978eccb71a 100644
 --- a/llvm/include/llvm/ADT/PointerIntPair.h
 +++ b/llvm/include/llvm/ADT/PointerIntPair.h
@@ -128,18 +128,6 @@ public:
@@ -32,7 +32,7 @@ index b7ddf8855..a48fb904b 100644
 template <typename PointerT, unsigned IntBits, typename PtrTraits>
 struct PointerIntPairInfo {
 diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h
-index 7b7d5d991..72a2e84ad 100644
+index 7b7d5d991f3f51862fad3267798737bc6ef8c845..72a2e84ad452a609d42ce7a43a3d26d118a08043 100644
 --- a/llvm/include/llvm/Support/type_traits.h
 +++ b/llvm/include/llvm/Support/type_traits.h
@@ -92,98 +92,11 @@ union trivial_helper {
--- a/upstream_utils/llvm_patches/0019-Windows-support.patch
+++ b/upstream_utils/llvm_patches/0019-Windows-support.patch
@@ -1,4 +1,4 @@
-From 36f7f08e257f2b58b2894f165a38ff2a831aed8f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 3 May 2022 20:22:38 -0400
 Subject: [PATCH 19/28] Windows support
@@ -9,7 +9,7 @@ Subject: [PATCH 19/28] Windows support
 2 files changed, 124 insertions(+), 16 deletions(-)

 diff --git a/llvm/include/llvm/Support/Windows/WindowsSupport.h b/llvm/include/llvm/Support/Windows/WindowsSupport.h
-index 180803fbd..31120cfa0 100644
+index 180803fbd3104ddf32c183684f226954c4fb8b0e..31120cfa0e8cafa8d4f332bf2374a88a3418f748 100644
 --- a/llvm/include/llvm/Support/Windows/WindowsSupport.h
 +++ b/llvm/include/llvm/Support/Windows/WindowsSupport.h
@@ -35,8 +35,6 @@
@@ -90,7 +90,7 @@ index 180803fbd..31120cfa0 100644
 } // end namespace llvm.
 
 diff --git a/llvm/lib/Support/ConvertUTF.cpp b/llvm/lib/Support/ConvertUTF.cpp
-index e24a918c5..c906ded91 100644
+index e24a918c5c898206dc8b401c6214e4e9c652e9a9..c906ded91dfeaa07b782e1eccc28643d5497cb94 100644
 --- a/llvm/lib/Support/ConvertUTF.cpp
 +++ b/llvm/lib/Support/ConvertUTF.cpp
@@ -51,6 +51,11 @@
--- a/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch
+++ b/upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch
@@ -1,4 +1,4 @@
-From 8834260a9ee172311cc08d0b4e4e958bf36a260f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 16:46:20 -0400
 Subject: [PATCH 20/28] Prefer fmtlib
@@ -8,7 +8,7 @@ Subject: [PATCH 20/28] Prefer fmtlib
 1 file changed, 6 insertions(+), 14 deletions(-)

 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index ec1a1633a..8de7b726d 100644
+index ec1a1633ae2952857619ba5e55dee3be7bc6aed5..27ca15f7d239a8e5050cadd159dad96de150e444 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -22,7 +22,7 @@
--- 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,4 +1,4 @@
-From 7943842aea1a05a1dd2c2c753378af569c24293b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 16:49:36 -0400
 Subject: [PATCH 21/28] Prefer wpi's fs.h
@@ -8,7 +8,7 @@ Subject: [PATCH 21/28] Prefer wpi's fs.h
 1 file changed, 2 insertions(+), 5 deletions(-)

 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index bf5630ab5..256bcec25 100644
+index bf5630ab549d39cedcdaac80672c5122883e125b..256bcec259a8026473a5f3926bd79b215bd5b888 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -27,18 +27,15 @@
--- a/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch
+++ b/upstream_utils/llvm_patches/0022-Remove-unused-functions.patch
@@ -1,4 +1,4 @@
-From a172c93df929ac6c9f783fd5af1e4df3604c4c66 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 19:16:51 -0400
 Subject: [PATCH 22/28] Remove unused functions
@@ -12,7 +12,7 @@ Subject: [PATCH 22/28] Remove unused functions
 5 files changed, 23 insertions(+), 131 deletions(-)

 diff --git a/llvm/include/llvm/Support/DJB.h b/llvm/include/llvm/Support/DJB.h
-index 8737cd144..67b0ae91b 100644
+index 8737cd144c37f9041a781a74e9f2b43384e85761..67b0ae91b4b1401374d7d39d859daaf30da17ee2 100644
 --- a/llvm/include/llvm/Support/DJB.h
 +++ b/llvm/include/llvm/Support/DJB.h
@@ -24,9 +24,6 @@ inline uint32_t djbHash(std::string_view Buffer, uint32_t H = 5381) {
@@ -26,7 +26,7 @@ index 8737cd144..67b0ae91b 100644
 
 #endif // LLVM_SUPPORT_DJB_H
 diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index 256bcec25..9b3a87e1b 100644
+index 256bcec259a8026473a5f3926bd79b215bd5b888..9b3a87e1bbc0abe83b204bd8f889ffe3a3cafffa 100644
 --- a/llvm/include/llvm/Support/raw_ostream.h
 +++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -71,7 +71,6 @@ private:
@@ -50,7 +50,7 @@ index 256bcec25..9b3a87e1b 100644
   /// Tie this stream to the specified stream. Replaces any existing tied-to
   /// stream. Specifying a nullptr unties the stream.
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index 8de7b726d..bc08199a1 100644
+index 27ca15f7d239a8e5050cadd159dad96de150e444..53fe22b5eb8dad289cced414ed6f544fd0249504 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -178,22 +178,6 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
@@ -77,7 +77,7 @@ index 8de7b726d..bc08199a1 100644
 
 #include <winerror.h>
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 878a3a5e9..632b52235 100644
+index 878a3a5e99949da360a93dc51298460cc61d4f3f..632b522358c969682f01dbbb9a6f86cf14093bc3 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -167,16 +167,6 @@ raw_ostream &raw_ostream::write_escaped(std::string_view Str,
@@ -185,7 +185,7 @@ index 878a3a5e9..632b52235 100644
   pos = ::lseek(FD, off, SEEK_SET);
 #endif
 diff --git a/llvm/unittests/ADT/SmallStringTest.cpp b/llvm/unittests/ADT/SmallStringTest.cpp
-index bee3875d1..87600ea47 100644
+index bee3875d11c9b793d79ac442312559b11dba9f5f..87600ea4704bc98acab9085d16cfafd3d586714e 100644
 --- a/llvm/unittests/ADT/SmallStringTest.cpp
 +++ b/llvm/unittests/ADT/SmallStringTest.cpp
@@ -129,23 +129,6 @@ TEST_F(SmallStringTest, StdStringConversion) {
--- a/upstream_utils/llvm_patches/0023-OS-specific-changes.patch
+++ b/upstream_utils/llvm_patches/0023-OS-specific-changes.patch
@@ -1,4 +1,4 @@
-From ae08bb29b4d2a8ea15a4b82b909c0f4aee5e9060 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 8 May 2022 19:30:43 -0400
 Subject: [PATCH 23/28] OS-specific changes
@@ -8,7 +8,7 @@ Subject: [PATCH 23/28] OS-specific changes
 1 file changed, 7 insertions(+), 6 deletions(-)

 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index bc08199a1..839819094 100644
+index 53fe22b5eb8dad289cced414ed6f544fd0249504..5c08e469e2e44b27e69f4aa974bc59deb8217c9b 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
@@ -96,12 +96,7 @@ void llvm::report_fatal_error(std::string_view Reason, bool GenCrashDiag) {
--- 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,4 +1,4 @@
-From f58b9bad86f61c35cc530ff113ccbb13415261c8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Mon, 9 May 2022 00:04:30 -0400
 Subject: [PATCH 24/28] Use SmallVector for UTF conversion
@@ -10,7 +10,7 @@ Subject: [PATCH 24/28] Use SmallVector for UTF conversion
 3 files changed, 17 insertions(+), 17 deletions(-)

 diff --git a/llvm/include/llvm/Support/ConvertUTF.h b/llvm/include/llvm/Support/ConvertUTF.h
-index b085c8a17..c82947006 100644
+index b085c8a179e8767a258f9feafc8d1111828f10b1..c82947006afb3f8b41c0369352de63fd62be574b 100644
 --- a/llvm/include/llvm/Support/ConvertUTF.h
 +++ b/llvm/include/llvm/Support/ConvertUTF.h
@@ -213,7 +213,7 @@ bool ConvertUTF8toWide(const char *Source, std::wstring &Result);
@@ -41,7 +41,7 @@ index b085c8a17..c82947006 100644
 /**
  * Converts a UTF-8 string into a UTF-16 string with native endianness.
 diff --git a/llvm/lib/Support/ConvertUTFWrapper.cpp b/llvm/lib/Support/ConvertUTFWrapper.cpp
-index cff30f16c..d3689d92a 100644
+index cff30f16ca907959843dd58ff30f58ead333f17f..d3689d92a45a289aaca30c47790a5e46c484344c 100644
 --- a/llvm/lib/Support/ConvertUTFWrapper.cpp
 +++ b/llvm/lib/Support/ConvertUTFWrapper.cpp
@@ -84,7 +84,7 @@ bool hasUTF16ByteOrderMark(span<const char> S) {
@@ -72,7 +72,7 @@ index cff30f16c..d3689d92a 100644
     const UTF8 *Start = reinterpret_cast<const UTF8 *>(Source.data());
     const UTF8 *End =
 diff --git a/llvm/unittests/Support/ConvertUTFTest.cpp b/llvm/unittests/Support/ConvertUTFTest.cpp
-index 2fee8ad5c..7d7650b1c 100644
+index 2fee8ad5c01294988457002517dcb8d983cac23d..7d7650b1c077af7baed2b408584e857602bc329a 100644
 --- a/llvm/unittests/Support/ConvertUTFTest.cpp
 +++ b/llvm/unittests/Support/ConvertUTFTest.cpp
@@ -19,22 +19,22 @@ TEST(ConvertUTFTest, ConvertUTF16LittleEndianToUTF8String) {
--- 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,4 +1,4 @@
-From 35b1a8382240732065790c88a0c515701c1a2beb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Thu, 19 May 2022 00:58:36 -0400
 Subject: [PATCH 25/28] Prefer to use static pointers in raw_ostream
@@ -9,7 +9,7 @@ See #1401
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 632b52235..a703a75ed 100644
+index 632b522358c969682f01dbbb9a6f86cf14093bc3..a703a75edb480b6499ea5ef5945237719b3c565a 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
@@ -599,15 +599,15 @@ void raw_fd_ostream::anchor() {}
--- a/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch
+++ b/upstream_utils/llvm_patches/0026-constexpr-endian-byte-swap.patch
@@ -1,4 +1,4 @@
-From 34f44d312c918b3b5dd69fc689ec0b628dc712f9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Thu, 19 May 2022 01:12:41 -0400
 Subject: [PATCH 26/28] constexpr endian byte swap
@@ -8,7 +8,7 @@ Subject: [PATCH 26/28] constexpr endian byte swap
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/llvm/include/llvm/Support/Endian.h b/llvm/include/llvm/Support/Endian.h
-index 5e7c1e961..2e883ff05 100644
+index 5e7c1e961b9d1e0fd6bcd0c923f678a5e1596860..2e883ff05b7e287151b6031f66d3b4aefd1bf297 100644
 --- a/llvm/include/llvm/Support/Endian.h
 +++ b/llvm/include/llvm/Support/Endian.h
@@ -55,7 +55,9 @@ inline value_type byte_swap(value_type value, endianness endian) {
--- 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,4 +1,4 @@
-From 8f51777a3117a7b010a4cfb2ded1f5d226466f34 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Wed, 10 Aug 2022 17:07:52 -0700
 Subject: [PATCH 27/28] Copy type traits from STLExtras.h into PointerUnion.h
@@ -8,7 +8,7 @@ Subject: [PATCH 27/28] Copy type traits from STLExtras.h into PointerUnion.h
 1 file changed, 46 insertions(+)

 diff --git a/llvm/include/llvm/ADT/PointerUnion.h b/llvm/include/llvm/ADT/PointerUnion.h
-index 1d4cc747c..7d090da59 100644
+index 1d4cc747ce320e27004170fb0aa76323d2ac22b1..7d090da591ad722a9cde7915bea48eec0ef1a408 100644
 --- a/llvm/include/llvm/ADT/PointerUnion.h
 +++ b/llvm/include/llvm/ADT/PointerUnion.h
@@ -22,9 +22,55 @@
--- 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,4 +1,4 @@
-From 498e56e09e8f264978831519ff9c8afa701bf208 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <calcmogul@gmail.com>
 Date: Wed, 10 Aug 2022 22:35:00 -0700
 Subject: [PATCH 28/28] Remove StringMap test for llvm::sort()
@@ -8,7 +8,7 @@ Subject: [PATCH 28/28] Remove StringMap test for llvm::sort()
 1 file changed, 14 deletions(-)

 diff --git a/llvm/unittests/ADT/StringMapTest.cpp b/llvm/unittests/ADT/StringMapTest.cpp
-index de6daf3da..ca41631cc 100644
+index de6daf3daf4e59b57fa43df2526c62e854fa65ee..ca41631ccf9519740e9f5f303dfbfe31762e3ab8 100644
 --- a/llvm/unittests/ADT/StringMapTest.cpp
 +++ b/llvm/unittests/ADT/StringMapTest.cpp
@@ -308,20 +308,6 @@ TEST_F(StringMapTest, InsertOrAssignTest) {
--- a/upstream_utils/mpack_patches/0001-Don-t-emit-inline-defs.patch
+++ b/upstream_utils/mpack_patches/0001-Don-t-emit-inline-defs.patch
@@ -1,4 +1,4 @@
-From 05864e768ca1458c1e24f433d091306a7d47562b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 29 Oct 2022 12:09:03 -0400
 Subject: [PATCH 1/3] Don't emit inline defs
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Don't emit inline defs
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/mpack/mpack-platform.c b/src/mpack/mpack-platform.c
-index 6599e1f..d4a2fa3 100644
+index 6599e1fd444c381b9b72b20601c22488d7266b1f..d4a2fa3198f39fc964baeed4d15f6fd89affc24c 100644
 --- a/src/mpack/mpack-platform.c
 +++ b/src/mpack/mpack-platform.c
@@ -24,7 +24,7 @@
--- a/upstream_utils/mpack_patches/0002-Update-amalgamation-script.patch
+++ b/upstream_utils/mpack_patches/0002-Update-amalgamation-script.patch
@@ -1,4 +1,4 @@
-From d4d045c843d4b4de747d800e570c32cff3759a80 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 29 Oct 2022 12:16:36 -0400
 Subject: [PATCH 2/3] Update amalgamation script
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Update amalgamation script
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/tools/amalgamate.sh b/tools/amalgamate.sh
-index 2e24e27..4dfe999 100755
+index 2e24e278e54bbc52967bfe1f8970f4f8d4b238d5..4dfe999ee49ee67fd394e948b0bb3133d6acdbdc 100755
 --- a/tools/amalgamate.sh
 +++ b/tools/amalgamate.sh
@@ -74,8 +74,8 @@ echo -e "#endif\n" >> $HEADER
--- a/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch
+++ b/upstream_utils/mpack_patches/0003-Use-namespace-for-C.patch
@@ -1,4 +1,4 @@
-From 37854ea8a4a4b387940719c40bd32792f1e6e027 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sat, 29 Oct 2022 12:22:50 -0400
 Subject: [PATCH 3/3] Use namespace for C++
@@ -15,7 +15,7 @@ Subject: [PATCH 3/3] 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 2c133a3..dc7207f 100644
+index 2c133a3303f7a2a10ac7d11a9eb3ee5a04a8335c..e5b4ab0007df2c4108791534b1aa4f9da4f1742a 100644
 --- a/src/mpack/mpack-common.c
 +++ b/src/mpack/mpack-common.c
@@ -24,6 +24,7 @@
@@ -33,7 +33,7 @@ index 2c133a3..dc7207f 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-expect.c b/src/mpack/mpack-expect.c
-index 81576d1..6232a67 100644
+index 81576d1e0e7b942e93a27a6dd5a75a751dba2384..44f00ffc5387b5646d700b174283dec12f2c4962 100644
 --- a/src/mpack/mpack-expect.c
 +++ b/src/mpack/mpack-expect.c
@@ -24,6 +24,7 @@
@@ -51,7 +51,7 @@ index 81576d1..6232a67 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-node.c b/src/mpack/mpack-node.c
-index 3d4b0f4..aba9897 100644
+index 3d4b0f4e69f9e026ad48dec30ac091a024ef30cf..016531360ef27a2003489c1cb4c9aa2f1a7d0865 100644
 --- a/src/mpack/mpack-node.c
 +++ b/src/mpack/mpack-node.c
@@ -24,6 +24,7 @@
@@ -69,7 +69,7 @@ index 3d4b0f4..aba9897 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-platform.c b/src/mpack/mpack-platform.c
-index d4a2fa3..75d2de3 100644
+index d4a2fa3198f39fc964baeed4d15f6fd89affc24c..aadeee0f9de0833a5eabe3a7efc41a9ddf5cee70 100644
 --- a/src/mpack/mpack-platform.c
 +++ b/src/mpack/mpack-platform.c
@@ -30,6 +30,7 @@
@@ -87,7 +87,7 @@ index d4a2fa3..75d2de3 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-platform.h b/src/mpack/mpack-platform.h
-index 79604c9..27a2f9e 100644
+index 79604c90828ebbeae52eb3d6c13afeec6b861fa9..27a2f9eeb10cc8c6aa274a5e1b0c96bead6a37fb 100644
 --- a/src/mpack/mpack-platform.h
 +++ b/src/mpack/mpack-platform.h
@@ -1043,7 +1043,7 @@ void mpack_assert_fail(const char* message);
@@ -100,7 +100,7 @@ index 79604c9..27a2f9e 100644
 #else
     #define MPACK_EXTERN_C_BEGIN /*nothing*/
 diff --git a/src/mpack/mpack-reader.c b/src/mpack/mpack-reader.c
-index c6d2223..a135879 100644
+index c6d2223ef8208f4b918b8890ca81915cb2494bb0..e3cbe7a7086f0fcd0a1ce5e5004ce410fb0e457a 100644
 --- a/src/mpack/mpack-reader.c
 +++ b/src/mpack/mpack-reader.c
@@ -24,6 +24,7 @@
@@ -118,7 +118,7 @@ index c6d2223..a135879 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-writer.c b/src/mpack/mpack-writer.c
-index 4d052b1..9630d9e 100644
+index 4d052b14d83851a45a4899b96904ed661664008c..272f861979103495627887b0d3edfad117bff748 100644
 --- a/src/mpack/mpack-writer.c
 +++ b/src/mpack/mpack-writer.c
@@ -24,6 +24,7 @@
@@ -136,7 +136,7 @@ index 4d052b1..9630d9e 100644
 +}  // namespace mpack
 MPACK_SILENCE_WARNINGS_END
 diff --git a/src/mpack/mpack-writer.h b/src/mpack/mpack-writer.h
-index c239ee6..abeee1a 100644
+index c239ee6441e753cba46f2ab5a6136eead9c30fb4..abeee1a6eb960b0ce61203ae75eb7c7488186860 100644
 --- a/src/mpack/mpack-writer.h
 +++ b/src/mpack/mpack-writer.h
@@ -1168,6 +1168,7 @@ MPACK_EXTERN_C_END
--- a/upstream_utils/stack_walker_patches/0001-Apply-PR-35.patch
+++ b/upstream_utils/stack_walker_patches/0001-Apply-PR-35.patch
@@ -1,4 +1,4 @@
-From 6e2f70b7bb7c59fe99b7469bf3e3a257876403dc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Sun, 22 May 2022 23:58:57 -0400
 Subject: [PATCH 1/3] Apply PR #35
@@ -14,7 +14,7 @@ Subject: [PATCH 1/3] Apply PR #35

 diff --git a/.gitignore b/.gitignore
 new file mode 100644
-index 0000000..5d102c5
+index 0000000000000000000000000000000000000000..5d102c5fe5c7f41b5a1f6e85f45515517a1b3013
 --- /dev/null
 +++ b/.gitignore
@@ -0,0 +1,9 @@
@@ -28,7 +28,7 @@ index 0000000..5d102c5
 +/Main/StackWalker/_ReSharper.Caches/*
 +/.vs/*
 diff --git a/Main/StackWalker/StackWalker.cpp b/Main/StackWalker/StackWalker.cpp
-index 7008ac6..48c7c57 100644
+index 7008ac67eac3409a94e116f9a20d4b53e081bf11..48c7c57c439dd8feb7ea88fda17d68a4bbbb3d68 100644
 --- a/Main/StackWalker/StackWalker.cpp
 +++ b/Main/StackWalker/StackWalker.cpp
@@ -1,4 +1,4 @@
@@ -1220,7 +1220,7 @@ index 7008ac6..48c7c57 100644
 +  OutputDebugString(buffer);
 }
 diff --git a/Main/StackWalker/StackWalker.h b/Main/StackWalker/StackWalker.h
-index 0a004d9..03efcec 100644
+index 0a004d96f3514757c766c3ed8f00d849812daac1..03efcecf61638f78679e53c5db8ae6f1bc790dda 100644
 --- a/Main/StackWalker/StackWalker.h
 +++ b/Main/StackWalker/StackWalker.h
@@ -47,16 +47,6 @@
@@ -1308,7 +1308,7 @@ index 0a004d9..03efcec 100644
   int m_options;
   int m_MaxRecursionCount;
 diff --git a/Main/StackWalker/StackWalker_VC2017.sln b/Main/StackWalker/StackWalker_VC2017.sln
-index 790d550..2209e23 100644
+index 790d5509aee9e33d3a543c91bba86ece62e32e04..2209e233cc8a8cfcbfce17c04895e49a361bb007 100644
 --- a/Main/StackWalker/StackWalker_VC2017.sln
 +++ b/Main/StackWalker/StackWalker_VC2017.sln
@@ -16,18 +16,18 @@ Global
@@ -1339,7 +1339,7 @@ index 790d550..2209e23 100644
 		{89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|Win32.Build.0 = Release_VC2017-UNICODE|Win32
 		{89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|x64.ActiveCfg = Release_VC2017-UNICODE|x64
 diff --git a/Main/StackWalker/main.cpp b/Main/StackWalker/main.cpp
-index 220c97b..496021e 100644
+index 220c97b2a4a547864fdc77258199f7f87de056a2..496021e133602bfeef2102d0cc48dfe93ce77df9 100644
 --- a/Main/StackWalker/main.cpp
 +++ b/Main/StackWalker/main.cpp
@@ -33,7 +33,7 @@ void (*pGlobalFuncPtr)() = 0;
--- a/upstream_utils/stack_walker_patches/0002-Remove-_M_IX86-checks.patch
+++ b/upstream_utils/stack_walker_patches/0002-Remove-_M_IX86-checks.patch
@@ -1,4 +1,4 @@
-From 238eda525de70b57bade634447c967f4f92bc96d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Mon, 23 May 2022 00:06:45 -0400
 Subject: [PATCH 2/3] Remove _M_IX86 checks
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Remove _M_IX86 checks
 1 file changed, 52 deletions(-)

 diff --git a/Main/StackWalker/StackWalker.h b/Main/StackWalker/StackWalker.h
-index 03efcec..89be951 100644
+index 03efcecf61638f78679e53c5db8ae6f1bc790dda..89be951624836f4cfaf37d713267dce855287ab9 100644
 --- a/Main/StackWalker/StackWalker.h
 +++ b/Main/StackWalker/StackWalker.h
@@ -179,57 +179,6 @@ protected:
--- a/upstream_utils/stack_walker_patches/0003-Add-advapi-pragma.patch
+++ b/upstream_utils/stack_walker_patches/0003-Add-advapi-pragma.patch
@@ -1,4 +1,4 @@
-From 61646f76602a77059c18298caa575b95b702c94c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <pj.reiniger@gmail.com>
 Date: Tue, 24 May 2022 01:24:31 -0400
 Subject: [PATCH 3/3] Add advapi pragma
@@ -8,7 +8,7 @@ Subject: [PATCH 3/3] Add advapi pragma
 1 file changed, 1 insertion(+)

 diff --git a/Main/StackWalker/StackWalker.cpp b/Main/StackWalker/StackWalker.cpp
-index 48c7c57..6f0fbf2 100644
+index 48c7c57c439dd8feb7ea88fda17d68a4bbbb3d68..6f0fbf28a61f13b796edee56c37737bf14f5a933 100644
 --- a/Main/StackWalker/StackWalker.cpp
 +++ b/Main/StackWalker/StackWalker.cpp
@@ -88,6 +88,7 @@