replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor copy-paste-and-modifed code using callback. 

llvm-svn: 194784
This commit is contained in:
Rui Ueyama 2013-11-15 04:58:54 +00:00
parent c5559bb14b
commit 3429d01f1a
2 changed files with 31 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/include/lld/Core/Resolver.h
View File

@ -66,6 +66,7 @@ public:
std::unique_ptr<MutableFile> resultFile() { return std::move(_result); }
private:
typedef std::function<void(StringRef, bool)> UndefCallback;
/// \brief The main function that iterates over the files to resolve
bool resolveUndefines();
@ -76,6 +77,7 @@ private:
void checkDylibSymbolCollisions();
void linkTimeOptimize();
void tweakAtoms();
void forEachUndefines(UndefCallback callback, bool searchForOverrides);
void markLive(const Atom &atom);
void addAtoms(const std::vector<const DefinedAtom *>&);

89
lld/lib/Core/Resolver.cpp
View File

@ -95,9 +95,8 @@ void Resolver::handleFile(const File &file) {
_context.setResolverState(resolverState);
}
void Resolver::handleArchiveFile(const File &file) {
const ArchiveLibraryFile *archiveFile = dyn_cast<ArchiveLibraryFile>(&file);
void
Resolver::forEachUndefines(UndefCallback callback, bool searchForOverrides) {
// Handle normal archives
int64_t undefineGenCount = 0;
do {
@ -107,12 +106,8 @@ void Resolver::handleArchiveFile(const File &file) {
for (const UndefinedAtom *undefAtom : undefines) {
StringRef undefName = undefAtom->name();
// load for previous undefine may also have loaded this undefine
if (!_symbolTable.isDefined(undefName)) {
if (const File *member = archiveFile->find(undefName, false)) {
member->setOrdinal(_context.getNextOrdinalAndIncrement());
handleFile(*member);
}
}
if (!_symbolTable.isDefined(undefName))
callback(undefName, false);
// If the undefined symbol has an alternative name, try to resolve the
// symbol with the name to give it a second chance. This feature is used
// for COFF "weak external" symbol.
@ -124,7 +119,7 @@ void Resolver::handleArchiveFile(const File &file) {
}
}
// search libraries for overrides of common symbols
if (_context.searchArchivesToOverrideTentativeDefinitions()) {
if (searchForOverrides) {
std::vector<StringRef> tentDefNames;
_symbolTable.tentativeDefinitions(tentDefNames);
for (StringRef tentDefName : tentDefNames) {
@ -133,65 +128,39 @@ void Resolver::handleArchiveFile(const File &file) {
const Atom *curAtom = _symbolTable.findByName(tentDefName);
assert(curAtom != nullptr);
if (const DefinedAtom *curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
if (const File *member = archiveFile->find(tentDefName, true)) {
member->setOrdinal(_context.getNextOrdinalAndIncrement());
handleFile(*member);
}
}
if (curDefAtom->merge() == DefinedAtom::mergeAsTentative)
callback(tentDefName, true);
}
}
}
} while (undefineGenCount != _symbolTable.size());
}
void Resolver::handleSharedLibrary(const File &file) {
const SharedLibraryFile *sharedLibrary = dyn_cast<SharedLibraryFile>(&file);
int64_t undefineGenCount = 0;
void Resolver::handleArchiveFile(const File &file) {
const ArchiveLibraryFile *archiveFile = dyn_cast<ArchiveLibraryFile>(&file);
auto callback = [&](StringRef undefName, bool dataSymbolOnly) {
if (const File *member = archiveFile->find(undefName, dataSymbolOnly)) {
member->setOrdinal(_context.getNextOrdinalAndIncrement());
handleFile(*member);
}
};
bool searchForOverrides = _context.searchArchivesToOverrideTentativeDefinitions();
forEachUndefines(callback, searchForOverrides);
}
void Resolver::handleSharedLibrary(const File &file) {
// Add all the atoms from the shared library
const SharedLibraryFile *sharedLibrary = dyn_cast<SharedLibraryFile>(&file);
handleFile(*sharedLibrary);
do {
undefineGenCount = _symbolTable.size();
std::vector<const UndefinedAtom *> undefines;
_symbolTable.undefines(undefines);
for (const UndefinedAtom *undefAtom : undefines) {
StringRef undefName = undefAtom->name();
// load for previous undefine may also have loaded this undefine
if (!_symbolTable.isDefined(undefName)) {
if (const SharedLibraryAtom *shAtom =
sharedLibrary->exports(undefName, false))
doSharedLibraryAtom(*shAtom);
}
// If the undefined symbol has an alternative name, try to resolve the
// symbol with the name to give it a second chance. This feature is used
// for COFF "weak external" symbol.
if (!_symbolTable.isDefined(undefName)) {
if (const UndefinedAtom *fallbackUndefAtom = undefAtom->fallback()) {
_symbolTable.addReplacement(undefAtom, fallbackUndefAtom);
_symbolTable.add(*fallbackUndefAtom);
}
}
}
// search libraries for overrides of common symbols
if (_context.searchSharedLibrariesToOverrideTentativeDefinitions()) {
std::vector<StringRef> tentDefNames;
_symbolTable.tentativeDefinitions(tentDefNames);
for (StringRef tentDefName : tentDefNames) {
// Load for previous tentative may also have loaded
// something that overrode this tentative, so always check.
const Atom *curAtom = _symbolTable.findByName(tentDefName);
assert(curAtom != nullptr);
if (const DefinedAtom *curDefAtom = dyn_cast<DefinedAtom>(curAtom)) {
if (curDefAtom->merge() == DefinedAtom::mergeAsTentative) {
if (const SharedLibraryAtom *shAtom =
sharedLibrary->exports(tentDefName, true))
doSharedLibraryAtom(*shAtom);
}
}
}
}
} while (undefineGenCount != _symbolTable.size());
auto callback = [&](StringRef undefName, bool dataSymbolOnly) {
if (const SharedLibraryAtom *shAtom = sharedLibrary->exports(
undefName, dataSymbolOnly))
doSharedLibraryAtom(*shAtom);
};
bool searchForOverrides =
_context.searchSharedLibrariesToOverrideTentativeDefinitions();
forEachUndefines(callback, searchForOverrides);
}
void Resolver::doUndefinedAtom(const UndefinedAtom& atom) {