Merge branch 'llvm18'

Upgrades the LLVM, Clang, and LLD dependencies to LLVM 18.x

Related to #16270

1 files changed, 6 insertions, 14 deletions

diff --git a/lib/libcxx/include/__format/format_string.h b/lib/libcxx/include/__format/format_string.h
index 2e1c71b3d0..bdf3cff7f4 100644
--- a/lib/libcxx/include/__format/format_string.h
+++ b/lib/libcxx/include/__format/format_string.h
@@ -38,8 +38,7 @@ template <contiguous_iterator _Iterator>
 __parse_number_result(_Iterator, uint32_t) -> __parse_number_result<_Iterator>;
 
 template <contiguous_iterator _Iterator>
-_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_Iterator>
-__parse_number(_Iterator __begin, _Iterator __end);
+_LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_Iterator> __parse_number(_Iterator __begin, _Iterator __end);
 
 /**
  * The maximum value of a numeric argument.
@@ -66,9 +65,7 @@ template <contiguous_iterator _Iterator>
 _LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_Iterator>
 __parse_automatic(_Iterator __begin, _Iterator, auto& __parse_ctx) {
   size_t __value = __parse_ctx.next_arg_id();
-  _LIBCPP_ASSERT_UNCATEGORIZED(
-      __value <= __number_max,
-      "Compilers don't support this number of arguments");
+  _LIBCPP_ASSERT_UNCATEGORIZED(__value <= __number_max, "Compilers don't support this number of arguments");
 
   return {__begin, uint32_t(__value)};
 }
@@ -93,8 +90,7 @@ template <contiguous_iterator _Iterator>
 _LIBCPP_HIDE_FROM_ABI constexpr __parse_number_result<_Iterator>
 __parse_number(_Iterator __begin, _Iterator __end_input) {
   using _CharT = iter_value_t<_Iterator>;
-  static_assert(__format::__number_max == INT32_MAX,
-                "The algorithm is implemented based on this value.");
+  static_assert(__format::__number_max == INT32_MAX, "The algorithm is implemented based on this value.");
   /*
    * Limit the input to 9 digits, otherwise we need two checks during every
    * iteration:
@@ -102,7 +98,7 @@ __parse_number(_Iterator __begin, _Iterator __end_input) {
    * - Does the value exceed width of an uint32_t? (Switching to uint64_t would
    *   have the same issue, but with a higher maximum.)
    */
-  _Iterator __end = __end_input - __begin > 9 ? __begin + 9 : __end_input;
+  _Iterator __end  = __end_input - __begin > 9 ? __begin + 9 : __end_input;
   uint32_t __value = *__begin - _CharT('0');
   while (++__begin != __end) {
     if (*__begin < _CharT('0') || *__begin > _CharT('9'))
@@ -111,9 +107,7 @@ __parse_number(_Iterator __begin, _Iterator __end_input) {
     __value = __value * 10 + *__begin - _CharT('0');
   }
 
-  if (__begin != __end_input && *__begin >= _CharT('0') &&
-      *__begin <= _CharT('9')) {
-
+  if (__begin != __end_input && *__begin >= _CharT('0') && *__begin <= _CharT('9')) {
     /*
      * There are more than 9 digits, do additional validations:
      * - Does the 10th digit exceed the maximum allowed value?
@@ -121,9 +115,7 @@ __parse_number(_Iterator __begin, _Iterator __end_input) {
      * (More than 10 digits always overflows the maximum.)
      */
     uint64_t __v = uint64_t(__value) * 10 + *__begin++ - _CharT('0');
-    if (__v > __number_max ||
-        (__begin != __end_input && *__begin >= _CharT('0') &&
-         *__begin <= _CharT('9')))
+    if (__v > __number_max || (__begin != __end_input && *__begin >= _CharT('0') && *__begin <= _CharT('9')))
       std::__throw_format_error("The numeric value of the format specifier is too large");
 
     __value = __v;