From patchwork Sat May 4 21:11:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 1931415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=N8TqTsZJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VX0lD3LGrz1xnT for ; Sun, 5 May 2024 07:13:28 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8EAEE384476C for ; Sat, 4 May 2024 21:13:26 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id E6FC33844033; Sat, 4 May 2024 21:11:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E6FC33844033 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E6FC33844033 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714857100; cv=none; b=hH4nh0POh1H9PeCQ0p9gxvEx8S5pQLxuCmctEDr8DaWnLKBvSORyZQI46NC/OLy3dd74rqj7hEuRJcSrqxhf5s6pbW4cINEOedQnsz9JHXxBageFZAnRVCIgjPjWDXa3exi3JNmJXcaA7+1/WHOS4TovvdpywrPqbLFHN221swM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714857100; c=relaxed/simple; bh=gVyRLHncODdL21gQUbqOckk39crl4aSUtqzuKIE+Elo=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=RnZaLcGg1l09pYUN1bhWK7ShaaHDsuuNCP6YBuPK45YGkVNg7qRrS6Af06Qh4WPwTNZ5I85XR30wJt2O9ZSmPO94yPWH71e7218knPo4doNwpxS3knw8MfmdFkc0RBi1/3t4H6d4Y194xQp7Y/g5nDtNHKXelYuj4cRnsix+nMM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-34d8f6cfe5bso542012f8f.3; Sat, 04 May 2024 14:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714857095; x=1715461895; darn=gcc.gnu.org; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=IYNRn5o1hvJFl+/1sCgDxyMwB15E2bjik6j/+DDgj2s=; b=N8TqTsZJLZEfVCdIljmpH5rjumFZfQZdEP3z/qUombkvfwIzoCT5FE8/drg12DbtVd aZoeKXb8JPqEq9pLEujSxaenpx/UWOJqg06Wl7NQJmcEgcHLM9GZU6oGHHmiMhmMbgkh EKsG8KR61uL0+HDbqAb6aeLdXou5CVSLAwcLnKbwU68ViKNsFknEV7MWvmynOlCPitBE CHcNqh0bBWmBVd1nAI+BKT0lrw6P2s/++Mn4qnQPh/wSwdTMGCVg+mH6mXI3n1DApR1q +RlQP6cN97FarxigiE6ADEz9OGQ417tbanwpwnxQo9wED6HBQhIIPSGyiH27UlOvJj7T mB0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714857095; x=1715461895; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IYNRn5o1hvJFl+/1sCgDxyMwB15E2bjik6j/+DDgj2s=; b=DauTbbPViiS6zeVXdxh/ktKYgfz8erM/v9OixmL9VnEdkBxPtyo0XoInqSX+8iG19P BOL1237G7SaS9orXSzhyooyMB2npxPat1ZmEz1jMNrPkfYsvMRkuDwNkcOoaBKGugXr1 LcuzACFEc7DDY86sleQ9tC3uvauq0asKJzCIe+EScus4SkHeKHjH+WgAGtym4NSu8L3n 0rEIzKCnQ2lUhjTWNCpwnVLdo/4O5S5OY18T9k7vfTmle8KNWOayMmJtPsC2Aon8eTPh 3mLSpDlLI89/6akXcTJ0Es+FWuWxzKUFAIknivhw4ivYdQvf322zDyh9wkMa8AkOttwq Nk1Q== X-Gm-Message-State: AOJu0YzWKWqj/n9Xh2J4Nmj0B96hU61+ek9ZhfIwyUJlXPCbG6+2mV4O Elog4Dm7bE9mCpM8iQLTJKPCds0TmvPGcrLL+AYdnxoZc9Aix+xZP7yB/zJj X-Google-Smtp-Source: AGHT+IErRfMwhsxb7mU5a6xYSCnLJuNyID5NNXgcJna3Wcp/Wp+3H8dyNMHTVT+5oROloYuk52hGhQ== X-Received: by 2002:adf:ab14:0:b0:34e:b6b8:80e3 with SMTP id q20-20020adfab14000000b0034eb6b880e3mr1463176wrc.47.1714857094622; Sat, 04 May 2024 14:11:34 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:bea0:9b:a8bb:bc70? ([2a01:e0a:1dc:b1c0:bea0:9b:a8bb:bc70]) by smtp.gmail.com with ESMTPSA id dn2-20020a0560000c0200b0034e14d59f07sm6975016wrb.73.2024.05.04.14.11.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 May 2024 14:11:34 -0700 (PDT) Message-ID: Date: Sat, 4 May 2024 23:11:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: Fix gnu versioned namespace mode 01/03 To: libstdc++ Cc: gcc-patches Content-Language: en-US X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URI_HEX autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org libstdc++: Bump gnu versioned namespace to __9 libstdc++-v3/ChangeLog:             * acinclude.m4 (libtool_VERSION): Bump to 9:0:0.             * config/abi/pre/gnu-versioned-namespace.ver (GLIBCXX_8.0): Replace by GLIBCXX_9.0.             Adapt all references to __8 namespace.             * configure: Regenerate.             * include/bits/c++config (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Define as 'namespace __9{'.             (_GLIBCXX_STD_V): Adapt.             * include/std/format (to_chars): Update namespace version in symbols alias definitions.             (__format::_Arg_store): Update namespace version in make_format_args friend             declaration.             * python/libstdcxx/v6/printers.py (_versioned_namespace): Assign '__9::'.             * python/libstdcxx/v6/xmethods.py: Likewise.             * testsuite/23_containers/map/48101_neg.cc: Adapt dg-error.             * testsuite/23_containers/multimap/48101_neg.cc: Likewise.             * testsuite/20_util/function/cons/70692.cc: Likewise.             * testsuite/20_util/function_objects/bind_back/111327.cc: Likewise.             * testsuite/20_util/function_objects/bind_front/111327.cc: Likewise.             * testsuite/lib/prune.exp (libstdc++-dg-prune): Bump version namespace. Ok to commit ? François diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 51a08bcc8b1..8978355a6d3 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4243,7 +4243,7 @@ case $enable_symvers in [Define to use GNU versioning in the shared library.]) ;; gnu-versioned-namespace) - libtool_VERSION=8:0:0 + libtool_VERSION=9:0:0 SYMVER_FILE=config/abi/pre/gnu-versioned-namespace.ver AC_DEFINE(_GLIBCXX_SYMVER_GNU_NAMESPACE, 1, [Define to use GNU namespace versioning in the shared library.]) diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver index bdf8f40f1f6..d3d30b5bafa 100644 --- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver +++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver @@ -19,7 +19,7 @@ ## with this library; see the file COPYING3. If not see ## . -GLIBCXX_8.0 { +GLIBCXX_9.0 { global: @@ -27,7 +27,7 @@ GLIBCXX_8.0 { extern "C++" { std::*; - std::__8::*; + std::__9::*; }; # operator new(size_t) @@ -59,7 +59,7 @@ GLIBCXX_8.0 { # vtable _ZTVSt*; _ZTVNSt*; - _ZTVN9__gnu_cxx3__818stdio_sync_filebufI[cw]NSt3__811char_traitsI[cw]EEEE; + _ZTVN9__gnu_cxx3__918stdio_sync_filebufI[cw]NSt3__911char_traitsI[cw]EEEE; # thunk _ZTv0_n12_NS*; @@ -74,7 +74,7 @@ GLIBCXX_8.0 { _ZTSNSt*; # locale - _ZNSt3__89has_facetINS_*; + _ZNSt3__99has_facetINS_*; # thread/mutex/condition_variable/future __once_proxy; @@ -84,37 +84,37 @@ GLIBCXX_8.0 { __emutls_v._ZSt3__815__once_callable; # std::__convert_to_v - _ZNSt3__814__convert_to_v*; + _ZNSt3__914__convert_to_v*; # std::__copy_streambufs - _ZNSt3__817__copy_streambufsI*; - _ZNSt3__821__copy_streambufs_eofI*; + _ZNSt3__917__copy_streambufsI*; + _ZNSt3__921__copy_streambufs_eofI*; # std::__istream_extract(wistream&, wchar_t*, streamsize) - _ZNSt3__817__istream_extractIwNS_11char_traitsIwEEEEvRNS_13basic_istreamIT_T0_EEPS4_[ilx]; + _ZNSt3__917__istream_extractIwNS_11char_traitsIwEEEEvRNS_13basic_istreamIT_T0_EEPS4_[ilx]; # __gnu_cxx::__atomic_add # __gnu_cxx::__exchange_and_add - _ZN9__gnu_cxx3__812__atomic_addEPV[il][il]; - _ZN9__gnu_cxx3__818__exchange_and_addEPV[li][il]; + _ZN9__gnu_cxx3__912__atomic_addEPV[il][il]; + _ZN9__gnu_cxx3__918__exchange_and_addEPV[li][il]; # __gnu_cxx::__pool - _ZN9__gnu_cxx3__86__poolILb[01]EE13_M_initializeEv; - _ZN9__gnu_cxx3__86__poolILb[01]EE16_M_reserve_blockE[jmy][jmy]; - _ZN9__gnu_cxx3__86__poolILb[01]EE16_M_reclaim_blockEPc[jmy]; - _ZN9__gnu_cxx3__86__poolILb[01]EE10_M_destroyEv; - _ZN9__gnu_cxx3__86__poolILb1EE16_M_get_thread_idEv; + _ZN9__gnu_cxx3__96__poolILb[01]EE13_M_initializeEv; + _ZN9__gnu_cxx3__96__poolILb[01]EE16_M_reserve_blockE[jmy][jmy]; + _ZN9__gnu_cxx3__96__poolILb[01]EE16_M_reclaim_blockEPc[jmy]; + _ZN9__gnu_cxx3__96__poolILb[01]EE10_M_destroyEv; + _ZN9__gnu_cxx3__96__poolILb1EE16_M_get_thread_idEv; - _ZN9__gnu_cxx3__817__pool_alloc_base9_M_refillE[jmy]; - _ZN9__gnu_cxx3__817__pool_alloc_base16_M_get_free_listE[jmy]; - _ZN9__gnu_cxx3__817__pool_alloc_base12_M_get_mutexEv; + _ZN9__gnu_cxx3__917__pool_alloc_base9_M_refillE[jmy]; + _ZN9__gnu_cxx3__917__pool_alloc_base16_M_get_free_listE[jmy]; + _ZN9__gnu_cxx3__917__pool_alloc_base12_M_get_mutexEv; - _ZN9__gnu_cxx3__89free_list6_M_getE[jmy]; - _ZN9__gnu_cxx3__89free_list8_M_clearEv; + _ZN9__gnu_cxx3__99free_list6_M_getE[jmy]; + _ZN9__gnu_cxx3__99free_list8_M_clearEv; # __gnu_cxx::stdio_sync_filebuf - _ZTVN9__gnu_cxx3__818stdio_sync_filebufI[cw]St3__811char_traitsI[cw]EEE; - _ZN9__gnu_cxx3__818stdio_sync_filebufI[cw]NSt3__811char_traitsI[cw]EEE[5-9]*; + _ZTVN9__gnu_cxx3__918stdio_sync_filebufI[cw]St3__911char_traitsI[cw]EEE; + _ZN9__gnu_cxx3__918stdio_sync_filebufI[cw]NSt3__911char_traitsI[cw]EEE[5-9]*; # debug mode _ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv; @@ -147,10 +147,10 @@ GLIBCXX_8.0 { _ZN14__gnu_parallel9_Settings3setERS0_; # to_chars/from_chars _Float128 - _ZNSt3__88to_charsEPcS0_DF128_; - _ZNSt3__88to_charsEPcS0_DF128_NS_12chars_formatE; - _ZNSt3__88to_charsEPcS0_DF128_NS_12chars_formatEi; - _ZNSt3__810from_charsEPKcS1_RDF128_NS_12chars_formatE; + _ZNSt3__98to_charsEPcS0_DF128_; + _ZNSt3__98to_charsEPcS0_DF128_NS_12chars_formatE; + _ZNSt3__98to_charsEPcS0_DF128_NS_12chars_formatEi; + _ZNSt3__910from_charsEPKcS1_RDF128_NS_12chars_formatE; local: *; @@ -247,7 +247,7 @@ CXXABI_2.0 { _ZSt15_Fnv_hash_bytesPKv*; # __gnu_cxx::_verbose_terminate_handler() - _ZN9__gnu_cxx3__827__verbose_terminate_handlerEv; + _ZN9__gnu_cxx3__927__verbose_terminate_handlerEv; # *_type_info classes, ctor and dtor _ZN10__cxxabiv117__array_type_info*; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 21abaeb0778..343853e4b1e 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -51047,7 +51047,7 @@ $as_echo "#define _GLIBCXX_SYMVER_GNU 1" >>confdefs.h ;; gnu-versioned-namespace) - libtool_VERSION=8:0:0 + libtool_VERSION=9:0:0 SYMVER_FILE=config/abi/pre/gnu-versioned-namespace.ver $as_echo "#define _GLIBCXX_SYMVER_GNU_NAMESPACE 1" >>confdefs.h diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index b57e3f338e9..16ef2429367 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -362,7 +362,7 @@ namespace __gnu_cxx #if _GLIBCXX_INLINE_VERSION // Inline namespace for symbol versioning of (nearly) everything in std. -# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __8 { +# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __9 { # define _GLIBCXX_END_NAMESPACE_VERSION } // Unused when everything in std is versioned anyway. # define _GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(X) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 48deba2bcb2..1ba71e7a3b9 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1367,7 +1367,7 @@ namespace __format to_chars_result to_chars(char*, char*, _Float128) noexcept # if _GLIBCXX_INLINE_VERSION - __asm("_ZNSt3__88to_charsEPcS0_DF128_"); + __asm("_ZNSt3__98to_charsEPcS0_DF128_"); # else __asm("_ZSt8to_charsPcS_DF128_"); # endif @@ -1375,7 +1375,7 @@ namespace __format to_chars_result to_chars(char*, char*, _Float128, chars_format) noexcept # if _GLIBCXX_INLINE_VERSION - __asm("_ZNSt3__88to_charsEPcS0_DF128_NS_12chars_formatE"); + __asm("_ZNSt3__98to_charsEPcS0_DF128_NS_12chars_formatE"); # else __asm("_ZSt8to_charsPcS_DF128_St12chars_format"); # endif @@ -1383,7 +1383,7 @@ namespace __format to_chars_result to_chars(char*, char*, _Float128, chars_format, int) noexcept # if _GLIBCXX_INLINE_VERSION - __asm("_ZNSt3__88to_charsEPcS0_DF128_NS_12chars_formatEi"); + __asm("_ZNSt3__98to_charsEPcS0_DF128_NS_12chars_formatEi"); # else __asm("_ZSt8to_charsPcS_DF128_St12chars_formati"); # endif @@ -3707,7 +3707,7 @@ namespace __format template friend auto std:: #if _GLIBCXX_INLINE_VERSION - __8:: // Needed for PR c++/59256 + __9:: // Needed for PR c++/59256 #endif make_format_args(_Argz&...) noexcept; diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index a6c2ed4599f..037228a02de 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -126,7 +126,7 @@ def find_type(orig, name): raise ValueError("Cannot find type %s::%s" % (str(orig), name)) -_versioned_namespace = '__8::' +_versioned_namespace = '__9::' def lookup_templ_spec(templ, *args): diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py index 436c866e001..617b9a16e3f 100644 --- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py +++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py @@ -28,7 +28,7 @@ def get_bool_type(): def get_std_size_type(): return gdb.lookup_type('std::size_t') -_versioned_namespace = '__8::' +_versioned_namespace = '__9::' def is_specialization_of(x, template_name): """ diff --git a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc index b15208a2531..26324d3f078 100644 --- a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc +++ b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc @@ -11,4 +11,4 @@ int main() std::function ff(f); // { dg-error "no matching function" } std::function f2(f); // { dg-error "no matching function" } } -// { dg-error "std::(__8::)?enable_if" "" { target *-*-* } 0 } +// { dg-error "std::(__9::)?enable_if" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/20_util/function_objects/bind_back/111327.cc b/libstdc++-v3/testsuite/20_util/function_objects/bind_back/111327.cc index d634db9dc1d..2ef70134db1 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/bind_back/111327.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_back/111327.cc @@ -39,4 +39,4 @@ int main() { std::move(std::as_const(g1))(); } -// { dg-error "no type named 'type' in 'struct std::invoke_result" "" { target c++23 } 0 } +// { dg-error "no type named 'type' in 'struct std::(__9::)?invoke_result" "" { target c++23 } 0 } diff --git a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/111327.cc b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/111327.cc index 5fe0a83baec..d9bb5a39560 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/111327.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/111327.cc @@ -39,4 +39,4 @@ int main() { std::move(std::as_const(g1))(); } -// { dg-error "no type named 'type' in 'struct std::invoke_result" "" { target c++23 } 0 } +// { dg-error "no type named 'type' in 'struct std::(__9::)?invoke_result" "" { target c++23 } 0 } diff --git a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc index 71deaef2881..fa964355c21 100644 --- a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc @@ -28,8 +28,8 @@ test01() c2.find(2); // { dg-error "here" } } -// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 } -// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__9::)?less" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__9::)?allocator" "" { target *-*-* } 0 } // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 } // { dg-prune-output "no match for call" } // { dg-prune-output "invalid conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc index 5b40fe3e021..360d1f28585 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc @@ -28,8 +28,8 @@ test01() c2.find(2); // { dg-error "here" } } -// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 } -// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__9::)?less" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__9::)?allocator" "" { target *-*-* } 0 } // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 } // { dg-prune-output "no match for call" } // { dg-prune-output "invalid conversion" } diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp index 071dcf34c1e..2219744d357 100644 --- a/libstdc++-v3/testsuite/lib/prune.exp +++ b/libstdc++-v3/testsuite/lib/prune.exp @@ -37,7 +37,7 @@ proc libstdc++-dg-prune { system text } { return "::unsupported::hosted C++ headers not supported" } - regsub -all "std::__8::" $text "std::" text + regsub -all "std::__9::" $text "std::" text # Ignore caret diagnostics. Unfortunately dejaGNU trims leading # spaces, so one cannot rely on them being present.