diff options
| -rw-r--r-- | llvm/lib/IR/ConstantFold.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Analysis/ConstantFolding/func-and-folding.ll | 27 | ||||
| -rw-r--r-- | llvm/test/Assembler/2004-03-07-FunctionAddressAlignment.ll | 16 |
3 files changed, 30 insertions, 20 deletions
diff --git a/llvm/lib/IR/ConstantFold.cpp b/llvm/lib/IR/ConstantFold.cpp index 107975df1e7..d34e383f99f 100644 --- a/llvm/lib/IR/ConstantFold.cpp +++ b/llvm/lib/IR/ConstantFold.cpp @@ -27,6 +27,7 @@ #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" @@ -1077,10 +1078,8 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode, Constant *C1, isa<GlobalValue>(CE1->getOperand(0))) { GlobalValue *GV = cast<GlobalValue>(CE1->getOperand(0)); - // Functions are at least 4-byte aligned. - unsigned GVAlign = GV->getAlignment(); - if (isa<Function>(GV)) - GVAlign = std::max(GVAlign, 4U); + unsigned GVAlign = + GV->getPointerAlignment(GV->getParent()->getDataLayout()); if (GVAlign > 1) { unsigned DstWidth = CI2->getType()->getBitWidth(); diff --git a/llvm/test/Analysis/ConstantFolding/func-and-folding.ll b/llvm/test/Analysis/ConstantFolding/func-and-folding.ll new file mode 100644 index 00000000000..eaa55ab06ca --- /dev/null +++ b/llvm/test/Analysis/ConstantFolding/func-and-folding.ll @@ -0,0 +1,27 @@ +; RUN: opt < %s -constprop -S -o - | FileCheck %s + +; Function Attrs: minsize norecurse nounwind optsize readnone +define dso_local void @foo1() #0 { +entry: + ret void +} + +; Function Attrs: minsize norecurse nounwind optsize readnone +define dso_local void @foo2() align 4 { +entry: + ret void +} + +; Function Attrs: minsize nounwind optsize +define dso_local i32 @main() local_unnamed_addr #1 { +entry: +; CHECK: ptrtoint + %call = tail call i32 bitcast (i32 (...)* @process to i32 (i32)*)(i32 and (i32 ptrtoint (void ()* @foo1 to i32), i32 2)) #3 +; CHECK-NEXT: ptrtoint + %call2 = tail call i32 bitcast (i32 (...)* @process to i32 (i32)*)(i32 and (i32 ptrtoint (void ()* @foo2 to i32), i32 2)) #3 + ret i32 0 +} + +; Function Attrs: minsize optsize +declare dso_local i32 @process(...) local_unnamed_addr #2 + diff --git a/llvm/test/Assembler/2004-03-07-FunctionAddressAlignment.ll b/llvm/test/Assembler/2004-03-07-FunctionAddressAlignment.ll deleted file mode 100644 index 7fa0802db40..00000000000 --- a/llvm/test/Assembler/2004-03-07-FunctionAddressAlignment.ll +++ /dev/null @@ -1,16 +0,0 @@ -; RUN: llvm-as < %s | llvm-dis | not grep ptrtoint -; RUN: verify-uselistorder %s -; All of these should be eliminable - - -define i32 @foo() { - ret i32 and (i32 ptrtoint (i32()* @foo to i32), i32 1) -} - -define i32 @foo2() { - ret i32 and (i32 1, i32 ptrtoint (i32()* @foo2 to i32)) -} - -define i1 @foo3() { - ret i1 icmp ne (i1()* @foo3, i1()* null) -} |
