From 2144c2536428f3e4eff4ec8323f00b3b47a80a2e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 12 May 2006 23:35:26 +0000 Subject: [PATCH] Remove some dead variables. Fix a nasty bug in the memcmp optimizer where we used the wrong variable! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28269 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/Inliner.cpp | 1 - lib/Transforms/IPO/SimplifyLibCalls.cpp | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 65cc47db403..89999bb4425 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -41,7 +41,6 @@ Inliner::Inliner() : InlineThreshold(InlineLimit) {} // do so and update the CallGraph for this operation. static bool InlineCallIfPossible(CallSite CS, CallGraph &CG, const std::set &SCCFunctions) { - Function *Caller = CS.getInstruction()->getParent()->getParent(); Function *Callee = CS.getCalledFunction(); if (!InlineFunction(CS, &CG)) return false; diff --git a/lib/Transforms/IPO/SimplifyLibCalls.cpp b/lib/Transforms/IPO/SimplifyLibCalls.cpp index f4650be9877..fefb100c37f 100644 --- a/lib/Transforms/IPO/SimplifyLibCalls.cpp +++ b/lib/Transforms/IPO/SimplifyLibCalls.cpp @@ -386,7 +386,7 @@ struct ExitInMainOptimization : public LibCallOptimization { // Create a return instruction that we'll replace the call with. // Note that the argument of the return is the argument of the call // instruction. - ReturnInst* ri = new ReturnInst(ci->getOperand(1), ci); + new ReturnInst(ci->getOperand(1), ci); // Split the block at the call instruction which places it in a new // basic block. @@ -444,7 +444,6 @@ public: /// @brief Optimize the strcat library function virtual bool OptimizeCall(CallInst* ci, SimplifyLibCalls& SLC) { // Extract some information from the instruction - Module* M = ci->getParent()->getParent()->getParent(); Value* dest = ci->getOperand(1); Value* src = ci->getOperand(2); @@ -807,9 +806,6 @@ public: // terminator as well. len++; - // Extract some information from the instruction - Module* M = ci->getParent()->getParent()->getParent(); - // We have enough information to now generate the memcpy call to // do the concatenation for us. std::vector vals; @@ -996,7 +992,7 @@ struct memcmpOptimization : public LibCallOptimization { Value *G1 = new GetElementPtrInst(Op1Cast, One, "next1v", CI); Value *G2 = new GetElementPtrInst(Op2Cast, One, "next2v", CI); Value *S1V2 = new LoadInst(G1, LHS->getName()+".val2", CI); - Value *S2V2 = new LoadInst(G1, RHS->getName()+".val2", CI); + Value *S2V2 = new LoadInst(G2, RHS->getName()+".val2", CI); Value *D2 = BinaryOperator::createSub(S1V2, S2V2, CI->getName()+".d1", CI); Value *Or = BinaryOperator::createOr(D1, D2, CI->getName()+".res", CI); -- 2.34.1