make more two predicates constant

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100549 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gabor Greif 2010-04-06 19:24:18 +00:00
parent a01d6db569
commit 6ce02b5939

View File

@ -610,34 +610,34 @@ static GlobalVariable *SRAGlobal(GlobalVariable *GV, const TargetData &TD) {
/// AllUsesOfValueWillTrapIfNull - Return true if all users of the specified /// AllUsesOfValueWillTrapIfNull - Return true if all users of the specified
/// value will trap if the value is dynamically null. PHIs keeps track of any /// value will trap if the value is dynamically null. PHIs keeps track of any
/// phi nodes we've seen to avoid reprocessing them. /// phi nodes we've seen to avoid reprocessing them.
static bool AllUsesOfValueWillTrapIfNull(Value *V, static bool AllUsesOfValueWillTrapIfNull(const Value *V,
SmallPtrSet<PHINode*, 8> &PHIs) { SmallPtrSet<const PHINode*, 8> &PHIs) {
for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E; for (Value::const_use_iterator UI = V->use_begin(), E = V->use_end(); UI != E;
++UI) { ++UI) {
User *U = *UI; const User *U = *UI;
if (isa<LoadInst>(U)) { if (isa<LoadInst>(U)) {
// Will trap. // Will trap.
} else if (StoreInst *SI = dyn_cast<StoreInst>(U)) { } else if (const StoreInst *SI = dyn_cast<StoreInst>(U)) {
if (SI->getOperand(0) == V) { if (SI->getOperand(0) == V) {
//cerr << "NONTRAPPING USE: " << *U; //cerr << "NONTRAPPING USE: " << *U;
return false; // Storing the value. return false; // Storing the value.
} }
} else if (CallInst *CI = dyn_cast<CallInst>(U)) { } else if (const CallInst *CI = dyn_cast<CallInst>(U)) {
if (CI->getCalledValue() != V) { if (CI->getCalledValue() != V) {
//cerr << "NONTRAPPING USE: " << *U; //cerr << "NONTRAPPING USE: " << *U;
return false; // Not calling the ptr return false; // Not calling the ptr
} }
} else if (InvokeInst *II = dyn_cast<InvokeInst>(U)) { } else if (const InvokeInst *II = dyn_cast<InvokeInst>(U)) {
if (II->getCalledValue() != V) { if (II->getCalledValue() != V) {
//cerr << "NONTRAPPING USE: " << *U; //cerr << "NONTRAPPING USE: " << *U;
return false; // Not calling the ptr return false; // Not calling the ptr
} }
} else if (BitCastInst *CI = dyn_cast<BitCastInst>(U)) { } else if (const BitCastInst *CI = dyn_cast<BitCastInst>(U)) {
if (!AllUsesOfValueWillTrapIfNull(CI, PHIs)) return false; if (!AllUsesOfValueWillTrapIfNull(CI, PHIs)) return false;
} else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(U)) { } else if (const GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(U)) {
if (!AllUsesOfValueWillTrapIfNull(GEPI, PHIs)) return false; if (!AllUsesOfValueWillTrapIfNull(GEPI, PHIs)) return false;
} else if (PHINode *PN = dyn_cast<PHINode>(U)) { } else if (const PHINode *PN = dyn_cast<PHINode>(U)) {
// If we've already seen this phi node, ignore it, it has already been // If we've already seen this phi node, ignore it, it has already been
// checked. // checked.
if (PHIs.insert(PN) && !AllUsesOfValueWillTrapIfNull(PN, PHIs)) if (PHIs.insert(PN) && !AllUsesOfValueWillTrapIfNull(PN, PHIs))
@ -656,13 +656,13 @@ static bool AllUsesOfValueWillTrapIfNull(Value *V,
/// AllUsesOfLoadedValueWillTrapIfNull - Return true if all uses of any loads /// AllUsesOfLoadedValueWillTrapIfNull - Return true if all uses of any loads
/// from GV will trap if the loaded value is null. Note that this also permits /// from GV will trap if the loaded value is null. Note that this also permits
/// comparisons of the loaded value against null, as a special case. /// comparisons of the loaded value against null, as a special case.
static bool AllUsesOfLoadedValueWillTrapIfNull(GlobalVariable *GV) { static bool AllUsesOfLoadedValueWillTrapIfNull(const GlobalVariable *GV) {
for (Value::use_iterator UI = GV->use_begin(), E = GV->use_end(); for (Value::const_use_iterator UI = GV->use_begin(), E = GV->use_end();
UI != E; ++UI) { UI != E; ++UI) {
User *U = *UI; const User *U = *UI;
if (LoadInst *LI = dyn_cast<LoadInst>(U)) { if (const LoadInst *LI = dyn_cast<LoadInst>(U)) {
SmallPtrSet<PHINode*, 8> PHIs; SmallPtrSet<const PHINode*, 8> PHIs;
if (!AllUsesOfValueWillTrapIfNull(LI, PHIs)) if (!AllUsesOfValueWillTrapIfNull(LI, PHIs))
return false; return false;
} else if (isa<StoreInst>(U)) { } else if (isa<StoreInst>(U)) {