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

reduce nesting, no functionality change. 

llvm-svn: 90001
This commit is contained in:
Chris Lattner 2009-11-27 08:37:22 +00:00
parent 8e62d0a93d
commit ac323297e0
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,62 +994,63 @@ getNonLocalPointerDepFromBB(Value *Pointer, uint64_t PointeeSize,
// If this is a computation derived from a PHI node, use the suitably // If this is a computation derived from a PHI node, use the suitably
// translated incoming values for each pred as the phi translated version. // translated incoming values for each pred as the phi translated version.
if (isPHITranslatable(PtrInst)) { if (!isPHITranslatable(PtrInst))
Cache = 0; goto PredTranslationFailure;
Cache = 0;
for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI) { for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI) {
BasicBlock *Pred = *PI; BasicBlock *Pred = *PI;
Value *PredPtr = PHITranslatePointer(PtrInst, BB, Pred, TD); Value *PredPtr = PHITranslatePointer(PtrInst, BB, Pred, TD);
// If PHI translation fails, bail out. // If PHI translation fails, bail out.
if (PredPtr == 0) if (PredPtr == 0)
goto PredTranslationFailure; goto PredTranslationFailure;
// Check to see if we have already visited this pred block with another // Check to see if we have already visited this pred block with another
// pointer. If so, we can't do this lookup. This failure can occur // pointer. If so, we can't do this lookup. This failure can occur
// with PHI translation when a critical edge exists and the PHI node in // with PHI translation when a critical edge exists and the PHI node in
// the successor translates to a pointer value different than the // the successor translates to a pointer value different than the
// pointer the block was first analyzed with. // pointer the block was first analyzed with.
std::pair<DenseMap<BasicBlock*,Value*>::iterator, bool> std::pair<DenseMap<BasicBlock*,Value*>::iterator, bool>
InsertRes = Visited.insert(std::make_pair(Pred, PredPtr)); InsertRes = Visited.insert(std::make_pair(Pred, PredPtr));
if (!InsertRes.second) { if (!InsertRes.second) {
// If the predecessor was visited with PredPtr, then we already did // If the predecessor was visited with PredPtr, then we already did
// the analysis and can ignore it. // the analysis and can ignore it.
if (InsertRes.first->second == PredPtr) if (InsertRes.first->second == PredPtr)
continue; continue;
// Otherwise, the block was previously analyzed with a different
// pointer. We can't represent the result of this case, so we just
// treat this as a phi translation failure.
goto PredTranslationFailure;
}
// FIXME: it is entirely possible that PHI translating will end up with
// the same value. Consider PHI translating something like:
// X = phi [x, bb1], [y, bb2]. PHI translating for bb1 doesn't *need*
// to recurse here, pedantically speaking.
// If we have a problem phi translating, fall through to the code below // Otherwise, the block was previously analyzed with a different
// to handle the failure condition. // pointer. We can't represent the result of this case, so we just
if (getNonLocalPointerDepFromBB(PredPtr, PointeeSize, isLoad, Pred, // treat this as a phi translation failure.
Result, Visited)) goto PredTranslationFailure;
goto PredTranslationFailure;
} }
// FIXME: it is entirely possible that PHI translating will end up with
// the same value. Consider PHI translating something like:
// X = phi [x, bb1], [y, bb2]. PHI translating for bb1 doesn't *need*
// to recurse here, pedantically speaking.
// Refresh the CacheInfo/Cache pointer so that it isn't invalidated. // If we have a problem phi translating, fall through to the code below
CacheInfo = &NonLocalPointerDeps[CacheKey]; // to handle the failure condition.
Cache = &CacheInfo->second; if (getNonLocalPointerDepFromBB(PredPtr, PointeeSize, isLoad, Pred,
NumSortedEntries = Cache->size(); Result, Visited))
goto PredTranslationFailure;
// Since we did phi translation, the "Cache" set won't contain all of the
// results for the query. This is ok (we can still use it to accelerate
// specific block queries) but we can't do the fastpath "return all
// results from the set" Clear out the indicator for this.
CacheInfo->first = BBSkipFirstBlockPair();
SkipFirstBlock = false;
continue;
} }
// Refresh the CacheInfo/Cache pointer so that it isn't invalidated.
CacheInfo = &NonLocalPointerDeps[CacheKey];
Cache = &CacheInfo->second;
NumSortedEntries = Cache->size();
// Since we did phi translation, the "Cache" set won't contain all of the
// results for the query. This is ok (we can still use it to accelerate
// specific block queries) but we can't do the fastpath "return all
// results from the set" Clear out the indicator for this.
CacheInfo->first = BBSkipFirstBlockPair();
SkipFirstBlock = false;
continue;
PredTranslationFailure: PredTranslationFailure: