diff options
| author | Ranjeet Singh <Ranjeet.Singh@arm.com> | 2018-12-04 02:03:53 +0000 |
|---|---|---|
| committer | Ranjeet Singh <Ranjeet.Singh@arm.com> | 2018-12-04 02:03:53 +0000 |
| commit | b393a516fbf09fbe9940adc0ba5aed23f2d25a26 (patch) | |
| tree | a344a6bae2deab4d3706a3372b52e405242324d1 /llvm/lib/IR/ConstantFold.cpp | |
| parent | 60eb8c113b57176d9235db511ba9eadb1be92232 (diff) | |
| download | bcm5719-llvm-b393a516fbf09fbe9940adc0ba5aed23f2d25a26.tar.gz bcm5719-llvm-b393a516fbf09fbe9940adc0ba5aed23f2d25a26.zip | |
Reverting r348215
Causing failures on ubsan buildbot boxes.
llvm-svn: 348230
Diffstat (limited to 'llvm/lib/IR/ConstantFold.cpp')
| -rw-r--r-- | llvm/lib/IR/ConstantFold.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/IR/ConstantFold.cpp b/llvm/lib/IR/ConstantFold.cpp index d34e383f99f..107975df1e7 100644 --- a/llvm/lib/IR/ConstantFold.cpp +++ b/llvm/lib/IR/ConstantFold.cpp @@ -27,7 +27,6 @@ #include "llvm/IR/GlobalAlias.h" #include "llvm/IR/GlobalVariable.h" #include "llvm/IR/Instructions.h" -#include "llvm/IR/Module.h" #include "llvm/IR/Operator.h" #include "llvm/IR/PatternMatch.h" #include "llvm/Support/ErrorHandling.h" @@ -1078,8 +1077,10 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode, Constant *C1, isa<GlobalValue>(CE1->getOperand(0))) { GlobalValue *GV = cast<GlobalValue>(CE1->getOperand(0)); - unsigned GVAlign = - GV->getPointerAlignment(GV->getParent()->getDataLayout()); + // Functions are at least 4-byte aligned. + unsigned GVAlign = GV->getAlignment(); + if (isa<Function>(GV)) + GVAlign = std::max(GVAlign, 4U); if (GVAlign > 1) { unsigned DstWidth = CI2->getType()->getBitWidth(); |
