diff options
| -rw-r--r-- | include/clang/AST/ASTContext.h | 14 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 4 | ||||
| -rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h index a9de22cd9c..4e5e7888b4 100644 --- a/include/clang/AST/ASTContext.h +++ b/include/clang/AST/ASTContext.h @@ -412,17 +412,17 @@ public: /// BitfieldFollowsBitfield - return 'true" if 'FD' is a /// bitfield which follows the bitfield 'LastFD'. bool BitfieldFollowsBitfield(const FieldDecl *FD, - const FieldDecl *LastFD) const; + const FieldDecl *LastFD) const; - /// NoneBitfieldFollowsBitfield - return 'true" if 'FD' is not a + /// NonBitfieldFollowsBitfield - return 'true" if 'FD' is not a /// bitfield which follows the bitfield 'LastFD'. - bool NoneBitfieldFollowsBitfield(const FieldDecl *FD, - const FieldDecl *LastFD) const; + bool NonBitfieldFollowsBitfield(const FieldDecl *FD, + const FieldDecl *LastFD) const; - /// BitfieldFollowsNoneBitfield - return 'true" if 'FD' is a + /// BitfieldFollowsNonBitfield - return 'true" if 'FD' is a /// bitfield which follows the none bitfield 'LastFD'. - bool BitfieldFollowsNoneBitfield(const FieldDecl *FD, - const FieldDecl *LastFD) const; + bool BitfieldFollowsNonBitfield(const FieldDecl *FD, + const FieldDecl *LastFD) const; // Access to the set of methods overridden by the given C++ method. typedef CXXMethodVector::iterator overridden_cxx_method_iterator; diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index f5c4ffac92..92695f2398 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -573,13 +573,13 @@ bool ASTContext::BitfieldFollowsBitfield(const FieldDecl *FD, LastFD->getBitWidth()->EvaluateAsInt(*this).getZExtValue()); } -bool ASTContext::NoneBitfieldFollowsBitfield(const FieldDecl *FD, +bool ASTContext::NonBitfieldFollowsBitfield(const FieldDecl *FD, const FieldDecl *LastFD) const { return (!FD->isBitField() && LastFD && LastFD->isBitField() && LastFD->getBitWidth()->EvaluateAsInt(*this).getZExtValue()); } -bool ASTContext::BitfieldFollowsNoneBitfield(const FieldDecl *FD, +bool ASTContext::BitfieldFollowsNonBitfield(const FieldDecl *FD, const FieldDecl *LastFD) const { return (FD->isBitField() && LastFD && !LastFD->isBitField() && FD->getBitWidth()->EvaluateAsInt(*this).getZExtValue()); diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 02b3965f32..4c561653a5 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -1270,8 +1270,8 @@ void RecordLayoutBuilder::LayoutFields(const RecordDecl *D) { continue; // FIXME. streamline these conditions into a simple one. else if (Context.BitfieldFollowsBitfield(FD, LastFD) || - Context.BitfieldFollowsNoneBitfield(FD, LastFD) || - Context.NoneBitfieldFollowsBitfield(FD, LastFD)) { + Context.BitfieldFollowsNonBitfield(FD, LastFD) || + Context.NonBitfieldFollowsBitfield(FD, LastFD)) { // 1) Adjacent bit fields are packed into the same 1-, 2-, or // 4-byte allocation unit if the integral types are the same // size and if the next bit field fits into the current |