From: Mark de Wever <koraq@xs4all.nl>
Date: Thu, 2 Sep 2021 06:09:10 +0000 (+0200)
Subject: [libc++][nfc] Fixes ppc64le-sanitizer build issue.
X-Git-Tag: upstream/15.0.7~32457
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67794e784e1da5ef74d6310f847a2ec41a79d9ff;p=platform%2Fupstream%2Fllvm.git

[libc++][nfc] Fixes ppc64le-sanitizer build issue.

After landing D103357 the worker ppc64le-sanitizer fails on `__bool`.
This replaces all occurrences with `__boolean`.
---

diff --git a/libcxx/include/__format/format_arg.h b/libcxx/include/__format/format_arg.h
index dd8ef48..35b48c0 100644
--- a/libcxx/include/__format/format_arg.h
+++ b/libcxx/include/__format/format_arg.h
@@ -40,7 +40,7 @@ namespace __format {
 /** The type stored in @ref basic_format_arg. */
 enum class _LIBCPP_ENUM_VIS __arg_t : uint8_t {
   __none,
-  __bool,
+  __boolean,
   __char_type,
   __int,
   __long_long,
@@ -67,8 +67,8 @@ visit_format_arg(_Visitor&& __vis, basic_format_arg<_Context> __arg) {
   switch (__arg.__type_) {
   case __format::__arg_t::__none:
     return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), monostate{});
-  case __format::__arg_t::__bool:
-    return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), __arg.__bool);
+  case __format::__arg_t::__boolean:
+    return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), __arg.__boolean);
   case __format::__arg_t::__char_type:
     return _VSTD::invoke(_VSTD::forward<_Visitor>(__vis), __arg.__char_type);
   case __format::__arg_t::__int:
@@ -142,7 +142,7 @@ private:
   _VSTD::visit_format_arg(_Visitor&& __vis, basic_format_arg<_Ctx> __arg);
 
   union {
-    bool __bool;
+    bool __boolean;
     char_type __char_type;
     int __int;
     unsigned __unsigned;
@@ -163,7 +163,7 @@ private:
   __format::__arg_t __type_;
 
   _LIBCPP_HIDE_FROM_ABI explicit basic_format_arg(bool __v) noexcept
-      : __bool(__v), __type_(__format::__arg_t::__bool) {}
+      : __boolean(__v), __type_(__format::__arg_t::__boolean) {}
 
   template <class _Tp>
   _LIBCPP_HIDE_FROM_ABI explicit basic_format_arg(_Tp __v) noexcept