[cfe-commits] r131450 - /cfe/trunk/lib/CodeGen/TargetInfo.cpp

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Mon May 16 21:17:52 2011
New Revision: 131450

URL: http://llvm.org/viewvc/llvm-project?rev=131450&view=rev
Log:
Revert r131447, see if it fixes the buildbot.

Modified:
    cfe/trunk/lib/CodeGen/TargetInfo.cpp

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=131450&r1=131449&r2=131450&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Mon May 16 21:17:52 2011
@@ -128,9 +128,12 @@
   if (RD->hasFlexibleArrayMember())
     return false;
 
-  // If this is a C++ record, check if it is empty.
+  // If this is a C++ record, check the bases first.
   if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
-    return CXXRD->isEmpty();
+    for (CXXRecordDecl::base_class_const_iterator i = CXXRD->bases_begin(),
+           e = CXXRD->bases_end(); i != e; ++i)
+      if (!isEmptyRecord(Context, i->getType(), true))
+        return false;
 
   for (RecordDecl::field_iterator i = RD->field_begin(), e = RD->field_end();
          i != e; ++i)