Blame SOURCES/0006-Don-t-assume-has_facet-codecvt_c16-when-run-against-.patch

56505a
From 59388ee3dac5c737086ed1f83f552a44481a2213 Mon Sep 17 00:00:00 2001
56505a
From: David Malcolm <dmalcolm@redhat.com>
56505a
Date: Tue, 31 Aug 2021 16:08:57 -0400
56505a
Subject: [PATCH 06/17] Don't assume has_facet<codecvt_c16> when run against
56505a
 system libstdc++
56505a
56505a
Upstream commit 2019-02-19:
56505a
  P0482R5 char8_t: Standard library support
56505a
    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=c124af936b6b225eb548ccdd7f01400511d784dc
56505a
added new locale facets for char8_t.
56505a
56505a
has_facet<codecvt_c16> returns false, as it is using the std::locale the system libstdc++:
56505a
56505a
$ eu-readelf -s char16_t-char8_t.exe |c++filt |grep UNDEF|grep locale
56505a
    3: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::classic()@GLIBCXX_3.4 (2)
56505a
    8: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::locale(std::locale const&)@GLIBCXX_3.4 (2)
56505a
   13: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::id::_M_id() const@GLIBCXX_3.4 (2)
56505a
   22: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::~locale()@GLIBCXX_3.4 (2)
56505a
   64: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::classic()@@GLIBCXX_3.4
56505a
   76: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::locale(std::locale const&)@@GLIBCXX_3.4
56505a
   89: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::id::_M_id() const@@GLIBCXX_3.4
56505a
  108: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF std::locale::~locale()@@GLIBCXX_3.4
56505a
56505a
Hence this patch tweaks tests so that they bail out if run against an older std::locale.
56505a
---
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/char16_t-char8_t.cc | 3 ++-
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/char16_t.cc         | 3 ++-
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/char32_t-char8_t.cc | 3 ++-
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc         | 3 ++-
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/utf8-char8_t.cc     | 2 ++
56505a
 libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc             | 2 ++
56505a
 6 files changed, 12 insertions(+), 4 deletions(-)
56505a
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/char16_t-char8_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/char16_t-char8_t.cc
56505a
index 71a23bef4..d4aa519a2 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/char16_t-char8_t.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/char16_t-char8_t.cc
56505a
@@ -31,7 +31,8 @@ test01()
56505a
   using namespace std;
56505a
   typedef codecvt<char16_t, char8_t, mbstate_t> codecvt_c16;
56505a
   locale loc_c = locale::classic();
56505a
-  VERIFY(has_facet<codecvt_c16>(loc_c));
56505a
+  if (!has_facet<codecvt_c16>(loc_c))
56505a
+    return;
56505a
   const codecvt_c16* const cvt = &use_facet<codecvt_c16>(loc_c);
56505a
 
56505a
   VERIFY(!cvt->always_noconv());
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/char16_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/char16_t.cc
56505a
index 7b5ce126d..05c77b2b1 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/char16_t.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/char16_t.cc
56505a
@@ -29,7 +29,8 @@ test01()
56505a
   using namespace std;
56505a
   typedef codecvt<char16_t, char, mbstate_t> codecvt_c16;
56505a
   locale loc_c = locale::classic();
56505a
-  VERIFY(has_facet<codecvt_c16>(loc_c));
56505a
+  if (!has_facet<codecvt_c16>(loc_c))
56505a
+    return;
56505a
   const codecvt_c16* const cvt = &use_facet<codecvt_c16>(loc_c);
56505a
 
56505a
   VERIFY(!cvt->always_noconv());
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t-char8_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t-char8_t.cc
56505a
index f30ae22e9..281969e9b 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t-char8_t.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t-char8_t.cc
56505a
@@ -33,7 +33,8 @@ test01()
56505a
   using namespace std;
56505a
   typedef codecvt<char32_t, char8_t, mbstate_t> codecvt_c32;
56505a
   locale loc_c = locale::classic();
56505a
-  VERIFY(has_facet<codecvt_c32>(loc_c));
56505a
+  if (!has_facet<codecvt_c32>(loc_c))
56505a
+    return;
56505a
   const codecvt_c32* const cvt = &use_facet<codecvt_c32>(loc_c);
56505a
 
56505a
   VERIFY(!cvt->always_noconv());
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
56505a
index 558ba9145..82980b702 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
56505a
@@ -31,7 +31,8 @@ test01()
56505a
   using namespace std;
56505a
   typedef codecvt<char32_t, char, mbstate_t> codecvt_c32;
56505a
   locale loc_c = locale::classic();
56505a
-  VERIFY(has_facet<codecvt_c32>(loc_c));
56505a
+  if (!has_facet<codecvt_c32>(loc_c))
56505a
+    return;
56505a
   const codecvt_c32* const cvt = &use_facet<codecvt_c32>(loc_c);
56505a
 
56505a
   VERIFY(!cvt->always_noconv());
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/utf8-char8_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/utf8-char8_t.cc
56505a
index 5eab05ba2..d6f663ce6 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/utf8-char8_t.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/utf8-char8_t.cc
56505a
@@ -34,6 +34,8 @@ void test(const C* from)
56505a
   std::mbstate_t state{};
56505a
   char8_t buf[16] = { };
56505a
   using test_type = std::codecvt<C, char8_t, std::mbstate_t>;
56505a
+  if (!std::has_facet<test_type>(std::locale::classic()))
56505a
+    return;
56505a
   const test_type& cvt = std::use_facet<test_type>(std::locale::classic());
56505a
   auto from_end = from + len;
56505a
   auto from_next = from;
56505a
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
56505a
index b1b3cff31..167bc0ca3 100644
56505a
--- a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
56505a
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
56505a
@@ -32,6 +32,8 @@ void test(const C* from)
56505a
   std::mbstate_t state{};
56505a
   char buf[16] = { };
56505a
   using test_type = std::codecvt<C, char, std::mbstate_t>;
56505a
+  if (!std::has_facet<test_type>(std::locale::classic()))
56505a
+    return;
56505a
   const test_type& cvt = std::use_facet<test_type>(std::locale::classic());
56505a
   auto from_end = from + len;
56505a
   auto from_next = from;
56505a
-- 
56505a
2.31.1
56505a