When in C++, invoke ASTConsumer::HandleTagDeclDefinition in Sema::ActOnFinishCXXClassDef,
at which point the C++ struct/class/union is fully parsed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54569 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 3b4ad02..a96195e 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2142,7 +2142,10 @@
   // Okay, we successfully defined 'Record'.
   if (Record) {
     Record->defineBody(&RecFields[0], RecFields.size());
-    Consumer.HandleTagDeclDefinition(Record);
+    // If this is a C++ record, HandleTagDeclDefinition will be invoked in
+    // Sema::ActOnFinishCXXClassDef.
+    if (!isa<CXXRecordDecl>(Record))
+      Consumer.HandleTagDeclDefinition(Record);
   } else {
     ObjCIvarDecl **ClsFields = reinterpret_cast<ObjCIvarDecl**>(&RecFields[0]);
     if (ObjCInterfaceDecl *ID = dyn_cast<ObjCInterfaceDecl>(EnclosingDecl))