From: James Y Knight <jyknight@google.com>
Date: Wed, 17 Jun 2015 13:53:12 +0000 (+0000)
Subject: Tweak wording of alignment static_assert messages.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=4dd3b8704809dbb3664fa9787d396b3988550be7

Tweak wording of alignment static_assert messages.

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

diff --git a/include/llvm/IR/User.h b/include/llvm/IR/User.h
index 9aaad2dcf8c..14439d3b30e 100644
--- a/include/llvm/IR/User.h
+++ b/include/llvm/IR/User.h
@@ -229,9 +229,9 @@ public:
 };
 // Either Use objects, or a Use pointer can be prepended to User.
 static_assert(AlignOf<Use>::Alignment >= AlignOf<User>::Alignment,
-              "Alignment sufficient after objects prepended to User");
+              "Alignment is insufficient after objects prepended to User");
 static_assert(AlignOf<Use *>::Alignment >= AlignOf<User>::Alignment,
-              "Alignment sufficient after objects prepended to User");
+              "Alignment is insufficient after objects prepended to User");
 
 template<> struct simplify_type<User::op_iterator> {
   typedef Value* SimpleType;
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index 88a68a4e005..6f338ae835f 100644
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -181,9 +181,9 @@ public:
       AttrList[I].Profile(ID);
   }
 };
-static_assert(AlignOf<AttributeSetNode>::Alignment >=
-                  AlignOf<Attribute>::Alignment,
-              "Alignment sufficient for objects appended to AttributeSetNode");
+static_assert(
+    AlignOf<AttributeSetNode>::Alignment >= AlignOf<Attribute>::Alignment,
+    "Alignment is insufficient for objects appended to AttributeSetNode");
 
 //===----------------------------------------------------------------------===//
 /// \class
@@ -273,9 +273,10 @@ public:
 
   void dump() const;
 };
-static_assert(AlignOf<AttributeSetImpl>::Alignment >=
-                  AlignOf<AttributeSetImpl::IndexAttrPair>::Alignment,
-              "Alignment sufficient for objects appended to AttributeSetImpl");
+static_assert(
+    AlignOf<AttributeSetImpl>::Alignment >=
+        AlignOf<AttributeSetImpl::IndexAttrPair>::Alignment,
+    "Alignment is insufficient for objects appended to AttributeSetImpl");
 
 } // end llvm namespace
 
diff --git a/lib/IR/Metadata.cpp b/lib/IR/Metadata.cpp
index de1587d28a0..1abcf0d18c9 100644
--- a/lib/IR/Metadata.cpp
+++ b/lib/IR/Metadata.cpp
@@ -384,9 +384,9 @@ StringRef MDString::getString() const {
 // Assert that the MDNode types will not be unaligned by the objects
 // prepended to them.
 #define HANDLE_MDNODE_LEAF(CLASS)                                              \
-  static_assert(llvm::AlignOf<uint64_t>::Alignment >=                          \
-                    llvm::AlignOf<CLASS>::Alignment,                           \
-                "Alignment sufficient after objects prepended to " #CLASS);
+  static_assert(                                                               \
+      llvm::AlignOf<uint64_t>::Alignment >= llvm::AlignOf<CLASS>::Alignment,   \
+      "Alignment is insufficient after objects prepended to " #CLASS);
 #include "llvm/IR/Metadata.def"
 
 void *MDNode::operator new(size_t Size, unsigned NumOps) {
diff --git a/lib/IR/User.cpp b/lib/IR/User.cpp
index ab25670d389..522722d701b 100644
--- a/lib/IR/User.cpp
+++ b/lib/IR/User.cpp
@@ -44,9 +44,10 @@ void User::allocHungoffUses(unsigned N, bool IsPhi) {
   assert(HasHungOffUses && "alloc must have hung off uses");
 
   static_assert(AlignOf<Use>::Alignment >= AlignOf<Use::UserRef>::Alignment,
-                "Alignment sufficient for hung-off-uses pieces");
-  static_assert(AlignOf<Use::UserRef>::Alignment >= AlignOf<BasicBlock *>::Alignment,
-                "Alignment sufficient for hung-off-uses pieces");
+                "Alignment is insufficient for 'hung-off-uses' pieces");
+  static_assert(AlignOf<Use::UserRef>::Alignment >=
+                    AlignOf<BasicBlock *>::Alignment,
+                "Alignment is insufficient for 'hung-off-uses' pieces");
 
   // Allocate the array of Uses, followed by a pointer (with bottom bit set) to
   // the User.