From patchwork Tue Dec 28 15:08:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 49335 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 E64453858002 for ; Tue, 28 Dec 2021 15:08:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E64453858002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1640704128; bh=Qe1k/d3XUny4tMF7WnVSSqTik+Uid1BiigsfVh9NrJ0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=x8RAdNCnDP5RhtJmf3199iQ1WFNCkcPe95l1X2BG1BVj0f3Q/7SB3Fpu6c0xf8Dsi BpzJxlvXlw6NmJwiMB1tGFowDRJ5vJ8/YP01WnDMUhmc/7wnl74feOiSaAAFYWwFjI NOW5IKJo3XEVZ44ZT4it6/nD61c17IRbYgMM+Bds= 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 536F13858C60 for ; Tue, 28 Dec 2021 15:08:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 536F13858C60 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-381-b11P79qLPUKuT0r4pZ8mTw-1; Tue, 28 Dec 2021 10:08:18 -0500 X-MC-Unique: b11P79qLPUKuT0r4pZ8mTw-1 Received: by mail-qv1-f69.google.com with SMTP id i3-20020ad45c63000000b0041143710adbso14764643qvh.18 for ; Tue, 28 Dec 2021 07:08:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qe1k/d3XUny4tMF7WnVSSqTik+Uid1BiigsfVh9NrJ0=; b=Fzd/JpMLhb9NmpH7hM9GT7H027NFuCqjHo0ayFCzSYuGcn8UgSuEdoJbLtMK9QbUgs DOMU6E44ULLIsPvWbL2NHcexS4QRjtaWN0dPZjNPLZJ8jd8oJR4YRRaTsGHrVjHXKyhx XLKD4DzdBT1tt3hW9aEgQNYT76f+vyzY/Obq0F1vHSE59HuEW36iN6V6nPDJHMTQCWvA WrvbTvtIf5mUf/XEt3VLbTiKFHu89Zhq/CPQUw1Z3r12mTMLezNxCfmnxE+52X0VAty1 XvjQregVf2JmhJTOwqekQCEbbaGHGdTB+iIcjfuG/eVJZVFXdmm9IVW9QKABJ7XEtKf8 PG7Q== X-Gm-Message-State: AOAM531BLuCAZHJiLpmq7AuFbRvSE6hRN77AwYoNK1rqweh+/fRvEDs9 21O5EdFTSYawUk5ZLHQ5sx3cliHKPJYclYVCKT6boSNdom/mVktN51lKxY8DZ7oau2mpTBTRFHB A9Qy5GkDS1zfnk9kgJQ/LCW2y/Pi3vMiOmbnSKmI/2Va6Jg+FjaPexHnZUqrnwSlmTKw= X-Received: by 2002:a05:620a:cf7:: with SMTP id c23mr15258755qkj.762.1640704097659; Tue, 28 Dec 2021 07:08:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFNPX8/LmWTBd+WVBM3TWIN8bh5bE/KC8Wp103ue/5Owy0YCIDCECnPE6COY64te6d3o6WfA== X-Received: by 2002:a05:620a:cf7:: with SMTP id c23mr15258732qkj.762.1640704097334; Tue, 28 Dec 2021 07:08:17 -0800 (PST) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id y12sm15625693qko.36.2021.12.28.07.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Dec 2021 07:08:16 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: dependent bases and 'this' availability [PR103831] Date: Tue, 28 Dec 2021 10:08:15 -0500 Message-Id: <20211228150815.2034316-1-ppalka@redhat.com> X-Mailer: git-send-email 2.34.1.390.g2ae0a9cb82 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.6 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_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" Here during satisfaction of B's associated constraints we're failing to reject the object-less call to the non-static member function A::size ultimately because satisfaction is performed in the (access) context of the class template B, which has a dependent bases, and so the any_dependent_bases_p check within build_new_method_call causes us to avoid rejecting the call. This patch fixes this by refining the any_dependent_bases_p check within build_new_method_call: dependent bases can't make a difference for resolving the implicit object parameter if we're in a conext where 'this' is unavailable, so let's check current_class_ptr too. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk and perhaps 11? The first testcase exhibits a regression introduced by r12-1937. PR c++/103831 gcc/cp/ChangeLog: * call.c (build_new_method_call): Consider dependent bases only if 'this' is available. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-class3.C: New test. * g++.dg/template/non-dependent18.C: New test. --- gcc/cp/call.c | 2 +- gcc/testsuite/g++.dg/cpp2a/concepts-class3.C | 12 ++++++++++++ .../g++.dg/template/non-dependent18.C | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-class3.C create mode 100644 gcc/testsuite/g++.dg/template/non-dependent18.C diff --git a/gcc/cp/call.c b/gcc/cp/call.c index bee367f57d7..3da9e7a6284 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -11098,7 +11098,7 @@ build_new_method_call (tree instance, tree fns, vec **args, we know we really need it. */ cand->first_arg = instance; } - else if (any_dependent_bases_p ()) + else if (current_class_ptr && any_dependent_bases_p ()) /* We can't tell until instantiation time whether we can use *this as the implicit object argument. */; else diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-class3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-class3.C new file mode 100644 index 00000000000..68b50b71278 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-class3.C @@ -0,0 +1,12 @@ +// PR c++/103831 +// { dg-do compile { target c++20 } } + +struct A { + constexpr int size() { return 42; } // non-static +}; + +template + requires (T::size() == 42) // { dg-error "without object" } +struct B : T { }; + +template struct B; // { dg-error "constraint" } diff --git a/gcc/testsuite/g++.dg/template/non-dependent18.C b/gcc/testsuite/g++.dg/template/non-dependent18.C new file mode 100644 index 00000000000..7fe623d497f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/non-dependent18.C @@ -0,0 +1,19 @@ +// PR c++/103831 +// { dg-do compile { target c++11 } } + +struct A { + constexpr int size() { return 42; } // non-static +}; + +template +struct B : T { + static_assert(A::size() == 42); // { dg-error "without object" } + + static int f() { + static_assert(A::size() == 42, ""); // { dg-error "without object" } + return A::size(); // { dg-error "without object" } + } + + int n = A::size(); + static const int m = A::size(); // { dg-error "without object" } +};