2 files changed, 7 insertions, 11 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 1647e757e3..9f8db595b7 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -990,7 +990,8 @@ QualType ASTContext::getTypeDeclType(TypeDecl *Decl, TypeDecl* PrevDecl) {
                                  : new RecordType(Record);
   }
   else if (EnumDecl *Enum = dyn_cast<EnumDecl>(Decl))
-    Decl->TypeForDecl = new EnumType(Enum);
+    Decl->TypeForDecl = PrevDecl ? PrevDecl->TypeForDecl
+                                 : new EnumType(Enum);
   else
     assert(false && "TypeDecl without a type?");
 
@@ -998,16 +999,9 @@ QualType ASTContext::getTypeDeclType(TypeDecl *Decl, TypeDecl* PrevDecl) {
   return QualType(Decl->TypeForDecl, 0);
 }
 
-/// setTagDefinition - Used by RecordDecl::completeDefinition and
-/// EnumDecl::completeDefinition to inform about which
-/// RecordDecl/EnumDecl serves as the definition of a particular
-/// struct/union/class/enum.
 void ASTContext::setTagDefinition(TagDecl* D) {
   assert (D->isDefinition());
-  if (!D->TypeForDecl)
-    getTypeDeclType(D);
-  else
-    cast<TagType>(D->TypeForDecl)->decl = D;  
+  cast<TagType>(D->TypeForDecl)->decl = D;  
 }
 
 /// getTypedefType - Return the unique reference to the type for the
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 7643e4eda8..4628761de5 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -113,9 +113,11 @@ TypedefDecl *TypedefDecl::Create(ASTContext &C, DeclContext *DC,
 
 EnumDecl *EnumDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
                            IdentifierInfo *Id,
-                           ScopedDecl *PrevDecl) {
+                           EnumDecl *PrevDecl) {
   void *Mem = C.getAllocator().Allocate<EnumDecl>();
-  return new (Mem) EnumDecl(DC, L, Id, PrevDecl);
+  EnumDecl *Enum = new (Mem) EnumDecl(DC, L, Id, 0);
+  C.getTypeDeclType(Enum, PrevDecl);
+  return Enum;
 }
 
 void EnumDecl::Destroy(ASTContext& C) {