From patchwork Fri Jun 2 15:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 70539 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22FF1385772C for ; Fri, 2 Jun 2023 15:55:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22FF1385772C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685721352; bh=abQN4UNREbWnLDuZsFGJRl1SRHpk80bI55S/vdPifqw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=VX+EqKr+mSPysd+XxSqybf/M5RTfH7tbMaXNvPQutqKxk9Fwwve66bazkz/wvXOAF s3YepuyKjmrxOFKfskqcAXpNp4sC/kS1w40GZUJmU9XvM0D4YavCdVgc9tdGmlhDDc y2EFiqPxaat2Y82Ocy+hGXV5Sqk9bp8ZejNporcw= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id A1A993858C20 for ; Fri, 2 Jun 2023 15:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A1A993858C20 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-173-lidJyh1XMJ2nnANTepfzZg-1; Fri, 02 Jun 2023 11:55:23 -0400 X-MC-Unique: lidJyh1XMJ2nnANTepfzZg-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-75ca9600c3fso341356885a.1 for ; Fri, 02 Jun 2023 08:55:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685721322; x=1688313322; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=abQN4UNREbWnLDuZsFGJRl1SRHpk80bI55S/vdPifqw=; b=g8zcGG5hAkD9WvBXR3ZYwUzK2F4K+JO4vEcEH3sDaJvEvZv1+4dJAxmWw2B+1Tjq/8 /T0/T65yK5D5CPgKlsef64UvT2rtvMRgwCgKrriY9Zgp556MHhRsCiXdPe2rNekK6qkg bP8+U7I1BYuL894ZLh/A1SKwIA5iReOyu0pW66QmqbDVQNZlmEx0d3RR8hk9RtQKjmg4 dqAcsSGldZLy7sTfzgIrwDGqKNpksJXjjn/hitEd+rsgLOghnJyqrVwMy0vreXxzkWZq qmXcwWo9UMnxefYST6cjayoyN2x8sHWy873BLXG5qGttA6oeeMxx+/FNe6wUpl+FXHUY iB7w== X-Gm-Message-State: AC+VfDzZC7xzQFhomXJHXyEOL4mXNHLR4xBa9cRTlkJUwm3WynrgJxhj iw4deBtvIXTwP8p9EZLc7uuCmhqSBorXGpzHv9r5Ywso1HqcYyuN9mjYo1CjI7mmAdsw2E9HLnZ VfgKCzg/e6I4AuZMOJ4CEJOoNg3GjqgOXEmde79JKMfI2qbYZ7DAI/GmtJ99CHG/MwHeuWzeESA g= X-Received: by 2002:a05:620a:601b:b0:75b:23a1:3615 with SMTP id dw27-20020a05620a601b00b0075b23a13615mr14601729qkb.38.1685721322254; Fri, 02 Jun 2023 08:55:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Lp2ZpW5cJFJsJ0LpocFd3sgZxe8ux3fI+xxmbvZCSemotdRqG5X1uQ7FVNQIaIg3LPDIv3Q== X-Received: by 2002:a05:620a:601b:b0:75b:23a1:3615 with SMTP id dw27-20020a05620a601b00b0075b23a13615mr14601707qkb.38.1685721321927; Fri, 02 Jun 2023 08:55:21 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id g21-20020a37e215000000b0075945c93107sm754187qki.102.2023.06.02.08.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 08:55:21 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: bad 'this' conversion for nullary memfn [PR106760] Date: Fri, 2 Jun 2023 11:55:19 -0400 Message-ID: <20230602155519.2300026-1-ppalka@redhat.com> X-Mailer: git-send-email 2.41.0.rc1.10.g9e49351c30 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.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, 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped and regtested on x86_64-pc-linu-xgnu, does this look OK for trunk? -- >8 -- Here we notice the 'this' conversion for the call f() is bad, so we correctly defer instantiating it, but we end up never adding it to 'bad_fns' since missing_conversion_p for it returns false (its only argument is the already computed 'this' argument). This is not a huge deal, but it causes us to longer accept the call with -fpermissive. So if we have a non-strictly viable template candidate that has not been instantiated, then we need to add it to 'bad_fns' even if it doesn't have any missing conversions. PR c++/106760 gcc/cp/ChangeLog: * call.cc (add_candidates): Relax test for adding a candidate to 'bad_fns' to accept an uninstantiated template candidate that has no missing conversions. gcc/testsuite/ChangeLog: * g++.dg/ext/conv3.C: New test. --- gcc/cp/call.cc | 3 ++- gcc/testsuite/g++.dg/ext/conv3.C | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ext/conv3.C diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index 2736f55f229..dbf42567cc9 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -6632,7 +6632,8 @@ add_candidates (tree fns, tree first_arg, const vec *args, if (cand->viable == -1 && shortcut_bad_convs - && missing_conversion_p (cand)) + && (TREE_CODE (cand->fn) == TEMPLATE_DECL + || missing_conversion_p (cand))) { /* This candidate has been tentatively marked non-strictly viable, and we didn't compute all argument conversions for it (having diff --git a/gcc/testsuite/g++.dg/ext/conv3.C b/gcc/testsuite/g++.dg/ext/conv3.C new file mode 100644 index 00000000000..5f4b4d4cc50 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/conv3.C @@ -0,0 +1,16 @@ +// PR c++/106760 +// { dg-additional-options "-fpermissive" } + +struct S { + template + int f(...); + + int g() const { + return f(); // { dg-warning "discards qualifiers" } + } +}; + +int main() { + S s; + s.g(); +}