From patchwork Mon Jan 31 17:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1586909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=sP/n4ZoN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JnZlw3HRyz9s9c for ; Tue, 1 Feb 2022 04:28:27 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D32E3948825 for ; Mon, 31 Jan 2022 17:28:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D32E3948825 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643650105; bh=gamVgOBtAFRiRorWAO+Mx/ys/8/Lsxneqx1Kk8Uj+N8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sP/n4ZoNufKydQS+ZwgFsGogm+sHOAOVGO6rfUpZ4dyDtfVYWgbl6bgctQP8QwuJS aDiaqsY/eFW06QzjGNvItCNr2P8aVA/wjXCovgTUX3Rp2eX3N86ARkflY7QmERnrIc ssbcWtDVoF1YRmHqVsjR9TeODd1zr++DTyqUhVHc= 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 736623857815 for ; Mon, 31 Jan 2022 17:28:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 736623857815 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-7-uAIW0NRaOMOnA3gDdk0VFA-1; Mon, 31 Jan 2022 12:28:00 -0500 X-MC-Unique: uAIW0NRaOMOnA3gDdk0VFA-1 Received: by mail-qt1-f197.google.com with SMTP id br10-20020a05622a1e0a00b002d37e07e79aso10885373qtb.4 for ; Mon, 31 Jan 2022 09:28:00 -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=gamVgOBtAFRiRorWAO+Mx/ys/8/Lsxneqx1Kk8Uj+N8=; b=gao4LrqHwGpohXhlDocvHFa5+bbj2aOvH7ulcuQzgmT2X/wDXD5bv4uGvQKhSnyEPc Lf+C/Ih0owRRwqgfpfvRxwnqj2wsRqo9mPL5Pj749DRhgY7+/bF+rZczOqYOVb+lPZCZ q/BeVYxWnBiyaAaTlV2tPtrBTA3v9UZTYqtMUpApBl6YvlR4neqJidLok8GNNM6MiMuw Xj90o2k93/6iymp2EwOC6wDRZuZF8mI9A0Sh+dRb80hOdzH2yB3aTLr8NwgCHIxS4zhm wVfEi+X0aaaf5TdOucreGnoIiYV/8GdJEAxLzNC1waLxbTXHabqKUavXSsAG3xq0yxTL TH8w== X-Gm-Message-State: AOAM533HTNtC6MaTg/kP3AYQ4NmSX63099azKOTh+e40IZzs72bSvnSY IGTC4xW1NSiN0bv6tG8fjbdIWwua8rqFQoEWjFDz6Z6vTTiljPgEUalh7hb0UEuRUJpqlx6Gk5v m5M3TnQablcS9c/ncgoQtwi3RhdqJrJtfCLDRHDM8PVnHIplCfDFdAMmYy+saJfCetpo= X-Received: by 2002:a05:6214:21a8:: with SMTP id t8mr18281825qvc.109.1643650079518; Mon, 31 Jan 2022 09:27:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/gCEnBBHLAgRfRsT8nClKB6mwsCuErHVmWCfj0TsrRDqR9Lc2ML+BwdonA4Tg8wOHb1P7qA== X-Received: by 2002:a05:6214:21a8:: with SMTP id t8mr18281796qvc.109.1643650079231; Mon, 31 Jan 2022 09:27:59 -0800 (PST) Received: from localhost.localdomain (ool-18e40894.dyn.optonline.net. [24.228.8.148]) by smtp.gmail.com with ESMTPSA id ay18sm879427qkb.8.2022.01.31.09.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 09:27:58 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: CONSTRUCTORs are non-deduced contexts [PR104291] Date: Mon, 31 Jan 2022 12:27:57 -0500 Message-Id: <20220131172757.2392900-1-ppalka@redhat.com> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.4 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, 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/104291 gcc/cp/ChangeLog: * pt.cc (for_each_template_parm_r) : Don't walk subtrees if !include_nondeduced_p. Simplify given that cp_walk_subtrees already walks TYPE_PTRMEMFUNC_FN_TYPE_RAW. gcc/testsuite/ChangeLog: * g++.dg/template/partial20.C: New test. --- gcc/cp/pt.cc | 7 +------ gcc/testsuite/g++.dg/template/partial20.C | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/partial20.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2f82b167853..feee629f1dd 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -10525,12 +10525,6 @@ for_each_template_parm_r (tree *tp, int *walk_subtrees, void *d) *walk_subtrees = 0; break; - case CONSTRUCTOR: - if (TREE_TYPE (t) && TYPE_PTRMEMFUNC_P (TREE_TYPE (t)) - && pfd->include_nondeduced_p) - WALK_SUBTREE (TYPE_PTRMEMFUNC_FN_TYPE (TREE_TYPE (t))); - break; - case INDIRECT_REF: case COMPONENT_REF: /* If there's no type, then this thing must be some expression @@ -10539,6 +10533,7 @@ for_each_template_parm_r (tree *tp, int *walk_subtrees, void *d) return error_mark_node; break; + case CONSTRUCTOR: case TRAIT_EXPR: case PLUS_EXPR: case MULT_EXPR: diff --git a/gcc/testsuite/g++.dg/template/partial20.C b/gcc/testsuite/g++.dg/template/partial20.C new file mode 100644 index 00000000000..161d796b1c2 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/partial20.C @@ -0,0 +1,7 @@ +// PR c++/104291 +// { dg-do compile { target c++20 } } + +struct A { int x; }; + +template struct B; +template struct B { }; // { dg-error "not deducible" }