From patchwork Wed Apr 3 04:47:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1075389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-498788-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="LP0ebsvL"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Ytrs5Ylgz9sSG for ; Wed, 3 Apr 2019 15:48:54 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version :content-transfer-encoding; q=dns; s=default; b=cQYbN9YgNjOWG6g3 TJLWEpHc6bJ2kImUe8IMl0+/NdMDlCgYdjKd/f4hxpdJL4fSETBhwSzmMlW6StSr j5QgfIDZO0KHkL8e9cSF/1HOvbnryvKNi9z8I98FMN/7daIKQnoP3k0Yye7KDdFT WW2asQy7KGTD1p8Ty5oTosvzvVg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version :content-transfer-encoding; s=default; bh=2zBurz3OEYCSp8+kvk2vjy cGOfo=; b=LP0ebsvL9oNLk9iRrXTXTlcFEz+kDy7NjQ0BurSniNS2L/1vpnxSvp p2IwEOx+VyzOJMlzKbsR+Olicv1m6s/ANur7TeBXR3PWGyW/3E8Em1Wy3CQpcIjd Plupg7Svbk+kYsgG9+1iCFh+nK/Nx1+VOEv1GrWUS/DJDRW0nDGAk= Received: (qmail 3409 invoked by alias); 3 Apr 2019 04:48:26 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 3231 invoked by uid 89); 3 Apr 2019 04:48:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=packs, ppd, hash_set, sk:lambda- X-HELO: mail-qt1-f170.google.com Received: from mail-qt1-f170.google.com (HELO mail-qt1-f170.google.com) (209.85.160.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 Apr 2019 04:48:04 +0000 Received: by mail-qt1-f170.google.com with SMTP id s15so18067012qtn.3 for ; Tue, 02 Apr 2019 21:48:03 -0700 (PDT) Received: from orpheus.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 d75sm8873833qkb.74.2019.04.02.21.48.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2019 21:48:01 -0700 (PDT) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [C++ PATCH] PR c++/89917 - ICE with lambda in variadic mem-init. Date: Wed, 3 Apr 2019 00:47:59 -0400 Message-Id: <20190403044759.5207-1-jason@redhat.com> MIME-Version: 1.0 X-IsSubscribed: yes A mem-initializer is not a type, and we don't want to turn autos within it into packs. Tested x86_64-pc-linux-gnu, applying to trunk. * pt.c (make_pack_expansion): Change type_pack_expansion_p to false. --- gcc/cp/pt.c | 2 +- .../g++.dg/cpp0x/lambda/lambda-variadic8.C | 14 ++++++++++++++ gcc/cp/ChangeLog | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C base-commit: 9535273c79161a2601fe7c80be8ddcffcf740dc4 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c72004a74e3..2b92b608f5d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3933,7 +3933,7 @@ make_pack_expansion (tree arg, tsubst_flags_t complain) class expansion. */ ppd.visited = new hash_set; ppd.parameter_packs = ¶meter_packs; - ppd.type_pack_expansion_p = true; + ppd.type_pack_expansion_p = false; gcc_assert (TYPE_P (TREE_PURPOSE (arg))); cp_walk_tree (&TREE_PURPOSE (arg), &find_parameter_packs_r, &ppd, ppd.visited); diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C new file mode 100644 index 00000000000..50473f70214 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-variadic8.C @@ -0,0 +1,14 @@ +// PR c++/89917 +// { dg-do compile { target c++11 } } + +struct A +{ + A(...); +}; + +template struct B : T... +{ + B() : T([]{})... {} +}; + +B b; diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 38f3e92a0ef..bb719133a97 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-04-03 Jason Merrill + + PR c++/89917 - ICE with lambda in variadic mem-init. + * pt.c (make_pack_expansion): Change type_pack_expansion_p to false. + 2019-04-01 Jason Merrill PR c++/86946 - ICE with function call in template argument.