averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update for upstream LLVM changes

Browse Source 
* removal of StringMap's GetOrCreateValue
* SmallSet::insert now returns a pair like std::set

Swift SVN r23435
This commit is contained in:
Ben Langmuir
2014-11-19 16:49:30 +00:00
parent 34fbb4f846
commit e9e1666ab0
40 changed files with 79 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AST/Module.cpp
View File

@@ -722,7 +722,7 @@ findExplicitConformance(NominalTypeDecl *nominal, ProtocolDecl *protocol,
return true;
}
if (visitedProtocols.insert(testProto)) {
if (visitedProtocols.insert(testProto).second) {
NominalOrConformance next = {};
if (i < nominalConformances.size())
next = nominalConformances[i];
@@ -780,7 +780,7 @@ findExplicitConformance(NominalTypeDecl *nominal, ProtocolDecl *protocol,
break;
}
if (visitedProtocols.insert(inherited.first))
if (visitedProtocols.insert(inherited.first).second)
stack.push_back({inherited.second, currentOwner});
}
}
@@ -1316,7 +1316,7 @@ static bool forAllImportedModules(Module *topLevel,
continue;
}
if (!visited.insert(next))
if (!visited.insert(next).second)
continue;
if (!fn(next))