From patchwork Thu Mar 3 05:08:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 85229 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 9D518B70DB for ; Thu, 3 Mar 2011 16:08:29 +1100 (EST) Received: (qmail 3362 invoked by alias); 3 Mar 2011 05:08:27 -0000 Received: (qmail 3352 invoked by uid 22791); 3 Mar 2011 05:08:26 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, 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; Thu, 03 Mar 2011 05:08:16 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2358F15005524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Mar 2011 00:08:15 -0500 Received: from [127.0.0.1] (ovpn-113-31.phx2.redhat.com [10.3.113.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2358EuJ013987 for ; Thu, 3 Mar 2011 00:08:14 -0500 Message-ID: <4D6F223D.2070608@redhat.com> Date: Thu, 03 Mar 2011 00:08:13 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/47950 (ICE with condition in 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 The problem here was that we were folding the initializer too many times, so we lost the TREE_CONSTANT on the TARGET_EXPR. Since we already fold in cp_parser_initializer_clause, it's redundant to do so in cp_parser_condition as well. Tested x86_64-pc-linux-gnu, applied to trunk. commit 957aeb5f4740118464432ab93fd6909c43eb0d28 Author: Jason Merrill Date: Wed Mar 2 17:46:35 2011 -0500 PR c++/47950 * parser.c (cp_parser_condition): Don't fold_non_dependent_expr here. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c63d5b3..510fcb1 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -8687,9 +8687,6 @@ cp_parser_condition (cp_parser* parser) if (BRACE_ENCLOSED_INITIALIZER_P (initializer)) maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS); - if (!non_constant_p) - initializer = fold_non_dependent_expr (initializer); - /* Process the initializer. */ cp_finish_decl (decl, initializer, !non_constant_p, diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/condition1.C b/gcc/testsuite/g++.dg/cpp0x/regress/condition1.C new file mode 100644 index 0000000..0346764 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/regress/condition1.C @@ -0,0 +1,80 @@ +// PR c++/47950 +// { dg-options -std=c++0x } + +template struct empty +{ + // allow success case to build (not relevant to bug) + operator bool() { return true; } +}; + +template struct from_int +{ + from_int(int) {} + + // allow success case to build (not relevant to bug) + operator bool() { return true; } +}; + +template +from_int via_function(T v) +{ + return from_int(v); +} + +template +void f() +{ + // ********* this section compiles *********** + + // these plain initializers work fine + from_int a = 7; + from_int b = from_int(7); + empty c = empty(); + from_int ta = 7; + from_int tb = from_int(7); + empty tc = empty(); + + // these dependent condition decls work fine + if (empty x = empty()) + ; + if (from_int x = 7) + ; + if (from_int x = from_int(7)) + ; + if (from_int x = via_function(T())) + ; + + // this non-dependent condition decl using conversion works fine + if (from_int x = 7) + ; + + // these non-dependent condition decls using conversion or braced- + // initialization work fine (in c++0x mode only course) + #if __GXX_EXPERIMENTAL_CXX0X__ + if (empty x {}) + ; + if (from_int x {7}) + ; + #endif + + // ********** this section fails in C++0x *********** + + // the following non-dependent condition decls cause an assertion + // failure in + // + // tsubst_copy_and_build, at cp/pt.c:13370 + // + // in C++0x mode + // + if (empty x = empty()) + ; + if (from_int x = from_int(7)) + ; + if (from_int x = via_function(7)) + ; +} + +int main() +{ + f(); +}