diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2019-12-16 15:19:09 +0100 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2019-12-16 15:19:49 +0100 |
| commit | 4658da10e4aabd15868876d879cfb185115a170c (patch) | |
| tree | 840df36eddd3ce916a068e88a906164a2609a7ef /llvm/lib/IR/Instructions.cpp | |
| parent | f4dfae9bb5c4099e9d17986a52ad8822522dc229 (diff) | |
| download | bcm5719-llvm-4658da10e4aabd15868876d879cfb185115a170c.tar.gz bcm5719-llvm-4658da10e4aabd15868876d879cfb185115a170c.zip | |
Revert "[Alignment][NFC] Deprecate CreateMemCpy/CreateMemMove"
This reverts commit 181ab91efc9fb08dedda10a2fbc5fccb83ce8799.
Diffstat (limited to 'llvm/lib/IR/Instructions.cpp')
| -rw-r--r-- | llvm/lib/IR/Instructions.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp index c264277fa53..2a49a758a46 100644 --- a/llvm/lib/IR/Instructions.cpp +++ b/llvm/lib/IR/Instructions.cpp @@ -1342,7 +1342,11 @@ void LoadInst::setAlignment(MaybeAlign Align) { "Alignment is greater than MaximumAlignment!"); setInstructionSubclassData((getSubclassDataFromInstruction() & ~(31 << 1)) | (encode(Align) << 1)); - assert(getAlign() == Align && "Alignment representation error!"); + if (Align) + assert(getAlignment() == Align->value() && + "Alignment representation error!"); + else + assert(getAlignment() == 0 && "Alignment representation error!"); } //===----------------------------------------------------------------------===// @@ -1412,12 +1416,16 @@ StoreInst::StoreInst(Value *val, Value *addr, bool isVolatile, MaybeAlign Align, AssertOK(); } -void StoreInst::setAlignment(MaybeAlign Alignment) { - assert((!Alignment || *Alignment <= MaximumAlignment) && +void StoreInst::setAlignment(MaybeAlign Align) { + assert((!Align || *Align <= MaximumAlignment) && "Alignment is greater than MaximumAlignment!"); setInstructionSubclassData((getSubclassDataFromInstruction() & ~(31 << 1)) | - (encode(Alignment) << 1)); - assert(getAlign() == Alignment && "Alignment representation error!"); + (encode(Align) << 1)); + if (Align) + assert(getAlignment() == Align->value() && + "Alignment representation error!"); + else + assert(getAlignment() == 0 && "Alignment representation error!"); } //===----------------------------------------------------------------------===// |
