summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ASTContext.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-05-03 22:07:14 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-05-03 22:07:14 +0000
commit759e4a1addbf37b7dc3b8ded0eec4dc0b26e3584 (patch)
treee5e792bf2889d96b1e1a6a036c128b6039236921 /clang/lib/AST/ASTContext.cpp
parent543596d57b3b215279af9aa84cbfa3c69198d02d (diff)
downloadbcm5719-llvm-759e4a1addbf37b7dc3b8ded0eec4dc0b26e3584.tar.gz
bcm5719-llvm-759e4a1addbf37b7dc3b8ded0eec4dc0b26e3584.zip
Only the first zero-length bitfield decides alignment of
the followup data member in an ms_struct struct. // rdar:// 8823265 llvm-svn: 130795
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
-rw-r--r--clang/lib/AST/ASTContext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 8316ea68e9e..287c8b2af6e 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -546,7 +546,8 @@ bool ASTContext::ZeroBitfieldFollowsNonBitfield(const FieldDecl *FD,
bool ASTContext::ZeroBitfieldFollowsBitfield(const FieldDecl *FD,
const FieldDecl *LastFD) const {
return (FD->isBitField() && LastFD && LastFD->isBitField() &&
- FD->getBitWidth()-> EvaluateAsInt(*this).getZExtValue() == 0);
+ FD->getBitWidth()-> EvaluateAsInt(*this).getZExtValue() == 0 &&
+ LastFD->getBitWidth()-> EvaluateAsInt(*this).getZExtValue() != 0);
}
OpenPOWER on IntegriCloud