From patchwork Mon Jul 3 23:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 115509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp842405vqx; Mon, 3 Jul 2023 16:08:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xrbzcfe8Z+BMcTUqXDndY/OLH40y5Z8Jw95+3svac5Wc2qSI/rAEoZhWkaKT/C4dsgIgG X-Received: by 2002:a05:6402:5210:b0:51a:41fd:9732 with SMTP id s16-20020a056402521000b0051a41fd9732mr21026089edd.11.1688425685069; Mon, 03 Jul 2023 16:08:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688425685; cv=none; d=google.com; s=arc-20160816; b=Qx8n7CMKnZvleZl+/xMNlYSHkY0yqPF0poetow3p2IHR/SlAH3AqHI6ZmKUQtw8KpB rfljSiHF/lyXEPCX6W8nUez7TZajy8RJhWbMAt7TJ2XQmx8HSiGricD6hUn4PoMH0Vsc yRM7D6hORLs2zp2fry59DEs3VxoYsbgGAZg6oF4ej7CeFDfmroMWAEVumQs92owKgLjK PktcabBbyzPZm1QYVlgxNNFhACxfwMa6aAjbfXWgFQkrC53g/21tJYvKClfHqF6N1o9O lnZBT9OApIwdGG4U4CMZzBqTDsGr1t2TqfN5MaT5KkJONFM0bFtJtfDfqWVbsnnRO+XV vuHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=wCRYR6kml/PtxytGkbHFlMQIcMsLbY78B6CbRdtctVo=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=kuDL63SRYtNVH8Xr0zCgElczXMbiQnKCLvmh/nFLqF9tqN6pk+lme6RBhMyjZIAQHE MLKJqbZ2d///g4fVLsvLQd2lVCkVnNf5mkyOkeOpTU+sx+jgDJDPvCJuz/GpX09MOpru G3GyQ3RyOVtaeCoVbKx2i9/WoJnG6x9Jyu5zSqLvYjQkugK1Sqfpw3ZgN3u9bXLOs022 GTfPhs2pJ82WyDRBFKqq5Xwp+qw2/MbeoECVoeettOLquPxCYFPfbeWFvP0TZ2CmpJ87 ZB8zWpOt7wceQyhFshZwcYslFyeWiuws/I/ejFTqw7MHV5igJU7qiWHtTsjzPst0WBy5 OrYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Kmi7mWTR; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v12-20020a1709060b4c00b0099364d9f0e4si2062261ejg.278.2023.07.03.16.08.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 16:08:05 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Kmi7mWTR; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A6DC43858436 for ; Mon, 3 Jul 2023 23:07:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6DC43858436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688425667; bh=wCRYR6kml/PtxytGkbHFlMQIcMsLbY78B6CbRdtctVo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Kmi7mWTRoGg+0IeLaVkCqT6RXbs3w1k+XxdjcOuBiv6uFUtNBGgyeWzufRKUCGC5I ca+KKQWytkM0go1z2iExzePdRyqtYC2NQbzzwd342ZmzMPWUyV+BPFloiV8oWPrPP1 x9XdCCT3nUOZD7VAv6oKNL+m5jQimcm5LtF+GAHs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DA8C43858436 for ; Mon, 3 Jul 2023 23:07:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DA8C43858436 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-92-_gXzLzANP8uUxuva69fr4w-1; Mon, 03 Jul 2023 19:07:03 -0400 X-MC-Unique: _gXzLzANP8uUxuva69fr4w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C14280123E; Mon, 3 Jul 2023 23:07:03 +0000 (UTC) Received: from localhost (unknown [10.42.28.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id D24E0C00049; Mon, 3 Jul 2023 23:07:02 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Qualify calls to std::_Destroy and _Destroy_aux Date: Tue, 4 Jul 2023 00:06:32 +0100 Message-ID: <20230703230702.995484-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770442651426761362?= X-GMAIL-MSGID: =?utf-8?q?1770442651426761362?= Tested x86_64-linux. Pushed to trunk. This isn't a regression, but is safe to backport. -- >8 -- These calls should be qualified to prevent ADL, which can cause errors for incomplete types that are associated classes. libstdc++-v3/ChangeLog: * include/bits/alloc_traits.h (_Destroy): Qualify call. * include/bits/stl_construct.h (_Destroy, _Destroy_n): Likewise. * testsuite/23_containers/vector/cons/destroy-adl.cc: New test. --- libstdc++-v3/include/bits/alloc_traits.h | 2 +- libstdc++-v3/include/bits/stl_construct.h | 4 ++-- .../23_containers/vector/cons/destroy-adl.cc | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index cd91d152f64..182c3e23eed 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -944,7 +944,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Destroy(_ForwardIterator __first, _ForwardIterator __last, allocator<_Tp>&) { - _Destroy(__first, __last); + std::_Destroy(__first, __last); } #endif /// @endcond diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h index 574f4fa50b4..cf62d927cdb 100644 --- a/libstdc++-v3/include/bits/stl_construct.h +++ b/libstdc++-v3/include/bits/stl_construct.h @@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif #if __cplusplus >= 202002L if (std::__is_constant_evaluated()) - return _Destroy_aux::__destroy(__first, __last); + return std::_Destroy_aux::__destroy(__first, __last); #endif std::_Destroy_aux<__has_trivial_destructor(_Value_type)>:: __destroy(__first, __last); @@ -239,7 +239,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif #if __cplusplus >= 202002L if (std::__is_constant_evaluated()) - return _Destroy_n_aux::__destroy_n(__first, __count); + return std::_Destroy_n_aux::__destroy_n(__first, __count); #endif return std::_Destroy_n_aux<__has_trivial_destructor(_Value_type)>:: __destroy_n(__first, __count); diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc new file mode 100644 index 00000000000..5623842e9b1 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc @@ -0,0 +1,11 @@ +// { dg-do compile } + +#include + +template struct Holder { T t; }; // { dg-bogus "incomplete type" } +struct Incomplete; + +void destroy(std::vector*>* p) +{ + p->~vector(); +}