[LLVMSupport] Simplify error reporting in SmallVector and avoid using std::string when producing fatal errors messages

Author: kubamracek

stdlib/public/LLVMSupport/SmallVector.cpp

@@ -45,36 +45,6 @@ static_assert(sizeof(SmallVector<char, 0>) ==
                   sizeof(void *) * 2 + sizeof(void *),
               "1 byte elements have word-sized type for size and capacity");
 
-/// Report that MinSize doesn't fit into this vector's size type. Throws
-/// std::length_error or calls report_fatal_error.
-LLVM_ATTRIBUTE_NORETURN
-static void report_size_overflow(size_t MinSize, size_t MaxSize);
-static void report_size_overflow(size_t MinSize, size_t MaxSize) {
-  std::string Reason = "SmallVector unable to grow. Requested capacity (" +
-                       std::to_string(MinSize) +
-                       ") is larger than maximum value for size type (" +
-                       std::to_string(MaxSize) + ")";
-#ifdef LLVM_ENABLE_EXCEPTIONS
-  throw std::length_error(Reason);
-#else
-  report_fatal_error(Reason);
-#endif
-}
-
-/// Report that this vector is already at maximum capacity. Throws
-/// std::length_error or calls report_fatal_error.
-LLVM_ATTRIBUTE_NORETURN static void report_at_maximum_capacity(size_t MaxSize);
-static void report_at_maximum_capacity(size_t MaxSize) {
-  std::string Reason =
-      "SmallVector capacity unable to grow. Already at maximum size " +
-      std::to_string(MaxSize);
-#ifdef LLVM_ENABLE_EXCEPTIONS
-  throw std::length_error(Reason);
-#else
-  report_fatal_error(Reason);
-#endif
-}
-
 // Note: Moving this function into the header may cause performance regression.
 template <class Size_T>
 static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
@@ -83,14 +53,14 @@ static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
   // Ensure we can fit the new capacity.
   // This is only going to be applicable when the capacity is 32 bit.
   if (MinSize > MaxSize)
-    report_size_overflow(MinSize, MaxSize);
+    report_bad_alloc_error("SmallVector capacity overflow during allocation");
 
   // Ensure we can meet the guarantee of space for at least one more element.
   // The above check alone will not catch the case where grow is called with a
   // default MinSize of 0, but the current capacity cannot be increased.
   // This is only going to be applicable when the capacity is 32 bit.
   if (OldCapacity == MaxSize)
-    report_at_maximum_capacity(MaxSize);
+    report_bad_alloc_error("SmallVector capacity unable to grow");
 
   // In theory 2*capacity can overflow if the capacity is 64 bit, but the
   // original capacity would never be large enough for this to be a problem.