Re: [PATCH 2/2] libstdc++: Fix a few !HOSTED test regressions

2023-01-13 Thread Jonathan Wakely via Gcc-patches
On Tue, 10 Jan 2023 at 10:03, Arsen Arsenović via Libstdc++
 wrote:
>
> libstdc++-v3/ChangeLog:
>
> * testsuite/20_util/to_chars/version.cc: Mark hosted-only.
> * testsuite/20_util/uses_allocator/lwg3677.cc: Ditto.
> * testsuite/20_util/weak_ptr/cons/self_move.cc: Ditto.
> * testsuite/std/ranges/adaptors/as_rvalue/1.cc: Replace usage of
> std::make_unique with a freestanding-compatible wrapper around
> unique_ptr.
> * testsuite/21_strings/basic_string_view/operations/contains/char.cc:
> Don't test for presence of __cpp_lib_string_contains on !HOSTED.
> * 
> testsuite/21_strings/basic_string_view/operations/contains/char/2.cc:
> Ditto.
> * testsuite/std/ranges/version_c++23.cc: Don't test for presence
> of __cpp_lib_ranges in !HOSTED.

Tested powerpc64le-linux and pushed to trunk, thanks!



[PATCH 2/2] libstdc++: Fix a few !HOSTED test regressions

2023-01-10 Thread Arsen Arsenović via Gcc-patches
libstdc++-v3/ChangeLog:

* testsuite/20_util/to_chars/version.cc: Mark hosted-only.
* testsuite/20_util/uses_allocator/lwg3677.cc: Ditto.
* testsuite/20_util/weak_ptr/cons/self_move.cc: Ditto.
* testsuite/std/ranges/adaptors/as_rvalue/1.cc: Replace usage of
std::make_unique with a freestanding-compatible wrapper around
unique_ptr.
* testsuite/21_strings/basic_string_view/operations/contains/char.cc:
Don't test for presence of __cpp_lib_string_contains on !HOSTED.
* testsuite/21_strings/basic_string_view/operations/contains/char/2.cc:
Ditto.
* testsuite/std/ranges/version_c++23.cc: Don't test for presence
of __cpp_lib_ranges in !HOSTED.
---
 .../testsuite/20_util/to_chars/version.cc |  1 +
 .../20_util/uses_allocator/lwg3677.cc |  1 +
 .../20_util/weak_ptr/cons/self_move.cc|  1 +
 .../operations/contains/char.cc   | 13 -
 .../operations/contains/char/2.cc | 11 +++
 .../std/ranges/adaptors/as_rvalue/1.cc| 19 +++
 .../testsuite/std/ranges/version_c++23.cc |  6 --
 7 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/libstdc++-v3/testsuite/20_util/to_chars/version.cc 
b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
index 25b1e0036e8..2789afa28ef 100644
--- a/libstdc++-v3/testsuite/20_util/to_chars/version.cc
+++ b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
@@ -1,5 +1,6 @@
 // { dg-options "-std=gnu++23" }
 // { dg-do preprocess { target c++23 } }
+// { dg-require-effective-target hosted }
 
 #include 
 
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc 
b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
index 649b98d3922..b2595d0eb22 100644
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
@@ -1,5 +1,6 @@
 // { dg-options "-std=gnu++23" }
 // { dg-do run { target c++20 } }
+// { dg-require-effective-target hosted }
 
 #include 
 #include 
diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/cons/self_move.cc 
b/libstdc++-v3/testsuite/20_util/weak_ptr/cons/self_move.cc
index c890d2ba94d..7e38765eb2b 100644
--- a/libstdc++-v3/testsuite/20_util/weak_ptr/cons/self_move.cc
+++ b/libstdc++-v3/testsuite/20_util/weak_ptr/cons/self_move.cc
@@ -1,4 +1,5 @@
 // { dg-do run { target c++11 } }
+// { dg-require-effective-target hosted }
 
 #include 
 #include 
diff --git 
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
 
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
index c71a6dc6c63..8ae56757fe8 100644
--- 
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
+++ 
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char.cc
@@ -22,11 +22,14 @@
 
 #include 
 
-#ifndef __cpp_lib_string_contains
-# error "Feature-test macro for contains missing in "
-#elif __cpp_lib_string_contains != 202011L
-# error "Feature-test macro for contains has wrong value in "
-#endif
+#if __STDC_HOSTED__
+// This FTM is omitted since  is not freestanding.
+# ifndef __cpp_lib_string_contains
+#  error "Feature-test macro for contains missing in "
+# elif __cpp_lib_string_contains != 202011L
+#  error "Feature-test macro for contains has wrong value in "
+# endif
+#endif // HOSTED
 
 void
 test01()
diff --git 
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
 
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
index c106a553f40..d8c85e23249 100644
--- 
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
+++ 
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/contains/char/2.cc
@@ -20,8 +20,11 @@
 
 #include 
 
-#ifndef __cpp_lib_string_contains
-# error "Feature-test macro for contains missing in "
-#elif __cpp_lib_string_contains != 202011L
-# error "Feature-test macro for contains has wrong value in "
+#if __STDC_HOSTED__
+// This FTM is omitted since  is not freestanding.
+# ifndef __cpp_lib_string_contains
+#  error "Feature-test macro for contains missing in "
+# elif __cpp_lib_string_contains != 202011L
+#  error "Feature-test macro for contains has wrong value in "
+# endif
 #endif
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc 
b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
index fbf0d651366..da829606e06 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc
@@ -14,13 +14,24 @@
 namespace ranges = std::ranges;
 namespace views = std::views;
 
+
+/* Replacement for the standard version, as it's not available in freestanding
+   environments.  */
+template
+requires (!std::is_array_v)
+constexpr auto
+make_unique (Args &&...args)
+{
+  return std::unique_ptr { new T