Additional comments and whitespace.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136892 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 7 insertions, 6 deletions

diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h
index a1b038487b..aad72e35be 100644
--- a/include/clang/Basic/TargetInfo.h
+++ b/include/clang/Basic/TargetInfo.h
@@ -284,8 +284,8 @@ public:
     return UseZeroLengthBitfieldAlignment;
   }
 
-  /// getZeroLengthBitfieldBoundary() - Get the fixed alignment value in
-  /// bits for a member that follows zero length bitfield.
+  /// getZeroLengthBitfieldBoundary() - Get the fixed alignment value in bits
+  /// for a member that follows a zero length bitfield.
   unsigned getZeroLengthBitfieldBoundary() const {
     return ZeroLengthBitfieldBoundary;
   }
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) {