mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-14 11:32:34 +00:00
Pull LLVMContext out of PromoteMemToReg.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89645 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
2e0316fcf0
commit
ce2c51b670
@ -23,7 +23,6 @@ class AllocaInst;
|
||||
class DominatorTree;
|
||||
class DominanceFrontier;
|
||||
class AliasSetTracker;
|
||||
class LLVMContext;
|
||||
|
||||
/// isAllocaPromotable - Return true if this alloca is legal for promotion.
|
||||
/// This is true if there are only loads and stores to the alloca...
|
||||
@ -40,7 +39,6 @@ bool isAllocaPromotable(const AllocaInst *AI);
|
||||
///
|
||||
void PromoteMemToReg(const std::vector<AllocaInst*> &Allocas,
|
||||
DominatorTree &DT, DominanceFrontier &DF,
|
||||
LLVMContext &Context,
|
||||
AliasSetTracker *AST = 0);
|
||||
|
||||
} // End llvm namespace
|
||||
|
@ -332,7 +332,7 @@ bool DwarfEHPrepare::PromoteStackTemporaries() {
|
||||
if (ExceptionValueVar && DT && DF && isAllocaPromotable(ExceptionValueVar)) {
|
||||
// Turn the exception temporary into registers and phi nodes if possible.
|
||||
std::vector<AllocaInst*> Allocas(1, ExceptionValueVar);
|
||||
PromoteMemToReg(Allocas, *DT, *DF, ExceptionValueVar->getContext());
|
||||
PromoteMemToReg(Allocas, *DT, *DF);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -593,7 +593,7 @@ void LICM::sink(Instruction &I) {
|
||||
if (AI) {
|
||||
std::vector<AllocaInst*> Allocas;
|
||||
Allocas.push_back(AI);
|
||||
PromoteMemToReg(Allocas, *DT, *DF, AI->getContext(), CurAST);
|
||||
PromoteMemToReg(Allocas, *DT, *DF, CurAST);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -769,7 +769,7 @@ void LICM::PromoteValuesInLoop() {
|
||||
PromotedAllocas.reserve(PromotedValues.size());
|
||||
for (unsigned i = 0, e = PromotedValues.size(); i != e; ++i)
|
||||
PromotedAllocas.push_back(PromotedValues[i].first);
|
||||
PromoteMemToReg(PromotedAllocas, *DT, *DF, Preheader->getContext(), CurAST);
|
||||
PromoteMemToReg(PromotedAllocas, *DT, *DF, CurAST);
|
||||
}
|
||||
|
||||
/// FindPromotableValuesInLoop - Check the current loop for stores to definite
|
||||
|
@ -192,7 +192,7 @@ bool SROA::performPromotion(Function &F) {
|
||||
|
||||
if (Allocas.empty()) break;
|
||||
|
||||
PromoteMemToReg(Allocas, DT, DF, F.getContext());
|
||||
PromoteMemToReg(Allocas, DT, DF);
|
||||
NumPromoted += Allocas.size();
|
||||
Changed = true;
|
||||
}
|
||||
|
@ -73,7 +73,7 @@ bool PromotePass::runOnFunction(Function &F) {
|
||||
|
||||
if (Allocas.empty()) break;
|
||||
|
||||
PromoteMemToReg(Allocas, DT, DF, F.getContext());
|
||||
PromoteMemToReg(Allocas, DT, DF);
|
||||
NumPromoted += Allocas.size();
|
||||
Changed = true;
|
||||
}
|
||||
|
@ -23,7 +23,6 @@
|
||||
#include "llvm/Function.h"
|
||||
#include "llvm/Instructions.h"
|
||||
#include "llvm/IntrinsicInst.h"
|
||||
#include "llvm/LLVMContext.h"
|
||||
#include "llvm/Analysis/Dominators.h"
|
||||
#include "llvm/Analysis/AliasSetTracker.h"
|
||||
#include "llvm/ADT/DenseMap.h"
|
||||
@ -180,8 +179,6 @@ namespace {
|
||||
///
|
||||
AliasSetTracker *AST;
|
||||
|
||||
LLVMContext &Context;
|
||||
|
||||
/// AllocaLookup - Reverse mapping of Allocas.
|
||||
///
|
||||
std::map<AllocaInst*, unsigned> AllocaLookup;
|
||||
@ -212,9 +209,8 @@ namespace {
|
||||
DenseMap<const BasicBlock*, unsigned> BBNumPreds;
|
||||
public:
|
||||
PromoteMem2Reg(const std::vector<AllocaInst*> &A, DominatorTree &dt,
|
||||
DominanceFrontier &df, AliasSetTracker *ast,
|
||||
LLVMContext &C)
|
||||
: Allocas(A), DT(dt), DF(df), AST(ast), Context(C) {}
|
||||
DominanceFrontier &df, AliasSetTracker *ast)
|
||||
: Allocas(A), DT(dt), DF(df), AST(ast) {}
|
||||
|
||||
void run();
|
||||
|
||||
@ -1003,9 +999,9 @@ NextIteration:
|
||||
///
|
||||
void llvm::PromoteMemToReg(const std::vector<AllocaInst*> &Allocas,
|
||||
DominatorTree &DT, DominanceFrontier &DF,
|
||||
LLVMContext &Context, AliasSetTracker *AST) {
|
||||
AliasSetTracker *AST) {
|
||||
// If there is nothing to do, bail out...
|
||||
if (Allocas.empty()) return;
|
||||
|
||||
PromoteMem2Reg(Allocas, DT, DF, AST, Context).run();
|
||||
PromoteMem2Reg(Allocas, DT, DF, AST).run();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user