From 9c30a2d5bcb3a80ab41bb299c9ecb6b6fc6fbd14 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 4 Jul 2012 21:34:07 +0000
Subject: [PATCH] 	PR c++/53848 	* decl.c (build_enumerator): Don't use
 build_lang_decl_loc.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189267 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                   |  6 ++++++
 gcc/cp/decl.c                      |  9 +--------
 gcc/testsuite/ChangeLog            |  5 +++++
 gcc/testsuite/g++.dg/other/enum3.C | 10 ++++++++++
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/other/enum3.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b3adaf7391..e11b240f0e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/53848
+	PR c++/53524
+	* decl.c (build_enumerator): Don't use build_lang_decl_loc.
+
 2012-07-03  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/53812
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 18beaa9fc56..6c0990c00f7 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12561,14 +12561,7 @@ incremented enumerator value is too large for %<long%>");
     course, if we're processing a template, there may be no value.  */
   type = value ? TREE_TYPE (value) : NULL_TREE;
 
-  if (context && context == current_class_type)
-    /* This enum declaration is local to the class.  We need the full
-       lang_decl so that we can record DECL_CLASS_CONTEXT, for example.  */
-    decl = build_lang_decl_loc (loc, CONST_DECL, name, type);
-  else
-    /* It's a global enum, or it's local to a function.  (Note local to
-       a function could mean local to a class method.  */
-    decl = build_decl (loc, CONST_DECL, name, type);
+  decl = build_decl (loc, CONST_DECL, name, type);
   
   DECL_CONTEXT (decl) = enumtype;
   TREE_CONSTANT (decl) = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2833385b50a..cdeac3087f2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/53848
+	* g++.dg/other/enum3.C: New.
+
 2012-07-04  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR middle-end/53321
diff --git a/gcc/testsuite/g++.dg/other/enum3.C b/gcc/testsuite/g++.dg/other/enum3.C
new file mode 100644
index 00000000000..23d6c83576e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/enum3.C
@@ -0,0 +1,10 @@
+// PR c++/53848
+
+extern "C"
+{
+  struct s {
+    enum {
+      e = 0
+    } f;
+  };
+}
-- 
2.11.4.GIT