From patchwork Mon Oct 4 21:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 45799 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 16BAB3858438 for ; Mon, 4 Oct 2021 21:10:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16BAB3858438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633381808; bh=5uwwR0g0QdQTmSeMvhDJ5f2jmGKfGkv3D/jrsrv4X48=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=bsjNOnltTcMXHKfFdfljN1oTmwpt3A9lLCP11jEEwDOutgSLTKuuqueXaIGXZT6PW qoj4de0vQu/aFPJN1e16jFRRdws9DmcXUndNlaRnS50BY0DsDbHLxd1hicWEYgW6K9 FtgrS+nnXN+VefDBoKEGTZxLliXz6VLXKk4eWWM0= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 38C8D3858402 for ; Mon, 4 Oct 2021 21:09:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 38C8D3858402 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-0tQJ0bN5OzWUHvCGvPUMyQ-1; Mon, 04 Oct 2021 17:09:38 -0400 X-MC-Unique: 0tQJ0bN5OzWUHvCGvPUMyQ-1 Received: by mail-qt1-f198.google.com with SMTP id k1-20020ac80201000000b002a7200b449eso9911983qtg.18 for ; Mon, 04 Oct 2021 14:09:38 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5uwwR0g0QdQTmSeMvhDJ5f2jmGKfGkv3D/jrsrv4X48=; b=U/IfU9CNALVQVGn39hG43bZ2syRf5cDyoxpNcafJK+08QU1uYCxt3KetQEWCSihZ7M BM7YoJmqK7q6X317mKlaAvi7VibJfU4G/yVuBuA5v6DtaXPUmFYKSYwVaIzf9xqETZaN mG3zAGA4G2gcWV5vUGepb1lbVRLsSf9T91Sbse3E2LJSe2S/1g72y6Wo3n0ngAR1RL3w ijuLqWJ0DVsolqWwjgLwVUjL8emiBscItoJ1RMGmkDTr347dS+z34sGoxYOiVQOwkn+x ZrEBOpqjioAGhZXD3d7iag9BpTv1c07AanZw+zzZQliH+aUnZwifqCgzKc/yV3j0dt7S 31fg== X-Gm-Message-State: AOAM533afrPrun+mQ+bFp37b6iH0QtLg57TQP1EZG/ZVUf6X9t1ULq24 PPTJU5dS4tmjFC5RSGOkXmFCTT1Dhx3KwZzXaUtT1Urv24ft86hh+ysxTH4WeTI8c9pZPQyRsG8 FqHyC5zZwwHx5j7eGLr+F+/gvA6t2U+CVo86ea441FmfPbYTMsESt+EsH4WGCiu4Bf6E= X-Received: by 2002:ac8:6e8f:: with SMTP id c15mr16084523qtv.179.1633381777491; Mon, 04 Oct 2021 14:09:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOIzCsy7Pi1aOrH704OOwYaUyOuZ/xQrjB9dKttXE/tPQx+TUIxIwx2f/pRWUd7MGEZqlyhg== X-Received: by 2002:ac8:6e8f:: with SMTP id c15mr16084488qtv.179.1633381777173; Mon, 04 Oct 2021 14:09:37 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id l3sm9469936qtu.47.2021.10.04.14.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 14:09:36 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: templated static local var has value-dep addr [PR98930] Date: Mon, 4 Oct 2021 17:09:35 -0400 Message-Id: <20211004210935.1348147-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.0.610.gcefe983a32 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.7 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_H2, 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 uses_template_parms is returning false for the dependent type A<&impl::i>, which causes tsubst_aggr_type to think it's non-dependent and not bothering substituting into it, leading to breakage. This patch fixes this by making has_value_dependent_address also return true for templated static local variables. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/98930 gcc/cp/ChangeLog: * pt.c (has_value_dependent_address): Return true for a static local variable from a function template. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/nontype4.C: New test. * g++.dg/cpp1z/nontype4a.C: New test. --- gcc/cp/pt.c | 7 +++++++ gcc/testsuite/g++.dg/cpp1z/nontype4.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/cpp1z/nontype4a.C | 14 ++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1z/nontype4.C create mode 100644 gcc/testsuite/g++.dg/cpp1z/nontype4a.C diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5e819c9598c..06579e1be07 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6763,8 +6763,15 @@ has_value_dependent_address (tree op) if (DECL_P (op)) { tree ctx = CP_DECL_CONTEXT (op); + if (TYPE_P (ctx) && dependent_type_p (ctx)) return true; + + if (VAR_P (op) + && TREE_STATIC (op) + && TREE_CODE (ctx) == FUNCTION_DECL + && type_dependent_expression_p (ctx)) + return true; } return false; diff --git a/gcc/testsuite/g++.dg/cpp1z/nontype4.C b/gcc/testsuite/g++.dg/cpp1z/nontype4.C new file mode 100644 index 00000000000..3f345b339c6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/nontype4.C @@ -0,0 +1,14 @@ +// PR c++/98930 +// { dg-do compile { target c++17 } } + +template +struct A { A() { } }; + +template +void impl() { + static int i; + static A<&i> h; +} + +template void impl(); +template void impl(); diff --git a/gcc/testsuite/g++.dg/cpp1z/nontype4a.C b/gcc/testsuite/g++.dg/cpp1z/nontype4a.C new file mode 100644 index 00000000000..5b742926b6d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/nontype4a.C @@ -0,0 +1,14 @@ +// PR c++/98930 +// { dg-do compile { target c++17 } } + +template +struct A { }; + +template +auto impl() { + static int i; + return A<&i>(); +} + +using type = decltype(impl()); +using type = decltype(impl()); // { dg-error "conflicting declaration" }