[lld] r181492 - [lld] Add comments to InputFiles::searchLibraries() arguments.
Rui Ueyama
ruiu at google.com
Wed May 8 16:54:10 PDT 2013
Author: ruiu
Date: Wed May 8 18:54:10 2013
New Revision: 181492
URL: http://llvm.org/viewvc/llvm-project?rev=181492&view=rev
Log:
[lld] Add comments to InputFiles::searchLibraries() arguments.
Modified:
lld/trunk/lib/Core/Resolver.cpp
Modified: lld/trunk/lib/Core/Resolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=181492&r1=181491&r2=181492&view=diff
==============================================================================
--- lld/trunk/lib/Core/Resolver.cpp (original)
+++ lld/trunk/lib/Core/Resolver.cpp Wed May 8 18:54:10 2013
@@ -200,7 +200,11 @@ void Resolver::resolveUndefines() {
StringRef undefName = undefAtom->name();
// load for previous undefine may also have loaded this undefine
if (!_symbolTable.isDefined(undefName)) {
- _inputFiles.searchLibraries(undefName, true, true, false, *this);
+ _inputFiles.searchLibraries(undefName,
+ true, // searchSharedLibs
+ true, // searchArchives
+ false, // dataSymbolOnly
+ *this);
}
}
// search libraries for overrides of common symbols
@@ -213,10 +217,13 @@ void Resolver::resolveUndefines() {
const Atom *curAtom = _symbolTable.findByName(tentDefName);
assert(curAtom != nullptr);
if (const DefinedAtom* curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
- if (curDefAtom->merge() == DefinedAtom::mergeAsTentative ) {
+ if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
// Still tentative definition, so look for override.
- _inputFiles.searchLibraries(tentDefName, searchSharedLibs,
- searchArchives, true, *this);
+ _inputFiles.searchLibraries(tentDefName,
+ searchSharedLibs,
+ searchArchives,
+ true, // dataSymbolOnly
+ *this);
}
}
}
More information about the llvm-commits
mailing list