[gcc r13-5146] libstdc++: Fix a few !HOSTED test regressions
Jonathan Wakely
redi@gcc.gnu.org
Fri Jan 13 14:16:50 GMT 2023
https://gcc.gnu.org/g:450eb6b3b5b544d26da2535228ce03f9656a13a5
commit r13-5146-g450eb6b3b5b544d26da2535228ce03f9656a13a5
Author: Arsen Arsenović <arsen@aarsen.me>
Date: Tue Jan 10 11:03:05 2023 +0100
libstdc++: Fix a few !HOSTED test regressions
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.
Diff:
---
libstdc++-v3/testsuite/20_util/to_chars/version.cc | 1 +
.../testsuite/20_util/uses_allocator/lwg3677.cc | 1 +
.../testsuite/20_util/weak_ptr/cons/self_move.cc | 1 +
.../basic_string_view/operations/contains/char.cc | 13 ++++++++-----
.../basic_string_view/operations/contains/char/2.cc | 11 +++++++----
.../testsuite/std/ranges/adaptors/as_rvalue/1.cc | 19 +++++++++++++++----
libstdc++-v3/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 <version>
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 <memory>
#include <testsuite_hooks.h>
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 <memory>
#include <testsuite_hooks.h>
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 <string_view>
-#ifndef __cpp_lib_string_contains
-# error "Feature-test macro for contains missing in <string_view>"
-#elif __cpp_lib_string_contains != 202011L
-# error "Feature-test macro for contains has wrong value in <string_view>"
-#endif
+#if __STDC_HOSTED__
+// This FTM is omitted since <string> is not freestanding.
+# ifndef __cpp_lib_string_contains
+# error "Feature-test macro for contains missing in <string_view>"
+# elif __cpp_lib_string_contains != 202011L
+# error "Feature-test macro for contains has wrong value in <string_view>"
+# 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 <version>
-#ifndef __cpp_lib_string_contains
-# error "Feature-test macro for contains missing in <string_view>"
-#elif __cpp_lib_string_contains != 202011L
-# error "Feature-test macro for contains has wrong value in <string_view>"
+#if __STDC_HOSTED__
+// This FTM is omitted since <string> is not freestanding.
+# ifndef __cpp_lib_string_contains
+# error "Feature-test macro for contains missing in <string_view>"
+# elif __cpp_lib_string_contains != 202011L
+# error "Feature-test macro for contains has wrong value in <string_view>"
+# 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<typename T, typename... Args>
+requires (!std::is_array_v<T>)
+constexpr auto
+make_unique (Args &&...args)
+{
+ return std::unique_ptr<T> { new T (std::forward<Args>(args)...) };
+}
+
constexpr bool
test01()
{
- std::unique_ptr<int> a[3] = { std::make_unique<int>(1),
- std::make_unique<int>(2),
- std::make_unique<int>(3) };
+ std::unique_ptr<int> a[3] = { make_unique<int>(1),
+ make_unique<int>(2),
+ make_unique<int>(3) };
std::unique_ptr<int> b[3];
auto v = a | views::as_rvalue;
ranges::copy(v, b);
@@ -33,7 +44,7 @@ test01()
void
test02()
{
- std::unique_ptr<int> x = std::make_unique<int>(42);
+ std::unique_ptr<int> x = make_unique<int>(42);
std::unique_ptr<int> y;
__gnu_test::test_input_range rx(&x, &x+1);
auto v = rx | views::as_rvalue;
diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
index d9ea9eca6c7..9970301cb5f 100644
--- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
+++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc
@@ -3,8 +3,10 @@
#include <version>
-#if __cpp_lib_ranges != 202110L
-# error "Feature-test macro __cpp_lib_ranges has wrong value in <version>"
+#if __STDC_HOSTED__
+# if __cpp_lib_ranges != 202110L
+# error "Feature-test macro __cpp_lib_ranges has wrong value in <version>"
+# endif
#endif
#if __cpp_lib_ranges_zip != 202110L
More information about the Libstdc++-cvs
mailing list