From patchwork Wed Mar 31 13:58:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1460550 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; 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=wDGU2dYQ; 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 4F9SZr6Ct9z9sRK for ; Thu, 1 Apr 2021 00:58:26 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C42B384BC30; Wed, 31 Mar 2021 13:58:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C42B384BC30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1617199103; bh=k36NpzJUxJszuKLqPL48WH3W70qLm/I7nHhxODI3yhw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wDGU2dYQi6XLMae83wHW5oZFwU0g0fI5mMsDcExKezQiBnCQth9IcGk+jlRTsg8DP ft5fvJPEFkWFWnADbEH5ToUJE90myPQdG/4080zTTagARuVVNrGburpN7zbRX/1HMM 2E/QAnXTFZVGqUuaUMMybqF9H82w6DZ8dEi+Jvxo= 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 ESMTP id A8C19385802E for ; Wed, 31 Mar 2021 13:58:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A8C19385802E Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-Gn_gINc3OA2CPyRRIkeDew-1; Wed, 31 Mar 2021 09:58:17 -0400 X-MC-Unique: Gn_gINc3OA2CPyRRIkeDew-1 Received: by mail-qt1-f197.google.com with SMTP id b18so1179730qte.21 for ; Wed, 31 Mar 2021 06:58:16 -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:mime-version :content-transfer-encoding; bh=k36NpzJUxJszuKLqPL48WH3W70qLm/I7nHhxODI3yhw=; b=Su1KRhbcb9A3ffIxzXJ5piFxa6RslzyZzBwvJzoQAGhesTplLf56OAQFbErAKf/Udy Zfaei6RR145HmqUnYaHmM3AaO5KAmZ3FTRSy2sOSb0SvjCz0gmq414I0Oz8Y+bCr6Cad 2h2bShAhLyKJhkiYLE9QkHSGOp3NMtNXuKWvtetLjGXKwkH8d2FOe4FTH/I1b4PNTpjE cDTV86rq7/7XZCzvzn3GBSmlmJc03kQ0qnYnaReC7ecL5OzOiqw8l+iybcXBxJ7g/G1B h9nmpqoZEwUppfwKO4bareohMI+R6n32zTGdPmza+vQPuhTb9SRIr3jk3ivIO3Nn44ra YYDA== X-Gm-Message-State: AOAM532mNYMFYW4rkktj37SYJhWkIipiqLmOJDr9rWdAaA81gbjFICN6 leaDZMz7rUzTeuWWnuf2FXufiUs7ER96vxpk7Nq8DNUns3kXTjJ9kRXwOeCUggql7M6l4fs/OLG ewIY7D3B66SeDEnbjn/nGcaO4v900TLSJUBbReiBDSWSTdqqvq8+A3FZ/4/VamORwRw== X-Received: by 2002:a37:a30f:: with SMTP id m15mr3153275qke.433.1617199096103; Wed, 31 Mar 2021 06:58:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRg8EaZLE9CMyAwbHhuFnZ9FzrODeb7d5D9vCBk4VKsAfGzyOtgqQFe8naxrp+tjW4L2C0wA== X-Received: by 2002:a37:a30f:: with SMTP id m15mr3153242qke.433.1617199095680; Wed, 31 Mar 2021 06:58:15 -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 b198sm1484111qkg.10.2021.03.31.06.58.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 06:58:14 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: Alias template in pack expansion [PR99445] Date: Wed, 31 Mar 2021 09:58:13 -0400 Message-Id: <20210331135813.176762-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=-15.5 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" In this testcase, iterative_hash_template_arg checks alias_template_specialization_p to determine whether to treat a type as a dependent alias, and structural_comptypes checks dependent_alias_template_spec_p. Normally that difference isn't a problem because canonicalizing template arguments strips non-dependent aliases, but that wasn't happening for the pack expansion. Fixed thus. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: PR c++/99445 * tree.c (strip_typedefs): Handle TYPE_PACK_EXPANSION. gcc/testsuite/ChangeLog: PR c++/99445 * g++.dg/cpp0x/alias-decl-variadic1.C: New test. --- gcc/cp/tree.c | 9 +++++++++ gcc/testsuite/g++.dg/cpp0x/alias-decl-variadic1.C | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-variadic1.C base-commit: 7c1d6e89994109e1b6efb5f13890be5586edeb75 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 8c4bd156d3f..dca947bf52a 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1722,6 +1722,15 @@ strip_typedefs (tree t, bool *remove_attributes, unsigned int flags) remove_attributes, flags); result = finish_underlying_type (type); break; + case TYPE_PACK_EXPANSION: + type = strip_typedefs (PACK_EXPANSION_PATTERN (t), + remove_attributes, flags); + if (type != PACK_EXPANSION_PATTERN (t)) + { + result = copy_node (t); + PACK_EXPANSION_PATTERN (result) = type; + } + break; default: break; } diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-variadic1.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-variadic1.C new file mode 100644 index 00000000000..68b3a7fd009 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-variadic1.C @@ -0,0 +1,14 @@ +// PR c++/99445 +// { dg-do compile { target c++11 } } +// { dg-additional-options "-fchecking=2 --param=hash-table-verification-limit=1000" } + +template struct implicit_conversions; +template +using implicit_conversions_t = typename implicit_conversions::type; +template struct response_type; + +template +using type1 = response_type...>; + +template +using type2 = response_type::type...>;