diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 6 | ||||
-rw-r--r-- | lib/Basic/Targets.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 19a762c30b..4096ba1db4 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -1584,9 +1584,9 @@ void RecordLayoutBuilder::LayoutField(const FieldDecl *D) { } else if (ZeroLengthBitfieldBoundary > FieldAlign) { // Align 'bar' based on a fixed alignment specified by the target. - assert (Context.Target.useZeroLengthBitfieldAlignment() && - "ZeroLengthBitfieldBoundary should only be used in conjunction" - "with useZeroLengthBitfieldAlignment."); + assert(Context.Target.useZeroLengthBitfieldAlignment() && + "ZeroLengthBitfieldBoundary should only be used in conjunction" + " with useZeroLengthBitfieldAlignment."); FieldAlign = ZeroLengthBitfieldBoundary; } ZeroLengthBitfield = 0; diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 89b6ce960b..7bed507def 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -1970,7 +1970,8 @@ public: UseZeroLengthBitfieldAlignment = true; /// gcc forces the alignment to 4 bytes, regardless of the type of the - /// zero length bitfield. + /// zero length bitfield. This corresponds to EMPTY_FIELD_BOUNDARY in + /// gcc. ZeroLengthBitfieldBoundary = 32; if (IsThumb) { |