summaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-03-02 21:49:28 -0500
committerJason Merrill <jason@gcc.gnu.org>2011-03-02 21:49:28 -0500
commit79d3d3f46cd4080579490adf05b38cd6338eb573 (patch)
tree87fbfd58163991bd059edb6bb38afc64260b378a /gcc/cp/parser.c
parent262a7d6bc0820d7aed46a05b2b8b6ef7824bb08f (diff)
downloadgcc-79d3d3f46cd4080579490adf05b38cd6338eb573.tar.gz
re PR c++/47950 ([C++0x] Internal compiler error: non-dependent declaration as condition causes tsubst_copy_and_build assertion failure.)
PR c++/47950 * parser.c (cp_parser_condition): Don't fold_non_dependent_expr here. From-SVN: r170639
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c63d5b3a049..510fcb11179 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,