diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2013-07-28 06:43:11 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2013-07-28 06:43:11 +0000 |
commit | 6c3a95dab561ef9747876d14014e965f8688f55b (patch) | |
tree | 7302a149bc6322f903f0c1650ba4f852f97b9789 /lib/Transforms/Utils | |
parent | f5b9110ce1e0d5bc6f96b1e74d110f0cc576324a (diff) | |
download | llvm-6c3a95dab561ef9747876d14014e965f8688f55b.tar.gz llvm-6c3a95dab561ef9747876d14014e965f8688f55b.tar.bz2 llvm-6c3a95dab561ef9747876d14014e965f8688f55b.tar.xz |
Thread DataLayout through the callers and into mem2reg. This will be
useful in a subsequent patch, but causes an unfortunate amount of noise,
so I pulled it out into a separate patch.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187322 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils')
-rw-r--r-- | lib/Transforms/Utils/Mem2Reg.cpp | 7 | ||||
-rw-r--r-- | lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 21 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 61b3965d8f..ebd7db6210 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -16,6 +16,7 @@ #include "llvm/Transforms/Scalar.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/Dominators.h" +#include "llvm/IR/DataLayout.h" #include "llvm/IR/Function.h" #include "llvm/IR/Instructions.h" #include "llvm/Transforms/Utils/PromoteMemToReg.h" @@ -27,6 +28,7 @@ STATISTIC(NumPromoted, "Number of alloca's promoted"); namespace { struct PromotePass : public FunctionPass { static char ID; // Pass identification, replacement for typeid + PromotePass() : FunctionPass(ID) { initializePromotePassPass(*PassRegistry::getPassRegistry()); } @@ -62,6 +64,7 @@ bool PromotePass::runOnFunction(Function &F) { bool Changed = false; DominatorTree &DT = getAnalysis<DominatorTree>(); + const DataLayout *DL = getAnalysisIfAvailable<DataLayout>(); while (1) { Allocas.clear(); @@ -70,12 +73,12 @@ bool PromotePass::runOnFunction(Function &F) { // the entry node for (BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I) if (AllocaInst *AI = dyn_cast<AllocaInst>(I)) // Is it an alloca? - if (isAllocaPromotable(AI)) + if (isAllocaPromotable(AI, DL)) Allocas.push_back(AI); if (Allocas.empty()) break; - PromoteMemToReg(Allocas, DT); + PromoteMemToReg(Allocas, DT, DL); NumPromoted += Allocas.size(); Changed = true; } diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index b3eaa1319a..6910180997 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -61,6 +61,8 @@ STATISTIC(NumPHIInsert, "Number of PHI nodes inserted"); namespace { struct AllocaInfo : private InstVisitor<AllocaInfo, bool> { + const DataLayout *DL; + SmallVector<BasicBlock *, 32> DefiningBlocks; SmallVector<BasicBlock *, 32> UsingBlocks; SmallVector<Instruction *, 8> DeadInsts; @@ -73,6 +75,8 @@ struct AllocaInfo : private InstVisitor<AllocaInfo, bool> { Value *AllocaPointerVal; DbgDeclareInst *DbgDeclare; + AllocaInfo(const DataLayout *DL) : DL(DL) {} + void clear() { DefiningBlocks.clear(); UsingBlocks.clear(); @@ -274,6 +278,7 @@ struct PromoteMem2Reg { std::vector<AllocaInst *> Allocas; DominatorTree &DT; DIBuilder DIB; + const DataLayout *DL; /// An AliasSetTracker object to update. If null, don't update it. AliasSetTracker *AST; @@ -319,9 +324,9 @@ struct PromoteMem2Reg { public: PromoteMem2Reg(ArrayRef<AllocaInst *> Allocas, DominatorTree &DT, - AliasSetTracker *AST) + const DataLayout *DL, AliasSetTracker *AST) : Allocas(Allocas.begin(), Allocas.end()), DT(DT), - DIB(*DT.getRoot()->getParent()->getParent()), AST(AST) {} + DIB(*DT.getRoot()->getParent()->getParent()), DL(DL), AST(AST) {} void run(); @@ -585,7 +590,7 @@ void PromoteMem2Reg::run() { PointerAllocaValues.resize(Allocas.size()); AllocaDbgDeclares.resize(Allocas.size()); - AllocaInfo Info; + AllocaInfo Info(DL); LargeBlockInfo LBI; for (unsigned AllocaNum = 0; AllocaNum != Allocas.size(); ++AllocaNum) { @@ -1140,19 +1145,19 @@ NextIteration: goto NextIteration; } -bool llvm::isAllocaPromotable(const AllocaInst *AI) { +bool llvm::isAllocaPromotable(const AllocaInst *AI, const DataLayout *DL) { // We cast away constness because we re-use the non-const analysis that the // actual promotion routine uses. While it is non-const, it doesn't actually // mutate anything at this phase, and we discard the non-const results that // promotion uses to mutate the alloca. - return AllocaInfo().analyzeAlloca(*const_cast<AllocaInst *>(AI)); + return AllocaInfo(DL).analyzeAlloca(*const_cast<AllocaInst *>(AI)); } -void llvm::PromoteMemToReg(ArrayRef<AllocaInst *> Allocas, - DominatorTree &DT, AliasSetTracker *AST) { +void llvm::PromoteMemToReg(ArrayRef<AllocaInst *> Allocas, DominatorTree &DT, + const DataLayout *DL, AliasSetTracker *AST) { // If there is nothing to do, bail out... if (Allocas.empty()) return; - PromoteMem2Reg(Allocas, DT, AST).run(); + PromoteMem2Reg(Allocas, DT, DL, AST).run(); } |