[libcxx-commits] [libcxx] a5931e2 - [libc++][format] Removes an AIX work-around.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2023-06-20T19:31:08+02:00
New Revision: a5931e2c7b9191ffd255911f2ce1bdf94df4587c

URL: https://github.com/llvm/llvm-project/commit/a5931e2c7b9191ffd255911f2ce1bdf94df4587c
DIFF: https://github.com/llvm/llvm-project/commit/a5931e2c7b9191ffd255911f2ce1bdf94df4587c.diff

LOG: [libc++][format] Removes an AIX work-around.

This work-around was for Clang 13 and older, which we no longer support.

Reviewed By: #libc, ldionne

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

Added: 
    

Modified: 
    libcxx/include/__format/format_functions.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__format/format_functions.h b/libcxx/include/__format/format_functions.h
index 8bb40233477ec..c8b5904084443 100644
--- a/libcxx/include/__format/format_functions.h
+++ b/libcxx/include/__format/format_functions.h
@@ -358,20 +358,6 @@ struct _LIBCPP_TEMPLATE_VIS basic_format_string {
   static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{
       __format::__determine_arg_t<_Context, remove_cvref_t<_Args>>()...};
 
-  // TODO FMT remove this work-around when the AIX ICE has been resolved.
-#    if defined(_AIX) && defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER < 1400
-  template <class _Tp>
-  static constexpr __format::__compile_time_handle<_CharT> __get_handle() {
-    __format::__compile_time_handle<_CharT> __handle;
-    if (__format::__determine_arg_t<_Context, _Tp>() == __format::__arg_t::__handle)
-      __handle.template __enable<_Tp>();
-
-    return __handle;
-  }
-
-  static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{
-      __get_handle<_Args>()...};
-#    else
   static constexpr array<__format::__compile_time_handle<_CharT>, sizeof...(_Args)> __handles_{[] {
     using _Tp = remove_cvref_t<_Args>;
     __format::__compile_time_handle<_CharT> __handle;
@@ -380,7 +366,6 @@ struct _LIBCPP_TEMPLATE_VIS basic_format_string {
 
     return __handle;
   }()...};
-#    endif
 };
 
 template <class... _Args>