From patchwork Sat Feb 9 20:36:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 219444 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 A35992C0087 for ; Sun, 10 Feb 2013 07:37:35 +1100 (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=1361047056; 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=eNEsh2l FDxmoigV5Lo3lNI+IBow=; b=g7ux+KllKLR8qSa85HX/MHuzQSvRXlWgNHF6xcq 7WV+iR3tKQRh13+kCILWTd1Eut06e9p67AONIz3KvHXJTOWKXgk7YC4jX0qdbozI 6KuLwLIjtg1vdTJznvbxtuuoSX8nc6nkeysp61xT+XaD/C7KVobIApPmMDrenDTl +bjo= 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=Q3TKscXbDo/8bgMFPNahNzFo5ENf/nxdwnN2HDwHjGxpY9lVqe9Yo1kdBfVap1 WipSBaT0FblIDQFqSF69q/yI+pWPKd/4FM6J4no1qCeoPZ2/qbsfgEMKPTeBw4a7 MJWOqWYoBwUV2wBaXT24EDhp0Ie6+tp2i4BOBbFRz7zQM=; Received: (qmail 19710 invoked by alias); 9 Feb 2013 20:37:08 -0000 Received: (qmail 18713 invoked by uid 22791); 9 Feb 2013 20:36:59 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_CX 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; Sat, 09 Feb 2013 20:36:47 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r19KakqG003189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 9 Feb 2013 15:36:46 -0500 Received: from [10.3.113.62] (ovpn-113-62.phx2.redhat.com [10.3.113.62]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r19KajnF005121 for ; Sat, 9 Feb 2013 15:36:46 -0500 Message-ID: <5116B35D.8050500@redhat.com> Date: Sat, 09 Feb 2013 15:36:45 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/56238 (ice-checking with static_cast) 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 The code in build_non_dependent_expr has caught a number of issues in the compiler; this is another case that fold_non_dependent_expr wasn't properly recognizing as dependent. I think we want to use instantiation_dependent there going forward, but for 4.8 I think let's just check it in the ENABLE_CHECKING code. Making this change exposed a couple of bugs in instantiation_dependent_r: You can't use TREE_OPERAND on TRAIT_EXPR, and we need to treat BIND_EXPRs as dependent because it contains statements. Tested x86_64-pc-linux-gnu, applying to trunk. commit d00478c88d0fe712cae0955ec0b83f786e1f86f8 Author: Jason Merrill Date: Thu Feb 7 12:48:08 2013 -0500 PR c++/56238 * pt.c (build_non_dependent_expr): Don't try to fold instantiation-dependent expressions. (instantiation_dependent_r) [TRAIT_EXPR]: Split out. [BIND_EXPR]: Treat as dependent. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index aa127ed..29664ea 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19863,16 +19863,13 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees, case ALIGNOF_EXPR: case TYPEID_EXPR: case AT_ENCODE_EXPR: - case TRAIT_EXPR: { tree op = TREE_OPERAND (*tp, 0); if (code == SIZEOF_EXPR && SIZEOF_EXPR_TYPE_P (*tp)) op = TREE_TYPE (op); if (TYPE_P (op)) { - if (dependent_type_p (op) - || (code == TRAIT_EXPR - && dependent_type_p (TREE_OPERAND (*tp, 1)))) + if (dependent_type_p (op)) return *tp; else { @@ -19883,6 +19880,13 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees, break; } + case TRAIT_EXPR: + if (dependent_type_p (TRAIT_EXPR_TYPE1 (*tp)) + || dependent_type_p (TRAIT_EXPR_TYPE2 (*tp))) + return *tp; + *walk_subtrees = false; + return NULL_TREE; + case COMPONENT_REF: if (TREE_CODE (TREE_OPERAND (*tp, 1)) == IDENTIFIER_NODE) /* In a template, finish_class_member_access_expr creates a @@ -19898,6 +19902,10 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees, else break; + /* Treat statement-expressions as dependent. */ + case BIND_EXPR: + return *tp; + default: break; } @@ -20341,9 +20349,10 @@ build_non_dependent_expr (tree expr) tree inner_expr; #ifdef ENABLE_CHECKING - /* Try to get a constant value for all non-type-dependent expressions in + /* Try to get a constant value for all non-dependent expressions in order to expose bugs in *_dependent_expression_p and constexpr. */ - if (cxx_dialect >= cxx0x) + if (cxx_dialect >= cxx0x + && !instantiation_dependent_expression_p (expr)) maybe_constant_value (fold_non_dependent_expr_sfinae (expr, tf_none)); #endif diff --git a/gcc/testsuite/g++.dg/template/cast2.C b/gcc/testsuite/g++.dg/template/cast2.C new file mode 100644 index 0000000..0ce55f0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/cast2.C @@ -0,0 +1,13 @@ +// PR c++/56238 + +class A +{ + template < typename T > T& get (); + template < typename T > class B + { + void RemovePoint (A& value) + { + static_cast < double >(value.get < T > ()); + } + }; +};