Make findModulesDefiningSymbols modify its symbols argument so we can \

eliminate symbols defined by the archive efficiently

llvm-svn: 17976
This commit is contained in:
Reid Spencer
2004-11-19 03:18:22 +00:00
parent c2455ca7b7
commit 39a0347b79
2 changed files with 20 additions and 6 deletions

View File

@@ -407,7 +407,7 @@ Archive::findModuleDefiningSymbol(const std::string& symbol) {
// Look up multiple symbols in the symbol table and return a set of
// ModuleProviders that define those symbols.
void
Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
Archive::findModulesDefiningSymbols(std::set<std::string>& symbols,
std::set<ModuleProvider*>& result)
{
assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive");
@@ -462,11 +462,22 @@ Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
// At this point we have a valid symbol table (one way or another) so we
// just use it to quickly find the symbols requested.
for (std::set<std::string>::const_iterator I=symbols.begin(),
E=symbols.end(); I != E; ++I) {
for (std::set<std::string>::iterator I=symbols.begin(),
E=symbols.end(); I != E;) {
// See if this symbol exists
ModuleProvider* mp = findModuleDefiningSymbol(*I);
if (mp) {
// The symbol exists, insert the ModuleProvider into our result,
// duplicates wil be ignored
result.insert(mp);
// Remove the symbol now that its been resolved, being careful to
// not invalidate our iterator.
std::set<std::string>::iterator save = I;
++I;
symbols.erase(save);
} else {
++I;
}
}
}