From patchwork Fri Oct 4 12:04:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 280580 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8883A2C00A9 for ; Fri, 4 Oct 2013 22:04:52 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=IhJlvsp82AY9FLcJE bcHa1Pp/7l0I13I1WPFT/MUlnBqsOus22QsiX3UHiyOJlNHoS6zPsLE67Mg+rkoV s9g1pt9DKjbLdsi1KklbDcY+Tl+UnwG+ICKI6p+pV+R4F77hpzgRZTiGbLTTFhis JUN6K1GnedjsI1Ag/E5/Xm5UT0= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=Dvx9LST0W3HollhJGQ5M3l1 r4NM=; b=QPaukruJf/5Ljz/UVpyWeB+HFYJi7qTFrovaLHTzloRiCpnLTieQP4A YLbfBDYOi3RiN37vVz5TD9U/XiAn7Sfl2xu6hws2rCZB2vj9g1kfSxXD2O9sVXcV J7jGmaJ/9eI7NEaNUzI0f6qDOp/MZthNvp1JnjXaBPkh+yYFXe0k= Received: (qmail 23723 invoked by alias); 4 Oct 2013 12:04:44 -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 23714 invoked by uid 89); 4 Oct 2013 12:04:44 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 04 Oct 2013 12:04:44 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_SOFTFAIL, UNPARSEABLE_RELAY autolearn=no version=3.3.2 X-HELO: userp1040.oracle.com Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r94C4emr020853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Oct 2013 12:04:41 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r94C4cv0006821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Oct 2013 12:04:40 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r94C4bYh002855; Fri, 4 Oct 2013 12:04:38 GMT Received: from poldo4.casa (/79.33.223.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 04 Oct 2013 05:04:37 -0700 Message-ID: <524EAED3.80102@oracle.com> Date: Fri, 04 Oct 2013 14:04:35 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: Re: [C++ Patch] PR 58448 References: <5238E971.2020006@oracle.com> In-Reply-To: <5238E971.2020006@oracle.com> X-IsSubscribed: yes ... and this is a more straightforward approach. Also tested x86_64-linux. Thanks! Paolo. ///////////////////// /cp 2013-10-04 Paolo Carlini PR c++/58448 * pt.c (tsubst): Use error_operand_p on parameter t. /testsuite 2013-10-04 Paolo Carlini PR c++/58448 * g++.dg/template/crash117.C: New. Index: cp/pt.c =================================================================== --- cp/pt.c (revision 203200) +++ cp/pt.c (working copy) @@ -11272,7 +11272,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain enum tree_code code; tree type, r = NULL_TREE; - if (t == NULL_TREE || t == error_mark_node + if (t == NULL_TREE || t == integer_type_node || t == void_type_node || t == char_type_node @@ -11281,6 +11281,9 @@ tsubst (tree t, tree args, tsubst_flags_t complain || TREE_CODE (t) == TRANSLATION_UNIT_DECL) return t; + if (error_operand_p (t)) + return error_mark_node; + if (DECL_P (t)) return tsubst_decl (t, args, complain); Index: testsuite/g++.dg/template/crash117.C =================================================================== --- testsuite/g++.dg/template/crash117.C (revision 0) +++ testsuite/g++.dg/template/crash117.C (working copy) @@ -0,0 +1,6 @@ +// PR c++/58448 + +class SmallVector; struct Types4; +template struct Types { + typedef Types4<>::Constructable // { dg-error "template|typedef|expected" } +} Types:: > // { dg-error "expected" }