From 9aad9f90de73bfae547fdf58a2e14496aa6ea5b2 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 14 Feb 2011 21:52:24 +0000
Subject: [PATCH] 	PR c++/47482 	* parser.c
 (cp_parser_enumerator_definition): Call 	fold_non_dependent_expr.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170156 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                           | 6 ++++++
 gcc/cp/parser.c                            | 4 ++++
 gcc/testsuite/ChangeLog                    | 4 ++++
 gcc/testsuite/g++.dg/cpp0x/regress/enum1.C | 8 ++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/regress/enum1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c3f780a..61a3e4a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-14  Jason Merrill  <jason@redhat.com>
+
+	PR c++/47482
+	* parser.c (cp_parser_enumerator_definition): Call
+	fold_non_dependent_expr.
+
 2011-02-09  Jason Merrill  <jason@redhat.com>
 
 	* decl.c (cp_make_fname_decl): Set DECL_THIS_STATIC at toplevel.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 11039b8..8f4a121 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -13763,6 +13763,10 @@ cp_parser_enumerator_definition (cp_parser* parser, tree type)
   if (check_for_bare_parameter_packs (value))
     value = error_mark_node;
 
+  /* integral_constant_value will pull out this expression, so make sure
+     it's folded as appropriate.  */
+  value = fold_non_dependent_expr (value);
+
   /* Create the enumerator.  */
   build_enumerator (identifier, value, type, loc);
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9d200a4..cd73643 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-14  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/regress/enum1.C: New.
+
 2011-02-14  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/include.adb: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/enum1.C b/gcc/testsuite/g++.dg/cpp0x/regress/enum1.C
new file mode 100644
index 0000000..6e29f9e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/regress/enum1.C
@@ -0,0 +1,8 @@
+// PR c++/47482
+// { dg-options -std=c++0x }
+
+template<class>
+struct K
+{
+  enum { A = sizeof"A", B = +A };
+};
-- 
2.7.4