diff options
| -rw-r--r-- | include/clang/Basic/TargetInfo.h | 6 | ||||
| -rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 2 | ||||
| -rw-r--r-- | lib/Basic/TargetInfo.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h index 55669faa45..f89d5649e7 100644 --- a/include/clang/Basic/TargetInfo.h +++ b/include/clang/Basic/TargetInfo.h @@ -91,7 +91,7 @@ protected: /// used to (a) impact the alignment of the containing structure, and (b) /// ensure that the individual bit-field will not straddle an alignment /// boundary. - unsigned UseBitfieldTypeAlignment : 1; + unsigned UseBitFieldTypeAlignment : 1; public: IntType getSizeType() const { return SizeType; } @@ -205,8 +205,8 @@ public: return UserLabelPrefix; } - bool useBitfieldTypeAlignment() const { - return UseBitfieldTypeAlignment; + bool useBitFieldTypeAlignment() const { + return UseBitFieldTypeAlignment; } /// getTypeName - Return the user string for the specified integer type enum. diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index d312ee13fe..7c89b7b47b 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -585,7 +585,7 @@ void ASTRecordLayoutBuilder::LayoutBitField(const FieldDecl *D) { uint64_t TypeSize = FieldInfo.first; unsigned FieldAlign = FieldInfo.second; - if (FieldPacked || !Ctx.Target.useBitfieldTypeAlignment()) + if (FieldPacked || !Ctx.Target.useBitFieldTypeAlignment()) FieldAlign = 1; if (const AlignedAttr *AA = D->getAttr<AlignedAttr>()) FieldAlign = std::max(FieldAlign, AA->getMaxAlignment()); diff --git a/lib/Basic/TargetInfo.cpp b/lib/Basic/TargetInfo.cpp index 8b4fdee47c..e03d5ac828 100644 --- a/lib/Basic/TargetInfo.cpp +++ b/lib/Basic/TargetInfo.cpp @@ -44,7 +44,7 @@ TargetInfo::TargetInfo(const std::string &T) : Triple(T) { Char32Type = UnsignedInt; Int64Type = SignedLongLong; SigAtomicType = SignedInt; - UseBitfieldTypeAlignment = true; + UseBitFieldTypeAlignment = true; FloatFormat = &llvm::APFloat::IEEEsingle; DoubleFormat = &llvm::APFloat::IEEEdouble; LongDoubleFormat = &llvm::APFloat::IEEEdouble; |