From patchwork Mon Mar 28 13:33:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52410 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 F0A6D385781D for ; Mon, 28 Mar 2022 13:38:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F0A6D385781D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648474692; bh=7XM+FN2zKN2nutn1UVPRb6VG4Obw6ApkmPGKJqL0YR8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=yt9VEhr297Xv/b65z5LnX1qT3QkHBJPtUS48refRu3e528f92aFhFncjDajJnFDRm LwC60XwUDAVU54A2jdxtPpoyy6aEqIccQW/EwuYqND3IO8/HerVZ1noG/qD4BxO/HK 0vSpwYynjUlp3FjzbXlMVYfcs1zCk6sogwnSWxRw= 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 B3AE5385741D for ; Mon, 28 Mar 2022 13:33:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3AE5385741D Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-60--vQhhTLqN6iGrMoeIyDzZw-1; Mon, 28 Mar 2022 09:33:56 -0400 X-MC-Unique: -vQhhTLqN6iGrMoeIyDzZw-1 Received: by mail-qt1-f197.google.com with SMTP id cb11-20020a05622a1f8b00b002e06f729debso12215624qtb.4 for ; Mon, 28 Mar 2022 06:33:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7XM+FN2zKN2nutn1UVPRb6VG4Obw6ApkmPGKJqL0YR8=; b=w1SlKF3HftPoaeyiQqxIMm+o1SIwwO2vzuF+kYdb7KsrvdzGty6Rarebw9jZvX/Ut0 4gGElY8z09ydxg5Ofi7E2kyk2tAbztcbc+VOEW1a4SsFpZB6daV5n61pG5b1vwIZDv1G ggrYjPh0HWbcC7az9oJImgFznoV3j1coZ+SXriljuDzeW+9FYs6AISFDEbmXadbY8p0z szt2dOvtc6c2in3qsYjQVjyWp8m2RQRMMkt8q6A5tfQFCewlHA6dw6qFzW+/RZdSmGS2 YyaSHJMTbPbygljuZhWDoDXhZN9kIusHSx0yrNSukDr4OvaU1ipv6dxQekO7XGhkbB4r x3Ww== X-Gm-Message-State: AOAM533kgCWXzskTZop96JKYTp2GgtB0eE2B2PuKFWwkuQySj7FlNixc e/imcI9RUHpc0oUbLQkq0lr8asSwOnEF2NN3+ONYfcnZJMb39ErtNYgu3z0sG/dNvHIC5Jwo+jf /LohWR16KuZ7PBVqY2Jkr5QQxRl2PUC2DkXvwBA1zYveE8hw+mbwaT8W6qzKoTbI3tA== X-Received: by 2002:ac8:7d0f:0:b0:2e1:cd79:6c3f with SMTP id g15-20020ac87d0f000000b002e1cd796c3fmr21822338qtb.551.1648474436004; Mon, 28 Mar 2022 06:33:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVG6zezzQ/bFR3tNPj1hKUtOPeEFUijiPXfhl5pJ4EHSbK8Zn2+8EUc519ykIkVdpZ1YB6Wg== X-Received: by 2002:ac8:7d0f:0:b0:2e1:cd79:6c3f with SMTP id g15-20020ac87d0f000000b002e1cd796c3fmr21822303qtb.551.1648474435581; Mon, 28 Mar 2022 06:33:55 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id z15-20020a05622a060f00b002e2070bf899sm11833005qta.90.2022.03.28.06.33.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 06:33:54 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: member alias declaration [PR103968] Date: Mon, 28 Mar 2022 09:33:53 -0400 Message-Id: <20220328133353.2585035-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_LOTSOFHASH, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Here, we were wrongly thinking that (const Options&)Widget::c_options is not value-dependent because neither the type nor the (value of) c_options are dependent, but since we're binding it to a reference we also need to consider that it has a value-dependent address. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/103968 gcc/cp/ChangeLog: * pt.cc (value_dependent_expression_p): Check has_value_dependent_address for conversion to reference. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/alias-decl-mem1.C: New test. --- gcc/cp/pt.cc | 4 ++++ gcc/testsuite/g++.dg/cpp0x/alias-decl-mem1.C | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-mem1.C base-commit: bc86a86a4f2c057bc0e0be94dcbb8c128ae7f717 prerequisite-patch-id: 09e711b54e7911a4a04bd7808abc1b73ae4482ba prerequisite-patch-id: 566cf0772894d0c6a842b2e0ca62eb1d5ae8ad33 prerequisite-patch-id: b1def7e83e76c1652efb483cb2b67e472d15b720 prerequisite-patch-id: 12973b1310781ff6ce5c9792ea689f0673fc5251 prerequisite-patch-id: 8dcc4ecc29dbe7b290325412af70613171456714 diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2738c20dafa..8c1fb864278 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -27482,6 +27482,10 @@ value_dependent_expression_p (tree expression) if (TREE_CODE (expression) == TREE_LIST) return any_value_dependent_elements_p (expression); + if (TREE_CODE (type) == REFERENCE_TYPE + && has_value_dependent_address (expression)) + return true; + return value_dependent_expression_p (expression); } diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-mem1.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-mem1.C new file mode 100644 index 00000000000..3e422de4054 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-mem1.C @@ -0,0 +1,20 @@ +// PR c++/103968 +// { dg-do compile { target c++11 } } + +template +struct trait +{ + template + struct NonInstantiated{}; +}; + +struct Options {}; + +template +struct Widget +{ + static constexpr auto c_options = Options{}; + using Trait = trait; +}; + +Widget::Trait b{}; // Crashes GCC > 10.3