maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a bug that was causing several miscompilations on SPEC. 

llvm-svn: 40746
This commit is contained in:
Owen Anderson 2007-08-02 17:56:05 +00:00
parent 531f260ac0
commit 0ac1fc8ac1
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
View File

@ -111,19 +111,31 @@ void MemoryDependenceAnalysis::nonLocalHelper(Instruction* query,
while (!stack.empty()) { while (!stack.empty()) {
BasicBlock* BB = stack.back(); BasicBlock* BB = stack.back();
visited.insert(BB); if (visited.count(BB)) {
if (resp.count(BB)) {
stack.pop_back(); stack.pop_back();
continue; continue;
} }
if (BB != block) { if (BB != block) {
visited.insert(BB);
Instruction* localDep = getDependency(query, 0, BB); Instruction* localDep = getDependency(query, 0, BB);
if (localDep != NonLocal) { if (localDep != NonLocal) {
resp.insert(std::make_pair(BB, localDep)); resp.insert(std::make_pair(BB, localDep));
stack.pop_back();
continue; continue;
} }
} else if (BB == block && stack.size() > 1) {
visited.insert(BB);
Instruction* localDep = getDependency(query, 0, BB);
if (localDep != query)
resp.insert(std::make_pair(BB, localDep));
stack.pop_back();
continue;
} }
bool predOnStack = false; bool predOnStack = false;

10
llvm/lib/Transforms/Scalar/GVN.cpp
View File

@ -658,7 +658,8 @@ namespace {
SmallVector<Instruction*, 4>& toErase); SmallVector<Instruction*, 4>& toErase);
bool processNonLocalLoad(LoadInst* L, SmallVector<Instruction*, 4>& toErase); bool processNonLocalLoad(LoadInst* L, SmallVector<Instruction*, 4>& toErase);
Value *GetValueForBlock(BasicBlock *BB, LoadInst* orig, Value *GetValueForBlock(BasicBlock *BB, LoadInst* orig,
DenseMap<BasicBlock*, Value*> &Phis); DenseMap<BasicBlock*, Value*> &Phis,
bool top_level = false);
void dump(DenseMap<BasicBlock*, Value*>& d); void dump(DenseMap<BasicBlock*, Value*>& d);
}; };
@ -715,11 +716,12 @@ void GVN::dump(DenseMap<BasicBlock*, Value*>& d) {
/// GetValueForBlock - Get the value to use within the specified basic block. /// GetValueForBlock - Get the value to use within the specified basic block.
/// available values are in Phis. /// available values are in Phis.
Value *GVN::GetValueForBlock(BasicBlock *BB, LoadInst* orig, Value *GVN::GetValueForBlock(BasicBlock *BB, LoadInst* orig,
DenseMap<BasicBlock*, Value*> &Phis) { DenseMap<BasicBlock*, Value*> &Phis,
bool top_level) {
// If we have already computed this value, return the previously computed val. // If we have already computed this value, return the previously computed val.
Value *&V = Phis[BB]; Value *&V = Phis[BB];
if (V) return V; if (V && ! top_level) return V;
BasicBlock* singlePred = BB->getSinglePredecessor(); BasicBlock* singlePred = BB->getSinglePredecessor();
if (singlePred) if (singlePred)
@ -799,7 +801,7 @@ bool GVN::processNonLocalLoad(LoadInst* L, SmallVector<Instruction*, 4>& toErase
} }
SmallPtrSet<BasicBlock*, 4> visited; SmallPtrSet<BasicBlock*, 4> visited;
Value* v = GetValueForBlock(L->getParent(), L, repl); Value* v = GetValueForBlock(L->getParent(), L, repl, true);
MD.removeInstruction(L); MD.removeInstruction(L);
L->replaceAllUsesWith(v); L->replaceAllUsesWith(v);