commit 17e393195521c8cd4ba376b46ea50e247860b64f
author Nathan Sidwell <nathan@acm.org> Wed Feb 16 08:03:24 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 16 09:00:34 2022 -0800
tree 2ace07e1301174f395eb4fc187bed80e7c01d793
parent 1dee448965bc6bdf94ed241fdf4bcc308dc5f9aa

[demangler] Fix build breakage

The copy and pristine versions of Utility diverged and one didn't
include <algorithm>.  As that's a rather large header, let's just open
code the comparisons.

Reviewed By:

Differential Revision: https://reviews.llvm.org/

GitOrigin-RevId: fbf7bbcb839929ff4eed89921191ed51a2a99777

src/demangle/Utility.h

diff --git a/src/demangle/Utility.h b/src/demangle/Utility.h
index 4ec821c..21e5efb 100644
--- a/src/demangle/Utility.h
+++ b/src/demangle/Utility.h
@@ -17,7 +17,6 @@
 #define DEMANGLE_UTILITY_H
 
 #include "StringView.h"
-#include <algorithm>
 #include <array>
 #include <cstdint>
 #include <cstdlib>
@@ -40,8 +39,11 @@
     if (Need > BufferCapacity) {
       // Avoid many reallocations during startup, with a bit of hysteresis.
       constexpr size_t MinInitAlloc = 1024;
-      Need = std::max(Need, MinInitAlloc);
-      BufferCapacity = std::max(Need, BufferCapacity * 2);
+      if (Need < MinInitAlloc)
+        Need = MinInitAlloc;
+      BufferCapacity *= 2;
+      if (BufferCapacity < Need)
+        BufferCapacity = Need;
       Buffer = static_cast<char *>(std::realloc(Buffer, BufferCapacity));
       if (Buffer == nullptr)
         std::terminate();