@@ -54,11 +54,10 @@ void AliasSet::mergeSetIn(AliasSet &AS, AliasSetTracker &AST,
54
54
if (Alias == SetMustAlias) {
55
55
// Check that these two merged sets really are must aliases. If we cannot
56
56
// find a must-alias pair between them, this set becomes a may alias.
57
- if (!llvm::any_of (MemoryLocs, [&](const MemoryLocation &MemLoc) {
58
- return llvm::any_of (AS.MemoryLocs ,
59
- [&](const MemoryLocation &ASMemLoc) {
60
- return BatchAA.isMustAlias (MemLoc, ASMemLoc);
61
- });
57
+ if (!any_of (MemoryLocs, [&](const MemoryLocation &MemLoc) {
58
+ return any_of (AS.MemoryLocs , [&](const MemoryLocation &ASMemLoc) {
59
+ return BatchAA.isMustAlias (MemLoc, ASMemLoc);
60
+ });
62
61
}))
63
62
Alias = SetMayAlias;
64
63
}
@@ -67,7 +66,7 @@ void AliasSet::mergeSetIn(AliasSet &AS, AliasSetTracker &AST,
67
66
if (MemoryLocs.empty ()) {
68
67
std::swap (MemoryLocs, AS.MemoryLocs );
69
68
} else {
70
- llvm:: append_range (MemoryLocs, AS.MemoryLocs );
69
+ append_range (MemoryLocs, AS.MemoryLocs );
71
70
AS.MemoryLocs .clear ();
72
71
}
73
72
@@ -115,7 +114,7 @@ void AliasSet::addPointer(AliasSetTracker &AST, const MemoryLocation &MemLoc,
115
114
if (isMustAlias () && !KnownMustAlias) {
116
115
// If we cannot find a must-alias with any of the existing MemoryLocs, we
117
116
// must downgrade to may-alias.
118
- if (!llvm:: any_of (MemoryLocs, [&](const MemoryLocation &ASMemLoc) {
117
+ if (!any_of (MemoryLocs, [&](const MemoryLocation &ASMemLoc) {
119
118
return AST.getAliasAnalysis ().isMustAlias (MemLoc, ASMemLoc);
120
119
}))
121
120
Alias = SetMayAlias;
@@ -268,7 +267,7 @@ AliasSet &AliasSetTracker::getAliasSetFor(const MemoryLocation &MemLoc) {
268
267
AliasSet *&MapEntry = PointerMap[MemLoc.Ptr ];
269
268
if (MapEntry) {
270
269
AliasSet *AS = MapEntry->getForwardedTarget (*this );
271
- if (llvm:: is_contained (AS->MemoryLocs , MemLoc)) {
270
+ if (is_contained (AS->MemoryLocs , MemLoc)) {
272
271
if (AS != MapEntry) {
273
272
AS->addRef ();
274
273
MapEntry->dropRef (*this );
0 commit comments