From b2e16973df700ed1f18c9ab38bd5f8c113801832 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Fri, 27 Feb 2015 23:40:00 +0000 Subject: [PATCH] Do s/_context/_ctx/ to Resolver.cpp. llvm-svn: 230814 --- lld/include/lld/Core/Resolver.h | 6 +++--- lld/lib/Core/Resolver.cpp | 43 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/lld/include/lld/Core/Resolver.h b/lld/include/lld/Core/Resolver.h index 408a2ae..a90702e 100644 --- a/lld/include/lld/Core/Resolver.h +++ b/lld/include/lld/Core/Resolver.h @@ -29,8 +29,8 @@ class LinkingContext; /// and producing a merged graph. class Resolver { public: - Resolver(LinkingContext &context) - : _context(context), _symbolTable(context), _result(new MergedFile()), + Resolver(LinkingContext &ctx) + : _ctx(ctx), _symbolTable(ctx), _result(new MergedFile()), _fileIndex(0) {} // InputFiles::Handler methods @@ -83,7 +83,7 @@ private: void addAtoms(std::vector& atoms); }; - LinkingContext &_context; + LinkingContext &_ctx; SymbolTable _symbolTable; std::vector _atoms; std::set _deadStripRoots; diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp index 656a039..7153279 100644 --- a/lld/lib/Core/Resolver.cpp +++ b/lld/lib/Core/Resolver.cpp @@ -73,12 +73,12 @@ void Resolver::forEachUndefines(bool searchForOverrides, bool Resolver::handleArchiveFile(const File &file) { const ArchiveLibraryFile *archiveFile = cast(&file); bool searchForOverrides = - _context.searchArchivesToOverrideTentativeDefinitions(); + _ctx.searchArchivesToOverrideTentativeDefinitions(); bool undefAdded = false; forEachUndefines(searchForOverrides, [&](StringRef undefName, bool dataSymbolOnly) { if (const File *member = archiveFile->find(undefName, dataSymbolOnly)) { - member->setOrdinal(_context.getNextOrdinalAndIncrement()); + member->setOrdinal(_ctx.getNextOrdinalAndIncrement()); const_cast(member)->beforeLink(); undefAdded = handleFile(*member) || undefAdded; } @@ -91,7 +91,7 @@ void Resolver::handleSharedLibrary(const File &file) { const SharedLibraryFile *sharedLibrary = cast(&file); handleFile(*sharedLibrary); bool searchForOverrides = - _context.searchSharedLibrariesToOverrideTentativeDefinitions(); + _ctx.searchSharedLibrariesToOverrideTentativeDefinitions(); forEachUndefines(searchForOverrides, [&](StringRef undefName, bool dataSymbolOnly) { if (const SharedLibraryAtom *atom = @@ -131,7 +131,7 @@ void Resolver::maybeAddSectionGroupOrGnuLinkOnce(const DefinedAtom &atom) { if (!isFirstTime) { // If duplicate symbols are allowed, select the first group. - if (_context.getAllowDuplicates()) + if (_ctx.getAllowDuplicates()) return; auto *prevGroup = dyn_cast(_symbolTable.findGroup(atom.name())); assert(prevGroup && @@ -188,7 +188,7 @@ void Resolver::doDefinedAtom(const DefinedAtom &atom) { } // An atom that should never be dead-stripped is a dead-strip root. - if (_context.deadStrip() && atom.deadStrip() == DefinedAtom::deadStripNever) { + if (_ctx.deadStrip() && atom.deadStrip() == DefinedAtom::deadStripNever) { _deadStripRoots.insert(&atom); } } @@ -233,7 +233,7 @@ void Resolver::addAtoms(const std::vector &newAtoms) { // Returns true if at least one of N previous files has created an // undefined symbol. bool Resolver::undefinesAdded(int begin, int end) { - std::vector> &inputs = _context.getNodes(); + std::vector> &inputs = _ctx.getNodes(); for (int i = begin; i < end; ++i) if (FileNode *node = dyn_cast(inputs[i].get())) if (_newUndefinesAdded[node->getFile()]) @@ -242,7 +242,7 @@ bool Resolver::undefinesAdded(int begin, int end) { } File *Resolver::getFile(int &index) { - std::vector> &inputs = _context.getNodes(); + std::vector> &inputs = _ctx.getNodes(); if ((size_t)index >= inputs.size()) return nullptr; if (GroupEnd *group = dyn_cast(inputs[index].get())) { @@ -262,7 +262,7 @@ File *Resolver::getFile(int &index) { // Make a map of Symbol -> ArchiveFile. void Resolver::makePreloadArchiveMap() { - std::vector> &nodes = _context.getNodes(); + std::vector> &nodes = _ctx.getNodes(); for (int i = nodes.size() - 1; i >= 0; --i) if (auto *fnode = dyn_cast(nodes[i].get())) if (auto *archive = dyn_cast(fnode->getFile())) @@ -270,7 +270,7 @@ void Resolver::makePreloadArchiveMap() { _archiveMap[sym] = archive; } -// Keep adding atoms until _context.getNextFile() returns an error. This +// Keep adding atoms until _ctx.getNextFile() returns an error. This // function is where undefined atoms are resolved. bool Resolver::resolveUndefines() { ScopedTask task(getDefaultDomain(), "resolveUndefines"); @@ -296,17 +296,17 @@ bool Resolver::resolveUndefines() { break; seen.insert(file); assert(!file->hasOrdinal()); - file->setOrdinal(_context.getNextOrdinalAndIncrement()); + file->setOrdinal(_ctx.getNextOrdinalAndIncrement()); undefAdded = handleFile(*file); break; case File::kindArchiveLibrary: if (!file->hasOrdinal()) - file->setOrdinal(_context.getNextOrdinalAndIncrement()); + file->setOrdinal(_ctx.getNextOrdinalAndIncrement()); undefAdded = handleArchiveFile(*file); break; case File::kindSharedLibrary: if (!file->hasOrdinal()) - file->setOrdinal(_context.getNextOrdinalAndIncrement()); + file->setOrdinal(_ctx.getNextOrdinalAndIncrement()); handleSharedLibrary(*file); break; } @@ -365,7 +365,7 @@ static bool isBackref(const Reference *ref) { void Resolver::deadStripOptimize() { ScopedTask task(getDefaultDomain(), "deadStripOptimize"); // only do this optimization with -dead_strip - if (!_context.deadStrip()) + if (!_ctx.deadStrip()) return; // Some type of references prevent referring atoms to be dead-striped. @@ -382,14 +382,14 @@ void Resolver::deadStripOptimize() { } // By default, shared libraries are built with all globals as dead strip roots - if (_context.globalsAreDeadStripRoots()) + if (_ctx.globalsAreDeadStripRoots()) for (const Atom *atom : _atoms) if (const DefinedAtom *defAtom = dyn_cast(atom)) if (defAtom->scope() == DefinedAtom::scopeGlobal) _deadStripRoots.insert(defAtom); // Or, use list of names that are dead strip roots. - for (const StringRef &name : _context.deadStripRoots()) { + for (const StringRef &name : _ctx.deadStripRoots()) { const Atom *symAtom = _symbolTable.findByName(name); assert(symAtom); _deadStripRoots.insert(symAtom); @@ -410,7 +410,7 @@ void Resolver::deadStripOptimize() { bool Resolver::checkUndefines() { // build vector of remaining undefined symbols std::vector undefinedAtoms = _symbolTable.undefines(); - if (_context.deadStrip()) { + if (_ctx.deadStrip()) { // When dead code stripping, we don't care if dead atoms are undefined. undefinedAtoms.erase( std::remove_if(undefinedAtoms.begin(), undefinedAtoms.end(), @@ -429,8 +429,7 @@ bool Resolver::checkUndefines() { // If this is a library and undefined symbols are allowed on the // target platform, skip over it. - if (isa(undef->file()) && - _context.allowShlibUndefines()) + if (isa(undef->file()) && _ctx.allowShlibUndefines()) continue; // If the undefine is coalesced away, skip over it. @@ -439,14 +438,14 @@ bool Resolver::checkUndefines() { // Seems like this symbol is undefined. Warn that. foundUndefines = true; - if (_context.printRemainingUndefines()) { + if (_ctx.printRemainingUndefines()) { llvm::errs() << "Undefined symbol: " << undef->file().path() - << ": " << _context.demangle(undef->name()) + << ": " << _ctx.demangle(undef->name()) << "\n"; } } if (foundUndefines) { - if (_context.printRemainingUndefines()) + if (_ctx.printRemainingUndefines()) llvm::errs() << "symbol(s) not found\n"; return true; } @@ -470,7 +469,7 @@ bool Resolver::resolve() { updateReferences(); deadStripOptimize(); if (checkUndefines()) - if (!_context.allowRemainingUndefines()) + if (!_ctx.allowRemainingUndefines()) return false; removeCoalescedAwayAtoms(); _result->addAtoms(_atoms); -- 2.7.4