From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id 9CC2D3858C1F; Tue, 10 Jan 2023 10:03:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9CC2D3858C1F Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4NrmbR5KG5z9sTK; Tue, 10 Jan 2023 11:03:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1673344995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rr26267SoKclFqBd9dsZTg2cO8t2YMV12fR9cL7Y1NI=; b=rX0CMMftZ4/NwlSxB1OUHyrfaDVHuHY3nn/1LgMZfXj0c9IxYDeeoAvTH3l+VAfFMK6mZs a5om07S4BYeUydWzhxENg/nCzfmcm30aIEmMsot0yiXAaRQkFW1atMjkkH43KEsVHnKntx 8js4pYOMstuIE62FWfxjdOZOX4nfjn5cBBRKjy60EvFIpzrFfmpTBOdiOI5XHWW1/YDqDp h3fCbvuNOj0UVVfvGIS1mjmmMlVJvfKyESE4iZqvL1BiYhoXk3+LqxPQpEtWjeBMqINQ+X tZV9pmO9XORlCC9uF30HkUUeu6BWk4wOW+CPshzxEi8UsWfFb9/otbSr2Z3nBA== From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= To: libstdc++@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org, =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Subject: [PATCH 2/2] libstdc++: Fix a few !HOSTED test regressions Date: Tue, 10 Jan 2023 11:03:05 +0100 Message-Id: <20230110100305.1420589-2-arsen@aarsen.me> In-Reply-To: <20230110100305.1420589-1-arsen@aarsen.me> References: <20230110100305.1420589-1-arsen@aarsen.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 (std::forward(args)...) }; +} + constexpr bool test01() { - std::unique_ptr a[3] = { std::make_unique(1), - std::make_unique(2), - std::make_unique(3) }; + std::unique_ptr a[3] = { make_unique(1), + make_unique(2), + make_unique(3) }; std::unique_ptr b[3]; auto v = a | views::as_rvalue; ranges::copy(v, b); @@ -33,7 +44,7 @@ test01() void test02() { - std::unique_ptr x = std::make_unique(42); + std::unique_ptr x = make_unique(42); std::unique_ptr 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 -#if __cpp_lib_ranges != 202110L -# error "Feature-test macro __cpp_lib_ranges has wrong value in " +#if __STDC_HOSTED__ +# if __cpp_lib_ranges != 202110L +# error "Feature-test macro __cpp_lib_ranges has wrong value in " +# endif #endif #if __cpp_lib_ranges_zip != 202110L -- 2.39.0