diff options
author | Dan Gohman <gohman@apple.com> | 2010-11-11 18:09:32 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2010-11-11 18:09:32 +0000 |
commit | 56653f0df85f8e4ee60941a6ca31c17ca6f936ff (patch) | |
tree | 3d6c94cc81a12f52caa81e644ce1965e50c43d24 /lib/Transforms/IPO/ArgumentPromotion.cpp | |
parent | fca0b106f7df867912cd1de8bbd6285bb2ab7225 (diff) | |
download | llvm-56653f0df85f8e4ee60941a6ca31c17ca6f936ff.tar.gz llvm-56653f0df85f8e4ee60941a6ca31c17ca6f936ff.tar.bz2 llvm-56653f0df85f8e4ee60941a6ca31c17ca6f936ff.tar.xz |
TBAA-enable ArgumentPromotion.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118804 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/IPO/ArgumentPromotion.cpp')
-rw-r--r-- | lib/Transforms/IPO/ArgumentPromotion.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index 7591a02d2d..78d9f1816e 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -39,7 +39,6 @@ #include "llvm/LLVMContext.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/CallGraph.h" -#include "llvm/Target/TargetData.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/CFG.h" #include "llvm/Support/Debug.h" @@ -440,8 +439,6 @@ bool ArgPromotion::isSafeToPromoteArgument(Argument *Arg, bool isByVal) const { SmallPtrSet<BasicBlock*, 16> TranspBlocks; AliasAnalysis &AA = getAnalysis<AliasAnalysis>(); - TargetData *TD = getAnalysisIfAvailable<TargetData>(); - if (!TD) return false; // Without TargetData, assume the worst. for (unsigned i = 0, e = Loads.size(); i != e; ++i) { // Check to see if the load is invalidated from the start of the block to @@ -449,11 +446,11 @@ bool ArgPromotion::isSafeToPromoteArgument(Argument *Arg, bool isByVal) const { LoadInst *Load = Loads[i]; BasicBlock *BB = Load->getParent(); - const PointerType *LoadTy = - cast<PointerType>(Load->getPointerOperand()->getType()); - uint64_t LoadSize = TD->getTypeStoreSize(LoadTy->getElementType()); + AliasAnalysis::Location Loc(Load->getPointerOperand(), + AA.getTypeStoreSize(Load->getType()), + Load->getMetadata(LLVMContext::MD_tbaa)); - if (AA.canInstructionRangeModify(BB->front(), *Load, Arg, LoadSize)) + if (AA.canInstructionRangeModify(BB->front(), *Load, Loc)) return false; // Pointer is invalidated! // Now check every path from the entry block to the load for transparency. @@ -464,7 +461,7 @@ bool ArgPromotion::isSafeToPromoteArgument(Argument *Arg, bool isByVal) const { for (idf_ext_iterator<BasicBlock*, SmallPtrSet<BasicBlock*, 16> > I = idf_ext_begin(P, TranspBlocks), E = idf_ext_end(P, TranspBlocks); I != E; ++I) - if (AA.canBasicBlockModify(**I, Arg, LoadSize)) + if (AA.canBasicBlockModify(**I, Loc)) return false; } } @@ -700,6 +697,9 @@ CallGraphNode *ArgPromotion::DoPromotion(Function *F, // of the previous load. LoadInst *newLoad = new LoadInst(V, V->getName()+".val", Call); newLoad->setAlignment(OrigLoad->getAlignment()); + // Transfer the TBAA info too. + newLoad->setMetadata(LLVMContext::MD_tbaa, + OrigLoad->getMetadata(LLVMContext::MD_tbaa)); Args.push_back(newLoad); AA.copyValue(OrigLoad, Args.back()); } |