Fix PR1735 and Transforms/DeadArgElim/2007-10-18-VarargsReturn.ll by

fixing some obviously broken code :(

llvm-svn: 43141

2 files changed, 15 insertions, 3 deletions

diff --git a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
index dd5d668bc17..8dd09256136 100644
--- a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
@@ -168,7 +168,7 @@ bool DAE::DeleteDeadVarargs(Function &Fn) {
     CallSite CS = CallSite::get(Fn.use_back());
     Instruction *Call = CS.getInstruction();
     
-    // Loop over the operands, dropping extraneous ones at the end of the list.
+    // Pass all the same arguments.
     Args.assign(CS.arg_begin(), CS.arg_begin()+NumArgs);
     
     Instruction *New;
@@ -185,13 +185,13 @@ bool DAE::DeleteDeadVarargs(Function &Fn) {
     Args.clear();
     
     if (!Call->use_empty())
-      Call->replaceAllUsesWith(Constant::getNullValue(Call->getType()));
+      Call->replaceAllUsesWith(New);
     
     New->takeName(Call);
     
     // Finally, remove the old call from the program, reducing the use-count of
     // F.
-    Call->getParent()->getInstList().erase(Call);
+    Call->eraseFromParent();
   }
   
   // Since we have now created the new function, splice the body of the old
diff --git a/llvm/test/Transforms/DeadArgElim/2007-10-18-VarargsReturn.ll b/llvm/test/Transforms/DeadArgElim/2007-10-18-VarargsReturn.ll
new file mode 100644
index 00000000000..2a09b76c35b
--- /dev/null
+++ b/llvm/test/Transforms/DeadArgElim/2007-10-18-VarargsReturn.ll
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep {ret i32 0}
+; PR1735
+
+define internal i32 @test(i32 %A, ...) { 
+	ret i32 %A
+}
+
+define i32 @foo() {
+	%A = call i32(i32, ...)* @test(i32 1)
+	ret i32 %A
+}
+