6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-28 03:25:23 +00:00
Code Issues Projects Releases Wiki Activity

Thread DataLayout through the callers and into mem2reg. This will be

Browse Source 
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
This commit is contained in:
Chandler Carruth
2013-07-28 06:43:11 +00:00
parent f5b9110ce1
commit 6c3a95dab5
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Transforms/Utils/PromoteMemoryToRegister.cpp
View File

@@ -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();
}