diff options
| -rw-r--r-- | lib/IR/Constants.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/IPO/DeadArgumentElimination.cpp | 11 | ||||
| -rw-r--r-- | test/Transforms/DeadArgElim/2013-05-17-VarargsAndBlockAddress.ll | 25 |
3 files changed, 35 insertions, 3 deletions
diff --git a/lib/IR/Constants.cpp b/lib/IR/Constants.cpp index d370d409e0..e04be1f59d 100644 --- a/lib/IR/Constants.cpp +++ b/lib/IR/Constants.cpp @@ -1389,7 +1389,7 @@ void BlockAddress::replaceUsesOfWithOnConstant(Value *From, Value *To, Use *U) { BasicBlock *NewBB = getBasicBlock(); if (U == &Op<0>()) - NewF = cast<Function>(To); + NewF = cast<Function>(To->stripPointerCasts()); else NewBB = cast<BasicBlock>(To); diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 3fdb5f0e58..70d03178cb 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -263,8 +263,10 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { // to pass in a smaller number of arguments into the new function. // std::vector<Value*> Args; - while (!Fn.use_empty()) { - CallSite CS(Fn.use_back()); + for (Value::use_iterator I = Fn.use_begin(), E = Fn.use_end(); I != E; ) { + CallSite CS(*I++); + if (!CS) + continue; Instruction *Call = CS.getInstruction(); // Pass all the same arguments. @@ -330,6 +332,11 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { if (DI != FunctionDIs.end()) DI->second.replaceFunction(NF); + // Fix up any BlockAddresses that refer to the function. + Fn.replaceAllUsesWith(ConstantExpr::getBitCast(NF, Fn.getType())); + // Delete the bitcast that we just created, so that NF does not + // appear to be address-taken. + NF->removeDeadConstantUsers(); // Finally, nuke the old function. Fn.eraseFromParent(); return true; diff --git a/test/Transforms/DeadArgElim/2013-05-17-VarargsAndBlockAddress.ll b/test/Transforms/DeadArgElim/2013-05-17-VarargsAndBlockAddress.ll new file mode 100644 index 0000000000..23216031b5 --- /dev/null +++ b/test/Transforms/DeadArgElim/2013-05-17-VarargsAndBlockAddress.ll @@ -0,0 +1,25 @@ +; RUN: opt %s -deadargelim -S | FileCheck %s + + +@block_addr = global i8* blockaddress(@varargs_func, %l1) +; CHECK: @block_addr = global i8* blockaddress(@varargs_func, %l1) + + +; This function is referenced by a "blockaddress" constant but it is +; not address-taken, so the pass should be able to remove its unused +; varargs. + +define internal i32 @varargs_func(i8* %addr, ...) { + indirectbr i8* %addr, [ label %l1, label %l2 ] +l1: + ret i32 1 +l2: + ret i32 2 +} +; CHECK: define internal i32 @varargs_func(i8* %addr) { + +define i32 @caller(i8* %addr) { + %r = call i32 (i8*, ...)* @varargs_func(i8* %addr) + ret i32 %r +} +; CHECK: %r = call i32 @varargs_func(i8* %addr) |