From ff4bfb1056a816c881c9ffb0314b2ff202b32d03 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 3 Mar 2011 11:51:20 -0500 Subject: [PATCH] re PR c++/47950 ([C++0x] Internal compiler error: non-dependent declaration as condition causes tsubst_copy_and_build assertion failure.) PR c++/47950 * pt.c (tsubst_copy_and_build) [TARGET_EXPR]: Retain TREE_CONSTANT. From-SVN: r170656 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 264bc7c7ed9..ef766fbff3d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Jason Merrill + + PR c++/47950 + * pt.c (tsubst_copy_and_build) [TARGET_EXPR]: Retain TREE_CONSTANT. + 2011-03-02 Jason Merrill PR c++/47950 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4b262d00016..60b26996c47 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13368,7 +13368,11 @@ tsubst_copy_and_build (tree t, /* We can get here for a constant initializer of non-dependent type. FIXME stop folding in cp_parser_initializer_clause. */ gcc_assert (TREE_CONSTANT (t)); - return get_target_expr (RECUR (TARGET_EXPR_INITIAL (t))); + { + tree r = get_target_expr (RECUR (TARGET_EXPR_INITIAL (t))); + TREE_CONSTANT (r) = true; + return r; + } default: /* Handle Objective-C++ constructs, if appropriate. */ -- 2.30.2