diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Analysis/AliasAnalysis.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Analysis/AliasDebugger.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Analysis/AliasSetTracker.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Analysis/MemoryDependenceAnalysis.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Analysis/NoAliasAnalysis.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/ArgumentPromotion.cpp | 22 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Utils/BasicBlockUtils.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Utils/LoopSimplify.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Transforms/Vectorize/BBVectorize.cpp | 7 | 
9 files changed, 2 insertions, 49 deletions
diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp index 05f14698ecb..f10468d2ebb 100644 --- a/llvm/lib/Analysis/AliasAnalysis.cpp +++ b/llvm/lib/Analysis/AliasAnalysis.cpp @@ -66,11 +66,6 @@ AliasAnalysis::getArgModRefInfo(ImmutableCallSite CS, unsigned ArgIdx) {    return AA->getArgModRefInfo(CS, ArgIdx);  } -void AliasAnalysis::deleteValue(Value *V) { -  assert(AA && "AA didn't call InitializeAliasAnalysis in its run method!"); -  AA->deleteValue(V); -} -  AliasAnalysis::ModRefResult  AliasAnalysis::getModRefInfo(Instruction *I, ImmutableCallSite Call) {    // We may have two calls diff --git a/llvm/lib/Analysis/AliasDebugger.cpp b/llvm/lib/Analysis/AliasDebugger.cpp index e5107b3bc82..1f331857dd1 100644 --- a/llvm/lib/Analysis/AliasDebugger.cpp +++ b/llvm/lib/Analysis/AliasDebugger.cpp @@ -119,12 +119,6 @@ namespace {        assert(Vals.find(Loc.Ptr) != Vals.end() && "Never seen value in AA before");        return AliasAnalysis::pointsToConstantMemory(Loc, OrLocal);      } - -    void deleteValue(Value *V) override { -      assert(Vals.find(V) != Vals.end() && "Never seen value in AA before"); -      AliasAnalysis::deleteValue(V); -    } -    };  } diff --git a/llvm/lib/Analysis/AliasSetTracker.cpp b/llvm/lib/Analysis/AliasSetTracker.cpp index 54d0f4304e1..3369cc5bf42 100644 --- a/llvm/lib/Analysis/AliasSetTracker.cpp +++ b/llvm/lib/Analysis/AliasSetTracker.cpp @@ -505,9 +505,6 @@ bool AliasSetTracker::remove(Instruction *I) {  // dangling pointers to deleted instructions.  //  void AliasSetTracker::deleteValue(Value *PtrVal) { -  // Notify the alias analysis implementation that this value is gone. -  AA.deleteValue(PtrVal); -    // If this is a call instruction, remove the callsite from the appropriate    // AliasSet (if present).    if (Instruction *Inst = dyn_cast<Instruction>(PtrVal)) { diff --git a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp index 51e3c4d9d84..fc96b7d8eb3 100644 --- a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -1618,7 +1618,6 @@ void MemoryDependenceAnalysis::removeInstruction(Instruction *RemInst) {    assert(!NonLocalDeps.count(RemInst) && "RemInst got reinserted?"); -  AA->deleteValue(RemInst);    DEBUG(verifyRemoved(RemInst));  }  /// verifyRemoved - Verify that the specified instruction does not occur diff --git a/llvm/lib/Analysis/NoAliasAnalysis.cpp b/llvm/lib/Analysis/NoAliasAnalysis.cpp index 43e624fcfa4..1d21ed75954 100644 --- a/llvm/lib/Analysis/NoAliasAnalysis.cpp +++ b/llvm/lib/Analysis/NoAliasAnalysis.cpp @@ -71,8 +71,6 @@ namespace {        return ModRef;      } -    void deleteValue(Value *V) override {} -      /// getAdjustedAnalysisPointer - This method is used when a pass implements      /// an analysis interface through multiple inheritance.  If needed, it      /// should override this to adjust the this pointer as needed for the diff --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp index 4762011d63d..af2504682aa 100644 --- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -501,7 +501,6 @@ bool ArgPromotion::isSafeToPromoteArgument(Argument *Arg,        if (GEP->use_empty()) {          // Dead GEP's cause trouble later.  Just remove them if we run into          // them. -        getAnalysis<AliasAnalysis>().deleteValue(GEP);          GEP->eraseFromParent();          // TODO: This runs the above loop over and over again for dead GEPs          // Couldn't we just do increment the UI iterator earlier and erase the @@ -743,10 +742,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,    F->getParent()->getFunctionList().insert(F, NF);    NF->takeName(F); -  // Get the alias analysis information that we need to update to reflect our -  // changes. -  AliasAnalysis &AA = getAnalysis<AliasAnalysis>(); -    // Get the callgraph information that we need to update to reflect our    // changes.    CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph(); @@ -873,10 +868,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,      Args.clear();      AttributesVec.clear(); -    // Update the alias analysis implementation to know that we are replacing -    // the old call with a new one. -    AA.replaceWithNewValue(Call, New); -      // Update the callgraph to know that the callsite has been transformed.      CallGraphNode *CalleeNode = CG[Call->getParent()->getParent()];      CalleeNode->replaceCallEdge(CS, CallSite(New), NF_CGN); @@ -906,7 +897,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,        // new version.        I->replaceAllUsesWith(I2);        I2->takeName(I); -      AA.replaceWithNewValue(I, I2);        ++I2;        continue;      } @@ -935,7 +925,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,        // Anything that used the arg should now use the alloca.        I->replaceAllUsesWith(TheAlloca);        TheAlloca->takeName(I); -      AA.replaceWithNewValue(I, TheAlloca);        // If the alloca is used in a call, we must clear the tail flag since        // the callee now uses an alloca from the caller. @@ -948,10 +937,8 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,        continue;      } -    if (I->use_empty()) { -      AA.deleteValue(I); +    if (I->use_empty())        continue; -    }      // Otherwise, if we promoted this argument, then all users are load      // instructions (or GEPs with only load users), and all loads should be @@ -964,7 +951,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,                 "Load element should sort to front!");          I2->setName(I->getName()+".val");          LI->replaceAllUsesWith(I2); -        AA.replaceWithNewValue(LI, I2);          LI->eraseFromParent();          DEBUG(dbgs() << "*** Promoted load of argument '" << I->getName()                << "' in function '" << F->getName() << "'\n"); @@ -1001,10 +987,8 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,          while (!GEP->use_empty()) {            LoadInst *L = cast<LoadInst>(GEP->user_back());            L->replaceAllUsesWith(TheArg); -          AA.replaceWithNewValue(L, TheArg);            L->eraseFromParent();          } -        AA.deleteValue(GEP);          GEP->eraseFromParent();        }      } @@ -1013,10 +997,6 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F,      std::advance(I2, ArgIndices.size());    } -  // Tell the alias analysis that the old function is about to disappear. -  AA.replaceWithNewValue(F, NF); - -      NF_CGN->stealCalledFunctionsFrom(CG[F]);    // Now that the old function is dead, delete it.  If there is a dangling diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp index ef7dacac79c..c0aaf28890b 100644 --- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -77,8 +77,6 @@ void llvm::FoldSingleEntryPHINodes(BasicBlock *BB, AliasAnalysis *AA,      if (MemDep)        MemDep->removeInstruction(PN);  // Memdep updates AA itself. -    else if (AA && isa<PointerType>(PN->getType())) -      AA->deleteValue(PN);      PN->eraseFromParent();    } diff --git a/llvm/lib/Transforms/Utils/LoopSimplify.cpp b/llvm/lib/Transforms/Utils/LoopSimplify.cpp index 5c98043e463..e63f2560d79 100644 --- a/llvm/lib/Transforms/Utils/LoopSimplify.cpp +++ b/llvm/lib/Transforms/Utils/LoopSimplify.cpp @@ -216,7 +216,6 @@ static PHINode *findPHIToPartitionLoops(Loop *L, AliasAnalysis *AA,      if (Value *V = SimplifyInstruction(PN, DL, nullptr, DT, AC)) {        // This is a degenerate PHI already, don't modify it!        PN->replaceAllUsesWith(V); -      if (AA) AA->deleteValue(PN);        PN->eraseFromParent();        continue;      } @@ -443,7 +442,6 @@ static BasicBlock *insertUniqueBackedgeBlock(Loop *L, BasicBlock *Preheader,      // eliminate the PHI Node.      if (HasUniqueIncomingValue) {        NewPN->replaceAllUsesWith(UniqueValue); -      if (AA) AA->deleteValue(NewPN);        BEBlock->getInstList().erase(NewPN);      }    } @@ -618,7 +616,6 @@ ReprocessLoop:    for (BasicBlock::iterator I = L->getHeader()->begin();         (PN = dyn_cast<PHINode>(I++)); )      if (Value *V = SimplifyInstruction(PN, DL, nullptr, DT, AC)) { -      if (AA) AA->deleteValue(PN);        if (SE) SE->forgetValue(PN);        PN->replaceAllUsesWith(V);        PN->eraseFromParent(); diff --git a/llvm/lib/Transforms/Vectorize/BBVectorize.cpp b/llvm/lib/Transforms/Vectorize/BBVectorize.cpp index df016baafe5..ed134141e93 100644 --- a/llvm/lib/Transforms/Vectorize/BBVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/BBVectorize.cpp @@ -2806,11 +2806,8 @@ namespace {                       Instruction *J, Instruction *K,                       Instruction *&InsertionPt,                       Instruction *&K1, Instruction *&K2) { -    if (isa<StoreInst>(I)) { -      AA->replaceWithNewValue(I, K); -      AA->replaceWithNewValue(J, K); +    if (isa<StoreInst>(I))        return; -    }      Type *IType = I->getType();      Type *JType = J->getType(); @@ -3144,8 +3141,6 @@ namespace {        if (!isa<StoreInst>(I)) {          L->replaceAllUsesWith(K1);          H->replaceAllUsesWith(K2); -        AA->replaceWithNewValue(L, K1); -        AA->replaceWithNewValue(H, K2);        }        // Instructions that may read from memory may be in the load move set.  | 

