commit 595ec5d43c099ea16937c811e4eceab4be8e4d9a
author Fariborz Jahanian <fjahanian@apple.com> Wed Apr 27 17:14:21 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Apr 27 17:14:21 2011 +0000
tree bf462c3be14335c5bd6c4b4fc987f19590ac1b7d
parent 5fc8c9eafb06e716130d38cf6212f4b438d4c280

Some refactoring of my ms_struct patch.
// rdar://8823265 related.

llvm-svn: 130311

clang/lib/AST/RecordLayoutBuilder.cpp

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index c4a156f..4076557 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -1261,10 +1261,8 @@
       // Zero-length bitfields following non-bitfield members are
       // ignored:
       const FieldDecl *FD =  (*Field);
-      if (FD->isBitField() && LastFD && !LastFD->isBitField() &&
-          FD->getBitWidth()->EvaluateAsInt(Context).getZExtValue() == 0) {
+      if (Context.ZeroBitfieldFollowsNonBitfield(FD, LastFD))
         continue;
-      }
       LastFD = FD;
     }
     LayoutField(*Field);