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

Eliminate non-deterministic behavior when removing duplicate declarations after module lookup.

Browse Source 
Big thanks to JoeP for pointing this out! No specific test case here.

Swift SVN r19177
This commit is contained in:
Doug Gregor
2014-06-25 20:57:13 +00:00
parent 09bd502f68
commit e4331e4ba9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AST/ModuleNameLookup.cpp
View File

@@ -234,9 +234,13 @@ static void lookupInModule(Module *module, Module::AccessPathTy accessPath,
}
}
std::sort(decls.begin() + initialCount, decls.end());
auto afterUnique = std::unique(decls.begin() + initialCount, decls.end());
decls.erase(afterUnique, decls.end());
// Remove duplicated declarations.
llvm::SmallPtrSet<ValueDecl *, 4> knownDecls;
decls.erase(std::remove_if(decls.begin() + initialCount, decls.end(),
[&](ValueDecl *d) -> bool {
return !knownDecls.insert(d);
}),
decls.end());
auto &cachedValues = cache[{accessPath, module}];
cachedValues.insert(cachedValues.end(),