1 files changed, 4 insertions, 2 deletions
diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 810f11b6e3..2203ed1324 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -1359,9 +1359,11 @@ void RecordLayoutBuilder::LayoutBitField(const FieldDecl *D) {
       std::pair<uint64_t, unsigned> FieldInfo = 
         Context.getTypeInfo(ZeroLengthBitfield->getType());
       unsigned ZeroLengthBitfieldAlignment = FieldInfo.second;
-      if (ZeroLengthBitfieldAlignment > FieldAlign)
+      // Ignore alignment of subsequent zero-length bitfields.
+      if ((ZeroLengthBitfieldAlignment > FieldAlign) || (FieldSize == 0))
         FieldAlign = ZeroLengthBitfieldAlignment;
-      ZeroLengthBitfield = 0;
+      if (FieldSize)
+        ZeroLengthBitfield = 0;
     }
   }