From patchwork Sat Mar 14 21:12:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 1254877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: 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=xAArBo93; dkim-atps=neutral Received: from sourceware.org (server2.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 ozlabs.org (Postfix) with ESMTPS id 48fwJL3qHtz9sPR for ; Sun, 15 Mar 2020 08:12:50 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66D723948A41; Sat, 14 Mar 2020 21:12:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66D723948A41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1584220368; bh=MJ3NcseD3t/oXGNk26jQboYrkXDIQuhzcxy48h3QlPk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xAArBo93tXnUAKwJ/yZIpgNb4phCJUn+vTxFrXLgsVRuow0kjOeILV3XBOnEZI9RI zHYNII0nMXIGTvkUbY1cH9M8mpl+CivwGoJ1fYywBjtRp2HRAjAbFH8UurfVzwd7Ap mfSqe1+no6yVVK54Yjez3Pb0dxtU4Gs017AnPdMs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id B33A1387700E for ; Sat, 14 Mar 2020 21:12:45 +0000 (GMT) Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-nVOQm7NzPgetJLv3V9_p8g-1; Sat, 14 Mar 2020 17:12:43 -0400 X-MC-Unique: nVOQm7NzPgetJLv3V9_p8g-1 Received: by mail-qt1-f199.google.com with SMTP id r16so12294706qtt.13 for ; Sat, 14 Mar 2020 14:12:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ICwR9+PXF1X+7PVFIkUH7LAjxSdXTp1TYsO6epa92h8=; b=CGQNQIcmFYb9lhRPKTOmsKIZmuH+Mhlh27N1bNVwwq8hthJcJe1k8qUSIdxSKQLJpS uGJ13DC2PjXsrBuSss+2hSqj5ouYI7391cXciSAP8/dEaxHiX9Z4+TKrfO9VS8TrwwFQ 47Bx2Tu4mX/5jehi94hjni/BqwpYOTv8L97LnYzLXUTyuYTq+P/q2dwlFGXV5cxfgMB5 XVzrLCnIE3BG6I3YFjmm8PVzxcM/akKoiB1M0fK/VVul3FJHw/oOKJdZDoSz+xGRXtMK 20Rrpz4i7Hj7cWiytakku+EX8c/VGVlVCmZZihecBk7NGVRcmowQQP+IHZw+AkexP15t 5lUA== X-Gm-Message-State: ANhLgQ3hXRmrdJToyHPOL3TM1Ii4sr0aoyuunxM1GCTNL79byHM37MMW rMnUHvTw1+bvkXqo7NVtcGXTVNsDH8QRl8bFkfLhWMC04TTmGzcQe3nWY4COXrS5q4n/Tg8koUp p0cGNKQKQdpKaEPwvaQ== X-Received: by 2002:a37:6357:: with SMTP id x84mr17285277qkb.490.1584220362792; Sat, 14 Mar 2020 14:12:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vun19Au6Lo/5Jet29nWc4KH4DhzbJiuOd6RkNDRqSLQp/INUu3K1wOIMujBJd309eSn/n6Ulw== X-Received: by 2002:a37:6357:: with SMTP id x84mr17285261qkb.490.1584220362457; Sat, 14 Mar 2020 14:12:42 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id i28sm33742139qtc.57.2020.03.14.14.12.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 14:12:41 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: Find parameter pack in typedef in lambda [92909]. Date: Sat, 14 Mar 2020 17:12:40 -0400 Message-Id: <20200314211240.25327-1-jason@redhat.com> X-Mailer: git-send-email 2.18.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-25.2 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: "Li, Pan2 via Gcc-patches" Reply-To: Jason Merrill Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" find_parameter_packs_r doesn't look through typedefs, which is normally correct, but that means we need to handle their declarations specially. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog 2020-03-14 Jason Merrill PR c++/92909 * pt.c (find_parameter_packs_r): [DECL_EXPR]: Walk DECL_ORIGINAL_TYPE of a typedef. --- gcc/cp/pt.c | 16 ++++++++++++---- .../g++.dg/cpp0x/lambda/lambda-variadic10.C | 12 ++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic10.C base-commit: 53b28abf8e4ba37e47d3bb05476e0a80ae761567 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0f3c2ad8fec..bd2f9be82ea 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3916,10 +3916,18 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) return NULL_TREE; case DECL_EXPR: - /* Ignore the declaration of a capture proxy for a parameter pack. */ - if (is_capture_proxy (DECL_EXPR_DECL (t))) - *walk_subtrees = 0; - return NULL_TREE; + { + tree decl = DECL_EXPR_DECL (t); + /* Ignore the declaration of a capture proxy for a parameter pack. */ + if (is_capture_proxy (decl)) + *walk_subtrees = 0; + if (is_typedef_decl (decl)) + /* Since we stop at typedefs above, we need to look through them at + the point of the DECL_EXPR. */ + cp_walk_tree (&DECL_ORIGINAL_TYPE (decl), + &find_parameter_packs_r, ppd, ppd->visited); + return NULL_TREE; + } case TEMPLATE_DECL: if (!DECL_TEMPLATE_TEMPLATE_PARM_P (t)) diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic10.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic10.C new file mode 100644 index 00000000000..052283e6caa --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic10.C @@ -0,0 +1,12 @@ +// PR c++/92909 +// { dg-do compile { target c++11 } } + +template +void foo() +{ + [] + { + using T = Ts; + }(); // { dg-error "not expanded" } +} +template void foo<>();