Address review comments

upstream_utils/llvm.py

@@ -13,7 +13,7 @@ def run_global_replacements(wpiutil_llvm_files):
 
         # Rename namespace from llvm to wpi
         content = content.replace("namespace llvm", "namespace wpi")
-        content = content.replace("llvm::", "wpi::")
+        content = content.replace("llvm:", "wpi:")
 
         # Fix #includes
         content = content.replace('include "llvm/ADT', 'include "wpi')

upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:09:18 -0400
-Subject: [PATCH 01/36] Remove StringRef, ArrayRef, and Optional
+Subject: [PATCH 01/37] Remove StringRef, ArrayRef, and Optional
 
 ---
  llvm/include/llvm/ADT/PointerUnion.h          |   1 -

upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:12:41 -0400
-Subject: [PATCH 02/36] Wrap std::min/max calls in parens, for Windows warnings
+Subject: [PATCH 02/37] Wrap std::min/max calls in parens, for Windows warnings
 
 ---
  llvm/include/llvm/ADT/DenseMap.h       |  4 ++--

upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:13:55 -0400
-Subject: [PATCH 03/36] Change unique_function storage size
+Subject: [PATCH 03/37] Change unique_function storage size
 
 ---
  llvm/include/llvm/ADT/FunctionExtras.h | 4 ++--

upstream_utils/llvm_patches/0004-Threading-updates.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:17:19 -0400
-Subject: [PATCH 04/36] Threading updates
+Subject: [PATCH 04/37] Threading updates
 
 - Remove guards for threads and exception
 - Prefer scope gaurd over lock gaurd
 ---
  llvm/include/llvm/Support/Compiler.h |  6 -----
- llvm/lib/Support/ErrorHandling.cpp   | 36 +++++-----------------------
+ llvm/lib/Support/ErrorHandling.cpp   | 38 +++++-----------------------
  llvm/lib/Support/ManagedStatic.cpp   | 10 ++++----
- 3 files changed, 11 insertions(+), 41 deletions(-)
+ 3 files changed, 11 insertions(+), 43 deletions(-)
 
 diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
 index 7710bd9a08148289b5ba3b1f2dae5cccc4f26d4d..2a6accec1e74c9869d724c7733cc75ab6af9dc8d 100644
@@ -36,7 +36,7 @@ index 7710bd9a08148289b5ba3b1f2dae5cccc4f26d4d..2a6accec1e74c9869d724c7733cc75ab
  /// \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 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc37a484a6 100644
+index 561509e0efdf15f6e534f0621a5964d92511114c..89829dc4faff0b2667ded462444e0eaeec53fd01 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
 @@ -44,7 +44,6 @@ static void *ErrorHandlerUserData = nullptr;
@@ -83,16 +83,18 @@ index 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc
      handler = ErrorHandler;
      handlerData = ErrorHandlerUserData;
    }
-@@ -127,7 +119,7 @@ void llvm::report_fatal_error(std::string_view Reason, bool GenCrashDiag) {
+@@ -126,9 +118,7 @@ void llvm::report_fatal_error(std::string_view Reason, bool GenCrashDiag) {
+
  void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
                                             void *user_data) {
- #if LLVM_ENABLE_THREADS == 1
+-#if LLVM_ENABLE_THREADS == 1
 -  std::lock_guard<std::mutex> Lock(BadAllocErrorHandlerMutex);
+-#endif
 +  std::scoped_lock Lock(BadAllocErrorHandlerMutex);
- #endif
    assert(!BadAllocErrorHandler &&
           "Bad alloc error handler already registered!\n");
-@@ -136,9 +128,7 @@ void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
+   BadAllocErrorHandler = handler;
+@@ -136,9 +126,7 @@ void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
  }
 
  void llvm::remove_bad_alloc_error_handler() {
@@ -103,7 +105,7 @@ index 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc
    BadAllocErrorHandler = nullptr;
    BadAllocErrorHandlerUserData = nullptr;
  }
-@@ -149,9 +139,7 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
+@@ -149,9 +137,7 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
    {
      // Only acquire the mutex while reading the handler, so as not to invoke a
      // user-supplied callback under a lock.
@@ -114,7 +116,7 @@ index 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc
      Handler = BadAllocErrorHandler;
      HandlerData = BadAllocErrorHandlerUserData;
    }
-@@ -161,10 +149,6 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
+@@ -161,10 +147,6 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
      llvm_unreachable("bad alloc handler should not return");
    }
 
@@ -125,7 +127,7 @@ index 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc
    // Don't call the normal error handler. It may allocate memory. Directly write
    // an OOM to stderr and abort.
    const char *OOMMessage = "LLVM ERROR: out of memory\n";
-@@ -173,15 +157,8 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
+@@ -173,15 +155,8 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
    (void)!::write(2, Reason, strlen(Reason));
    (void)!::write(2, Newline, strlen(Newline));
    abort();
@@ -141,7 +143,7 @@ index 561509e0efdf15f6e534f0621a5964d92511114c..fbd903ed86f65dbdec5ddd69c541e2fc
  // Causes crash on allocation failure. It is called prior to the handler set by
  // 'install_bad_alloc_error_handler'.
  static void out_of_memory_new_handler() {
-@@ -196,7 +173,6 @@ void llvm::install_out_of_memory_new_handler() {
+@@ -196,7 +171,6 @@ void llvm::install_out_of_memory_new_handler() {
    assert((old == nullptr || old == out_of_memory_new_handler) &&
           "new-handler already installed");
  }

upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:28:13 -0400
-Subject: [PATCH 05/36] \#ifdef guard safety
+Subject: [PATCH 05/37] \#ifdef guard safety
 
 Prevents redefinition if someone is pulling in real LLVM, since the macros are in global namespace
 ---

upstream_utils/llvm_patches/0006-Explicitly-use-std.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:37:34 -0400
-Subject: [PATCH 06/36] Explicitly use std::
+Subject: [PATCH 06/37] Explicitly use std::
 
 ---
  llvm/include/llvm/ADT/SmallSet.h       |  2 +-
@@ -24,10 +24,10 @@ index aeee5f97799aea7e7588d7afba1e47b4fa3d8c7b..4969dfb0d61c2fad805c9cb7bc0184ea
 
  /// Inequality comparison for SmallSet.
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index fbd903ed86f65dbdec5ddd69c541e2fc37a484a6..c205eab6f5467e3f461a168a596e574e3876f77e 100644
+index 89829dc4faff0b2667ded462444e0eaeec53fd01..ea8d60426ead7163550b73e0fdc32cb11bb089cb 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
-@@ -251,7 +251,7 @@ std::error_code llvm::mapLastWindowsError() {
+@@ -249,7 +249,7 @@ std::error_code llvm::mapLastWindowsError() {
  // I'd rather not double the line count of the following.
  #define MAP_ERR_TO_COND(x, y)                                                  \
    case x:                                                                      \

upstream_utils/llvm_patches/0007-Remove-format_provider.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sat, 7 May 2022 22:53:50 -0400
-Subject: [PATCH 07/36] Remove format_provider
+Subject: [PATCH 07/37] Remove format_provider
 
 ---
  llvm/include/llvm/Support/Chrono.h      | 114 ------------------------

upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 13:34:07 -0400
-Subject: [PATCH 08/36] Add compiler warning pragmas
+Subject: [PATCH 08/37] Add compiler warning pragmas
 
 ---
  llvm/include/llvm/ADT/FunctionExtras.h | 11 +++++++++++

upstream_utils/llvm_patches/0009-Remove-unused-functions.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 13:43:50 -0400
-Subject: [PATCH 09/36] Remove unused functions
+Subject: [PATCH 09/37] Remove unused functions
 
 ---
  llvm/include/llvm/ADT/SmallString.h      |  77 ------

upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Thu, 5 May 2022 23:18:34 -0400
-Subject: [PATCH 10/36] Detemplatize SmallVectorBase
+Subject: [PATCH 10/37] Detemplatize SmallVectorBase
 
 ---
  llvm/include/llvm/ADT/SmallVector.h | 35 ++++++++++-----------------

upstream_utils/llvm_patches/0011-Add-vectors-to-raw_ostream.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 13:48:59 -0400
-Subject: [PATCH 11/36] Add vectors to raw_ostream
+Subject: [PATCH 11/37] Add vectors to raw_ostream
 
 ---
  llvm/include/llvm/Support/raw_ostream.h | 115 ++++++++++++++++++++++++

upstream_utils/llvm_patches/0012-Extra-collections-features.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Tue, 3 May 2022 22:16:10 -0400
-Subject: [PATCH 12/36] Extra collections features
+Subject: [PATCH 12/37] Extra collections features
 
 ---
  llvm/lib/Support/raw_ostream.cpp | 8 ++++++++

upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Wed, 4 May 2022 00:01:00 -0400
-Subject: [PATCH 13/36] EpochTracker ABI macro
+Subject: [PATCH 13/37] EpochTracker ABI macro
 
 ---
  llvm/include/llvm/ADT/EpochTracker.h | 2 +-

upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Thu, 5 May 2022 18:09:45 -0400
-Subject: [PATCH 14/36] Delete numbers from MathExtras
+Subject: [PATCH 14/37] Delete numbers from MathExtras
 
 ---
  llvm/include/llvm/Support/MathExtras.h | 36 --------------------------

upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Tue, 3 May 2022 22:50:24 -0400
-Subject: [PATCH 15/36] Add lerp and sgn
+Subject: [PATCH 15/37] Add lerp and sgn
 
 ---
  llvm/include/llvm/Support/MathExtras.h | 21 +++++++++++++++++++++

upstream_utils/llvm_patches/0016-Fixup-includes.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 16:38:11 -0400
-Subject: [PATCH 16/36] Fixup includes
+Subject: [PATCH 16/37] Fixup includes
 
 ---
  llvm/include/llvm/Support/PointerLikeTypeTraits.h |  1 +
@@ -38,7 +38,7 @@ index d53462e742e61d3476915d5b2c5aa63772e78a8a..34054140489e4d536ace4650207c783d
  #include "llvm/Support/SwapByteOrder.h"
  #include <span>
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index c205eab6f5467e3f461a168a596e574e3876f77e..8c22a46cd0f1faa2becb0a686bf1b6fd5b1e46c9 100644
+index ea8d60426ead7163550b73e0fdc32cb11bb089cb..5f53ec03a1c1e91659143f12abec145b95627826 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
 @@ -28,12 +28,11 @@
@@ -57,7 +57,7 @@ index c205eab6f5467e3f461a168a596e574e3876f77e..8c22a46cd0f1faa2becb0a686bf1b6fd
  #endif
 
  using namespace llvm;
-@@ -212,7 +211,7 @@ void LLVMResetFatalErrorHandler() {
+@@ -210,7 +209,7 @@ void LLVMResetFatalErrorHandler() {
  #ifdef _WIN32
 
  #define WIN32_NO_STATUS

upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 16:42:09 -0400
-Subject: [PATCH 17/36] Use std::is_trivially_copy_constructible
+Subject: [PATCH 17/37] Use std::is_trivially_copy_constructible
 
 ---
  llvm/include/llvm/Support/type_traits.h | 16 ----------------

upstream_utils/llvm_patches/0018-Windows-support.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Tue, 3 May 2022 20:22:38 -0400
-Subject: [PATCH 18/36] Windows support
+Subject: [PATCH 18/37] Windows support
 
 ---
  .../llvm/Support/Windows/WindowsSupport.h     | 45 +++++----

upstream_utils/llvm_patches/0019-Remove-call-to-RtlGetLastNtStatus.patch

@@ -1,17 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tyler Veness <[email protected]>
 Date: Tue, 17 Sep 2024 21:19:52 -0700
-Subject: [PATCH 19/36] Remove call to RtlGetLastNtStatus()
+Subject: [PATCH 19/37] Remove call to RtlGetLastNtStatus()
 
 ---
  llvm/lib/Support/ErrorHandling.cpp | 23 -----------------------
  1 file changed, 23 deletions(-)
 
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index 8c22a46cd0f1faa2becb0a686bf1b6fd5b1e46c9..df951849da74091b1a5705c0de483e7497f6e03d 100644
+index 5f53ec03a1c1e91659143f12abec145b95627826..c795f13065c820de772b56be7f59aab63f6ee084 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
-@@ -216,34 +216,11 @@ void LLVMResetFatalErrorHandler() {
+@@ -214,34 +214,11 @@ void LLVMResetFatalErrorHandler() {
  #include <ntstatus.h>
  #include <winerror.h>
 

upstream_utils/llvm_patches/0020-Prefer-fmtlib.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 16:46:20 -0400
-Subject: [PATCH 20/36] Prefer fmtlib
+Subject: [PATCH 20/37] Prefer fmtlib
 
 ---
  llvm/lib/Support/ErrorHandling.cpp | 20 ++++++--------------
  1 file changed, 6 insertions(+), 14 deletions(-)
 
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index df951849da74091b1a5705c0de483e7497f6e03d..f9f2c0047e0193f86ada6b4d9ae5b68445c6a593 100644
+index c795f13065c820de772b56be7f59aab63f6ee084..9b292a51dbd59ad700da22d008a5bcac1c334b26 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
 @@ -22,7 +22,7 @@
@@ -37,7 +37,7 @@ index df951849da74091b1a5705c0de483e7497f6e03d..f9f2c0047e0193f86ada6b4d9ae5b684
    }
 
    // If we reached here, we are failing ungracefully. Run the interrupt handlers
-@@ -179,11 +171,11 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
+@@ -177,11 +169,11 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
    // llvm_unreachable is intended to be used to indicate "impossible"
    // situations, and not legitimate runtime errors.
    if (msg)

upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 16:49:36 -0400
-Subject: [PATCH 21/36] Prefer wpi's fs.h
+Subject: [PATCH 21/37] Prefer wpi's fs.h
 
 ---
  llvm/include/llvm/Support/raw_ostream.h | 7 ++-----

upstream_utils/llvm_patches/0022-Remove-unused-functions.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 19:16:51 -0400
-Subject: [PATCH 22/36] Remove unused functions
+Subject: [PATCH 22/37] Remove unused functions
 
 ---
  llvm/include/llvm/Support/raw_ostream.h |  5 +-
@@ -35,10 +35,10 @@ index 39a600c2ed7cd1cfecb46ff17929ffcb389207d7..9bb9260eecf35b0f71d144256fc956a8
    //===--------------------------------------------------------------------===//
    // Subclass Interface
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index f9f2c0047e0193f86ada6b4d9ae5b68445c6a593..c699e64f2b5e3aab5465388c2b8a197c57273365 100644
+index 9b292a51dbd59ad700da22d008a5bcac1c334b26..51cc3edaa7b128725912e51757cd0b443fe064ae 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
-@@ -184,22 +184,6 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
+@@ -182,22 +182,6 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file,
  #endif
  }
 

upstream_utils/llvm_patches/0023-OS-specific-changes.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Sun, 8 May 2022 19:30:43 -0400
-Subject: [PATCH 23/36] OS-specific changes
+Subject: [PATCH 23/37] OS-specific changes
 
 ---
  llvm/lib/Support/ErrorHandling.cpp | 16 +++++++---------
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
-index c699e64f2b5e3aab5465388c2b8a197c57273365..8fdbe1a0ceb5c9f270124f9fe78fb78e0fdb7a33 100644
+index 51cc3edaa7b128725912e51757cd0b443fe064ae..fcfb90a614a99e333f56f8380e63ff89dd1d684f 100644
 --- a/llvm/lib/Support/ErrorHandling.cpp
 +++ b/llvm/lib/Support/ErrorHandling.cpp
 @@ -96,15 +96,7 @@ void llvm::report_fatal_error(std::string_view Reason, bool GenCrashDiag) {
@@ -28,7 +28,7 @@ index c699e64f2b5e3aab5465388c2b8a197c57273365..8fdbe1a0ceb5c9f270124f9fe78fb78e
  }
 
  void llvm::install_bad_alloc_error_handler(fatal_error_handler_t handler,
-@@ -144,9 +136,15 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
+@@ -142,9 +134,15 @@ void llvm::report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {
    // an OOM to stderr and abort.
    const char *OOMMessage = "LLVM ERROR: out of memory\n";
    const char *Newline = "\n";

upstream_utils/llvm_patches/0024-Use-SmallVector-for-UTF-conversion.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: PJ Reiniger <[email protected]>
 Date: Mon, 9 May 2022 00:04:30 -0400
-Subject: [PATCH 24/36] Use SmallVector for UTF conversion
+Subject: [PATCH 24/37] Use SmallVector for UTF conversion
 
 ---
  llvm/include/llvm/Support/ConvertUTF.h    |  6 +++---