1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index b7c83162d6..177bf1a659 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3185,6 +3185,12 @@ Sema::DeclTy *Sema::ActOnEnumConstant(Scope *S, DeclTy *theEnumDecl,
   
   // Register this decl in the current scope stack.
   PushOnScopeChains(New, S);
+
+  // Add this enumerator into the enum itself.
+  // FIXME: This means that the enumerator is stored in two
+  // DeclContexts. This is not a long-term solution.
+  New->setLexicalDeclContext(TheEnumDecl);
+  TheEnumDecl->addDecl(Context, New, true);
   return New;
 }