diff options
| author | James Y Knight <jyknight@google.com> | 2015-06-17 13:53:12 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2015-06-17 13:53:12 +0000 |
| commit | f27e441373dde31ac86f7f11280c357c30c7c243 (patch) | |
| tree | d5523e65a156702019406f9f8d89e0c36749a511 /llvm/lib/IR | |
| parent | 9c5831f3de4359d807ee33a37512795817f8689e (diff) | |
| download | bcm5719-llvm-f27e441373dde31ac86f7f11280c357c30c7c243.tar.gz bcm5719-llvm-f27e441373dde31ac86f7f11280c357c30c7c243.zip | |
Tweak wording of alignment static_assert messages.
llvm-svn: 239907
Diffstat (limited to 'llvm/lib/IR')
| -rw-r--r-- | llvm/lib/IR/AttributeImpl.h | 13 | ||||
| -rw-r--r-- | llvm/lib/IR/Metadata.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/IR/User.cpp | 7 |
3 files changed, 14 insertions, 12 deletions
diff --git a/llvm/lib/IR/AttributeImpl.h b/llvm/lib/IR/AttributeImpl.h index 88a68a4e005..6f338ae835f 100644 --- a/llvm/lib/IR/AttributeImpl.h +++ b/llvm/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/llvm/lib/IR/Metadata.cpp b/llvm/lib/IR/Metadata.cpp index de1587d28a0..1abcf0d18c9 100644 --- a/llvm/lib/IR/Metadata.cpp +++ b/llvm/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/llvm/lib/IR/User.cpp b/llvm/lib/IR/User.cpp index ab25670d389..522722d701b 100644 --- a/llvm/lib/IR/User.cpp +++ b/llvm/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. |

