From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 25FDA3858CDA for ; Thu, 30 Mar 2023 02:58:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 25FDA3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680145095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n2uOZzbk3x4busoAW46gH5F1uV3TDYQHsYRkKI53atk=; b=YPsYp2YwmKm2PE2aRm67vovNfOuWys7QewhY/ty1ea1gQa7qVrOOgtClW4ir/kO6PAVEmA 7aQ0fekQtj1j6fi53MrKrL0Wg4RgvsGwgb1j9MfRCd+KFnSQN1LkouEOGIgBE1NaBi6w/J 1STq9by15EYRqIDdngkRaqyd8TH2mwI= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-13-qutsWsXTM-6UnfuSqaWtww-1; Wed, 29 Mar 2023 22:58:13 -0400 X-MC-Unique: qutsWsXTM-6UnfuSqaWtww-1 Received: by mail-qk1-f200.google.com with SMTP id b142-20020ae9eb94000000b007486a8b9ae9so5639122qkg.11 for ; Wed, 29 Mar 2023 19:58:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680145093; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=n2uOZzbk3x4busoAW46gH5F1uV3TDYQHsYRkKI53atk=; b=1ijDTwGOB1hKb7hNim1TN0fo+SXllBtn8XnbFXOi+fIFOe0eFVjLyciQhoojuCjJof 5M5yE9y64WYNqvmoe0Xq8fm8RArv4dyBCF2uILARqVn1KG9dR1akBQ64kg/KPTH4131K 8wEjy5Q3Vt15zmhOiJdVGIHRKqXL7zsZcrijEViAhrWx+THttMnaPAjsgUBK14k9IrXJ kgE794PHnS+Vc4Zhic+SI8qLQe9aRdr4fYJCHeBvplOeOUEWBu1SanZP8YNeIOgbkptZ 8AbLFBdJ6e+ICe4VEdbKaI3W8n1gQxaQ2Je6XEpJ08cTJ/oEuQbkgYerHyQcvBdboBiD ycHA== X-Gm-Message-State: AO0yUKU/KD+Yjv+4vaT7Ea5pK5B38YLVHn6SAp6tbcC8TL0mhZTTp9hh yKLzxB65QqUNTV9u52Xhk3+9XgiDcu/dyrlWJdN49WS3+nH6bsE5ASQpIrxgxTMhPJFJARTpCnJ /+8ok7lX3DkqySW97Tw== X-Received: by 2002:ac8:5a14:0:b0:3e2:ccf9:bf92 with SMTP id n20-20020ac85a14000000b003e2ccf9bf92mr41497960qta.7.1680145093361; Wed, 29 Mar 2023 19:58:13 -0700 (PDT) X-Google-Smtp-Source: AK7set9h9d9th8USWFmWpJqExPkfr5vEthunea5z9yOqVKO5SDztx5aTg62nM6RCdntlnC3Xw1S9sQ== X-Received: by 2002:ac8:5a14:0:b0:3e2:ccf9:bf92 with SMTP id n20-20020ac85a14000000b003e2ccf9bf92mr41497945qta.7.1680145093028; Wed, 29 Mar 2023 19:58:13 -0700 (PDT) Received: from [192.168.1.108] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id d184-20020a3768c1000000b0074688c36facsm13628091qkc.56.2023.03.29.19.58.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Mar 2023 19:58:12 -0700 (PDT) Message-ID: <39769e1c-9d92-54f0-0438-acb1baed7940@redhat.com> Date: Wed, 29 Mar 2023 22:58:11 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH 2/2] c++: duplicate "use of deleted fn" diagnostic [PR106880] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20230323211803.396326-1-ppalka@redhat.com> <20230323211803.396326-2-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20230323211803.396326-2-ppalka@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: On 3/23/23 17:18, Patrick Palka wrote: > Here we're issuing a duplicate diagnostic for the use of the deleted > foo, first from the CALL_EXPR case of tsubst_copy_and_build (which > doesn't exit early upon failure), and again from from build_over_call > when rebuilding the substituted CALL_EXPR. > > We can fix this by exiting early upon failure of the first call, but > this first call should always be redundant since build_over_call (or > another subroutine of finish_call_expr) ought to reliably call mark_used > for a suitable DECL_P callee anyway. > > So this patch just gets rid of the first call to mark_used. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? OK. > PR c++/106880 > > gcc/cp/ChangeLog: > > * pt.cc (tsubst_copy_and_build) : Don't call > mark_used. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp0x/deleted16.C: New test. > --- > gcc/cp/pt.cc | 6 ------ > gcc/testsuite/g++.dg/cpp0x/deleted16.C | 11 +++++++++++ > 2 files changed, 11 insertions(+), 6 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/deleted16.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 9b3cc33331c..060d2d38504 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -21176,12 +21176,6 @@ tsubst_copy_and_build (tree t, > } > } > > - /* Remember that there was a reference to this entity. */ > - if (function != NULL_TREE > - && DECL_P (function) > - && !mark_used (function, complain) && !(complain & tf_error)) > - RETURN (error_mark_node); > - > if (!maybe_fold_fn_template_args (function, complain)) > return error_mark_node; > > diff --git a/gcc/testsuite/g++.dg/cpp0x/deleted16.C b/gcc/testsuite/g++.dg/cpp0x/deleted16.C > new file mode 100644 > index 00000000000..93cfb51eb3d > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/deleted16.C > @@ -0,0 +1,11 @@ > +// PR c++/106880 > +// Verify we don't emit a "use of deleted function" diagnostic twice. > +// { dg-do compile { target c++11 } } > + > +void foo() = delete; > + > +template > +void f(T t) { foo(t); } // { dg-bogus "deleted function.*deleted function" } > + // { dg-error "deleted function" "" { target *-*-*} .-1 } > + > +template void f(int);