From patchwork Fri Jul 6 13:41:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 169473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9C9BB2C01BB for ; Fri, 6 Jul 2012 23:42:48 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1342186968; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=gIjimKH w051OLG8w17h8fWpQJfQ=; b=saKWVnRy5cMEPbjxMKsoOgipZv+OtjSwuzIaaCr ozTNYAq58kyQnV5PAH8QHiHVljV0wIWQXxYCDqkqZphRYkySxQG7uTCBy9RFuxuX BvJGdwh1UHnnBiQT6pljKEZcJ1H3tmg8eFVlpcOB6ndKGviM3kMn0YXxvSEVWsRE 8+Xs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=gqOzsB1xvPGI8LGwFZbo1kBAB+O9IFChSWAiBcX5VSFvCzpNZeVQGZ5QnPP6JC Lpb97C3IernxnU9Q6lyT2fm7cGimWc/nAjjuRDkqDW1JwGeRtBSX3ux65pPdSPXp URz+yD8jumfP59NmVXuTWzmJJagImlT3MeQZdBycwcR0w=; Received: (qmail 20977 invoked by alias); 6 Jul 2012 13:42:42 -0000 Received: (qmail 20968 invoked by uid 22791); 6 Jul 2012 13:42:41 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, SPF_HELO_PASS, TW_CX, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 06 Jul 2012 13:41:57 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q66DfvFa031868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 6 Jul 2012 09:41:57 -0400 Received: from [10.3.113.56] (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q66Dfuhd026176 for ; Fri, 6 Jul 2012 09:41:57 -0400 Message-ID: <4FF6EB24.6050807@redhat.com> Date: Fri, 06 Jul 2012 09:41:56 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120605 Thunderbird/13.0 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/53858 (parse error with alias template) 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 Since my fix for 53563, we were ignoring alias templates when looking for a type template name. Fixed thus. Tested x86_64-pc-linux-gnu, applying to trunk. commit 41eec657beceaa04ecbd7a459f2e9a42ef878173 Author: Jason Merrill Date: Fri Jul 6 09:22:38 2012 -0400 * cp-tree.h (DECL_DECLARES_TYPE_P): Check DECL_TYPE_TEMPLATE_P. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 0b2b234..713001e 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3704,7 +3704,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) /* Nonzero for a NODE which declares a type. */ #define DECL_DECLARES_TYPE_P(NODE) \ - (TREE_CODE (NODE) == TYPE_DECL || DECL_CLASS_TEMPLATE_P (NODE)) + (TREE_CODE (NODE) == TYPE_DECL || DECL_TYPE_TEMPLATE_P (NODE)) /* Nonzero if NODE declares a function. */ #define DECL_DECLARES_FUNCTION_P(NODE) \