1 files changed, 24 insertions, 24 deletions

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 97aabd8bf4..79ba32f076 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -741,33 +741,33 @@ static uint64_t GetNumNonZeroBytesInInit(const Expr *E, CodeGenFunction &CGF) {
   // InitListExprs for structs have to be handled carefully.  If there are
   // reference members, we need to consider the size of the reference, not the
   // referencee.  InitListExprs for unions and arrays can't have references.
-  if (!E->getType()->isUnionType() && !E->getType()->isArrayType()) {
-    RecordDecl *SD = E->getType()->getAs<RecordType>()->getDecl();
-    uint64_t NumNonZeroBytes = 0;
-    
-    unsigned ILEElement = 0;
-    for (RecordDecl::field_iterator Field = SD->field_begin(),
-         FieldEnd = SD->field_end(); Field != FieldEnd; ++Field) {
-      // We're done once we hit the flexible array member or run out of
-      // InitListExpr elements.
-      if (Field->getType()->isIncompleteArrayType() ||
-          ILEElement == ILE->getNumInits())
-        break;
-      if (Field->isUnnamedBitfield())
-        continue;
-
-      const Expr *E = ILE->getInit(ILEElement++);
+  if (const RecordType *RT = E->getType()->getAs<RecordType>()) {
+    if (!RT->isUnionType()) {
+      RecordDecl *SD = E->getType()->getAs<RecordType>()->getDecl();
+      uint64_t NumNonZeroBytes = 0;
       
-      // Reference values are always non-null and have the width of a pointer.
-      if (Field->getType()->isReferenceType()) {
-        NumNonZeroBytes += CGF.getContext().Target.getPointerWidth(0);
-        continue;
-      }      
+      unsigned ILEElement = 0;
+      for (RecordDecl::field_iterator Field = SD->field_begin(),
+           FieldEnd = SD->field_end(); Field != FieldEnd; ++Field) {
+        // We're done once we hit the flexible array member or run out of
+        // InitListExpr elements.
+        if (Field->getType()->isIncompleteArrayType() ||
+            ILEElement == ILE->getNumInits())
+          break;
+        if (Field->isUnnamedBitfield())
+          continue;
+
+        const Expr *E = ILE->getInit(ILEElement++);
+        
+        // Reference values are always non-null and have the width of a pointer.
+        if (Field->getType()->isReferenceType())
+          NumNonZeroBytes += CGF.getContext().Target.getPointerWidth(0);
+        else
+          NumNonZeroBytes += GetNumNonZeroBytesInInit(E, CGF);
+      }
       
-      NumNonZeroBytes += GetNumNonZeroBytesInInit(E, CGF);
+      return NumNonZeroBytes;
     }
-    
-    return NumNonZeroBytes;
   }