mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-31 09:32:11 +00:00
clean this up
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112400 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
1f7bf0e1f5
commit
6e1f51099d
@ -155,8 +155,7 @@ bool AliasSet::aliasesPointer(const Value *Ptr, unsigned Size,
|
||||
// Check the call sites list and invoke list...
|
||||
if (!CallSites.empty()) {
|
||||
for (unsigned i = 0, e = CallSites.size(); i != e; ++i)
|
||||
if (AA.getModRefInfo(CallSites[i], Ptr, Size)
|
||||
!= AliasAnalysis::NoModRef)
|
||||
if (AA.getModRefInfo(CallSites[i], Ptr, Size) != AliasAnalysis::NoModRef)
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -200,14 +199,15 @@ void AliasSetTracker::clear() {
|
||||
AliasSet *AliasSetTracker::findAliasSetForPointer(const Value *Ptr,
|
||||
unsigned Size) {
|
||||
AliasSet *FoundSet = 0;
|
||||
for (iterator I = begin(), E = end(); I != E; ++I)
|
||||
if (!I->Forward && I->aliasesPointer(Ptr, Size, 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.
|
||||
FoundSet->mergeSetIn(*I, *this); // Merge in contents.
|
||||
}
|
||||
for (iterator I = begin(), E = end(); I != E; ++I) {
|
||||
if (I->Forward || !I->aliasesPointer(Ptr, Size, AA)) continue;
|
||||
|
||||
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.
|
||||
FoundSet->mergeSetIn(*I, *this); // Merge in contents.
|
||||
}
|
||||
}
|
||||
|
||||
return FoundSet;
|
||||
}
|
||||
@ -226,15 +226,16 @@ bool AliasSetTracker::containsPointer(Value *Ptr, unsigned Size) const {
|
||||
|
||||
AliasSet *AliasSetTracker::findAliasSetForCallSite(CallSite CS) {
|
||||
AliasSet *FoundSet = 0;
|
||||
for (iterator I = begin(), E = end(); I != E; ++I)
|
||||
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 if (!I->Forward) { // Otherwise, we must merge the sets.
|
||||
FoundSet->mergeSetIn(*I, *this); // Merge in contents.
|
||||
}
|
||||
for (iterator I = begin(), E = end(); I != E; ++I) {
|
||||
if (I->Forward || !I->aliasesCallSite(CS, AA))
|
||||
continue;
|
||||
|
||||
if (FoundSet == 0) { // If this is the first alias set ptr can go into.
|
||||
FoundSet = I; // Remember it.
|
||||
} else if (!I->Forward) { // Otherwise, we must merge the sets.
|
||||
FoundSet->mergeSetIn(*I, *this); // Merge in contents.
|
||||
}
|
||||
|
||||
}
|
||||
return FoundSet;
|
||||
}
|
||||
|
||||
@ -252,17 +253,19 @@ AliasSet &AliasSetTracker::getAliasSetForPointer(Value *Pointer, unsigned Size,
|
||||
Entry.updateSize(Size);
|
||||
// Return the set!
|
||||
return *Entry.getAliasSet(*this)->getForwardedTarget(*this);
|
||||
} else if (AliasSet *AS = findAliasSetForPointer(Pointer, Size)) {
|
||||
}
|
||||
|
||||
if (AliasSet *AS = findAliasSetForPointer(Pointer, Size)) {
|
||||
// Add it to the alias set it aliases...
|
||||
AS->addPointer(*this, Entry, Size);
|
||||
return *AS;
|
||||
} else {
|
||||
if (New) *New = true;
|
||||
// Otherwise create a new alias set to hold the loaded pointer...
|
||||
AliasSets.push_back(new AliasSet());
|
||||
AliasSets.back().addPointer(*this, Entry, Size);
|
||||
return AliasSets.back();
|
||||
}
|
||||
|
||||
if (New) *New = true;
|
||||
// Otherwise create a new alias set to hold the loaded pointer...
|
||||
AliasSets.push_back(new AliasSet());
|
||||
AliasSets.back().addPointer(*this, Entry, Size);
|
||||
return AliasSets.back();
|
||||
}
|
||||
|
||||
bool AliasSetTracker::add(Value *Ptr, unsigned Size) {
|
||||
@ -305,28 +308,27 @@ bool AliasSetTracker::add(CallSite CS) {
|
||||
return true; // doesn't alias anything
|
||||
|
||||
AliasSet *AS = findAliasSetForCallSite(CS);
|
||||
if (!AS) {
|
||||
AliasSets.push_back(new AliasSet());
|
||||
AS = &AliasSets.back();
|
||||
AS->addCallSite(CS, AA);
|
||||
return true;
|
||||
} else {
|
||||
if (AS) {
|
||||
AS->addCallSite(CS, AA);
|
||||
return false;
|
||||
}
|
||||
AliasSets.push_back(new AliasSet());
|
||||
AS = &AliasSets.back();
|
||||
AS->addCallSite(CS, AA);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool AliasSetTracker::add(Instruction *I) {
|
||||
// Dispatch to one of the other add methods...
|
||||
// Dispatch to one of the other add methods.
|
||||
if (LoadInst *LI = dyn_cast<LoadInst>(I))
|
||||
return add(LI);
|
||||
else if (StoreInst *SI = dyn_cast<StoreInst>(I))
|
||||
if (StoreInst *SI = dyn_cast<StoreInst>(I))
|
||||
return add(SI);
|
||||
else if (CallInst *CI = dyn_cast<CallInst>(I))
|
||||
if (CallInst *CI = dyn_cast<CallInst>(I))
|
||||
return add(CI);
|
||||
else if (InvokeInst *II = dyn_cast<InvokeInst>(I))
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(I))
|
||||
return add(II);
|
||||
else if (VAArgInst *VAAI = dyn_cast<VAArgInst>(I))
|
||||
if (VAArgInst *VAAI = dyn_cast<VAArgInst>(I))
|
||||
return add(VAAI);
|
||||
return true;
|
||||
}
|
||||
@ -343,23 +345,23 @@ void AliasSetTracker::add(const AliasSetTracker &AST) {
|
||||
// Loop over all of the alias sets in AST, adding the pointers contained
|
||||
// therein into the current alias sets. This can cause alias sets to be
|
||||
// merged together in the current AST.
|
||||
for (const_iterator I = AST.begin(), E = AST.end(); I != E; ++I)
|
||||
if (!I->Forward) { // Ignore forwarding alias sets
|
||||
AliasSet &AS = const_cast<AliasSet&>(*I);
|
||||
for (const_iterator I = AST.begin(), E = AST.end(); I != E; ++I) {
|
||||
if (I->Forward) continue; // Ignore forwarding alias sets
|
||||
|
||||
AliasSet &AS = const_cast<AliasSet&>(*I);
|
||||
|
||||
// If there are any call sites in the alias set, add them to this AST.
|
||||
for (unsigned i = 0, e = AS.CallSites.size(); i != e; ++i)
|
||||
add(AS.CallSites[i]);
|
||||
// If there are any call sites in the alias set, add them to this AST.
|
||||
for (unsigned i = 0, e = AS.CallSites.size(); i != e; ++i)
|
||||
add(AS.CallSites[i]);
|
||||
|
||||
// Loop over all of the pointers in this alias set...
|
||||
AliasSet::iterator I = AS.begin(), E = AS.end();
|
||||
bool X;
|
||||
for (; I != E; ++I) {
|
||||
AliasSet &NewAS = addPointer(I.getPointer(), I.getSize(),
|
||||
(AliasSet::AccessType)AS.AccessTy, X);
|
||||
if (AS.isVolatile()) NewAS.setVolatile();
|
||||
}
|
||||
// Loop over all of the pointers in this alias set.
|
||||
bool X;
|
||||
for (AliasSet::iterator ASI = AS.begin(), E = AS.end(); ASI != E; ++ASI) {
|
||||
AliasSet &NewAS = addPointer(ASI.getPointer(), ASI.getSize(),
|
||||
(AliasSet::AccessType)AS.AccessTy, X);
|
||||
if (AS.isVolatile()) NewAS.setVolatile();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// remove - Remove the specified (potentially non-empty) alias set from the
|
||||
|
Loading…
Reference in New Issue
Block a user