#include "llvm/Assembly/Writer.h"
#include "llvm/Support/InstIterator.h"
+// FIXME: This should keep sizes associated with pointers!
+
/// mergeSetIn - Merge the specified alias set into this alias set...
///
void AliasSet::mergeSetIn(AliasSet &AS) {
if (isMustAlias()) // Check to see if we have to downgrade to _may_ alias
if (Value *V = getSomePointer())
- if (AA.alias(V, Entry.first) == AliasAnalysis::MayAlias)
+ if (AA.alias(V, ~0, Entry.first, ~0) == AliasAnalysis::MayAlias)
AliasTy = MayAlias;
Entry.second.setAliasSet(this);
// SOME value in the set...
Value *SomePtr = getSomePointer();
assert(SomePtr && "Empty must-alias set??");
- return AA.alias(SomePtr, Ptr);
+ return AA.alias(SomePtr, ~0, Ptr, ~0);
}
// If this is a may-alias set, we have to check all of the pointers in the set
// to be sure it doesn't alias the set...
for (iterator I = begin(), E = end(); I != E; ++I)
- if (AA.alias(Ptr, *I))
+ if (AA.alias(Ptr, ~0, *I, ~0))
return true;
// Check the call sites list and invoke list...
AliasSet *AliasSetTracker::findAliasSetForPointer(const Value *Ptr) {
AliasSet *FoundSet = 0;
for (iterator I = begin(), E = end(); I != E; ++I)
- if (I->aliasesPointer(Ptr, AA)) {
+ if (!I->Forward && I->aliasesPointer(Ptr, AA)) {
if (FoundSet == 0) { // If this is the first alias set ptr can go into...
FoundSet = I; // Remember it.
} else { // Otherwise, we must merge the sets...
AliasSet *AliasSetTracker::findAliasSetForCallSite(CallSite CS) {
AliasSet *FoundSet = 0;
for (iterator I = begin(), E = end(); I != E; ++I)
- if (I->aliasesCallSite(CS, AA)) {
+ if (!I->Forward && I->aliasesCallSite(CS, AA)) {
if (FoundSet == 0) { // If this is the first alias set ptr can go into...
FoundSet = I; // Remember it.
- } else { // Otherwise, we must merge the sets...
+ } else if (!I->Forward) { // Otherwise, we must merge the sets...
FoundSet->mergeSetIn(*I); // Merge in contents...
}
}
LoopBodyInfo::PointerClass LoopBodyInfo::calculatePointerInfo(Value *V,
AliasAnalysis &AA) const {
for (unsigned i = 0, e = Calls.size(); i != e; ++i)
- if (AA.canCallModify(*Calls[i], V))
+ if (AA.getModRefInfo(Calls[i], V, ~0))
return PointerMayStore;
for (unsigned i = 0, e = Invokes.size(); i != e; ++i)
- if (AA.canInvokeModify(*Invokes[i], V))
+ if (AA.getModRefInfo(Invokes[i], V, ~0))
return PointerMayStore;
PointerClass Result = PointerNoStore;
for (std::set<Value*>::const_iterator I = StoredPointers.begin(),
E = StoredPointers.end(); I != E; ++I)
- if (AA.alias(V, *I))
+ if (AA.alias(V, ~0, *I, ~0))
if (V == *I)
Result = PointerMustStore; // If this is the only alias, return must
else
bool PointerOk = true;
for (std::set<Value*>::const_iterator I =CurLBI->LoadedPointers.begin(),
E = CurLBI->LoadedPointers.end(); I != E; ++I)
- if (AA->alias(V, *I) == AliasAnalysis::MayAlias) {
+ if (AA->alias(V, ~0, *I, ~0) == AliasAnalysis::MayAlias) {
PointerOk = false;
break;
}
for (std::set<Value*>::const_iterator
I = CurLBI->LoadedPointers.begin(),
E = CurLBI->LoadedPointers.end(); I != E; ++I)
- if (AA->alias(V, *I) == AliasAnalysis::MustAlias)
+ if (AA->alias(V, ~0, *I, ~0) == AliasAnalysis::MustAlias)
ValueToAllocaMap[*I] = AI;
for (std::set<Value*>::const_iterator
I = CurLBI->StoredPointers.begin(),
E = CurLBI->StoredPointers.end(); I != E; ++I)
- if (AA->alias(V, *I) == AliasAnalysis::MustAlias)
+ if (AA->alias(V, ~0, *I, ~0) == AliasAnalysis::MustAlias)
ValueToAllocaMap[*I] = AI;
}
}