Support for anonymous union in ctor's initializer and

bunch of FIXMEs for their is-gen.

llvm-svn: 78623

1 files changed, 18 insertions, 2 deletions

diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index e07eae7b20a..a068c238353 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/lib/AST/DeclCXX.cpp
@@ -583,7 +583,7 @@ CXXConstructorDecl::setBaseOrMemberInitializers(
     if (Member->isBaseInitializer())
       AllBaseFields[Member->getBaseClass()->getAs<RecordType>()] = Member;
     else
-     AllBaseFields[Member->getMember()] = Member;
+      AllBaseFields[Member->getMember()] = Member;
   }
     
   // Push virtual bases before others.
@@ -635,7 +635,23 @@ CXXConstructorDecl::setBaseOrMemberInitializers(
   // non-static data members.
   for (CXXRecordDecl::field_iterator Field = ClassDecl->field_begin(),
        E = ClassDecl->field_end(); Field != E; ++Field) {
-    if (CXXBaseOrMemberInitializer *Value = AllBaseFields.lookup(*Field)) {
+    if ((*Field)->isAnonymousStructOrUnion()) {
+      if (const RecordType *FieldClassType = 
+            Field->getType()->getAs<RecordType>()) {
+        CXXRecordDecl *FieldClassDecl
+          = cast<CXXRecordDecl>(FieldClassType->getDecl());
+        for(RecordDecl::field_iterator FA = FieldClassDecl->field_begin(),
+            EA = FieldClassDecl->field_end(); FA != EA; FA++) {
+          if (CXXBaseOrMemberInitializer *Value = AllBaseFields.lookup(*FA)) {
+            AllToInit.push_back(Value);
+            break;
+          }
+        }
+      }
+      continue;
+    }
+    if (CXXBaseOrMemberInitializer *Value = 
+          AllBaseFields.lookup(*Field)) {
       AllToInit.push_back(Value);
       continue;
     }