diff options
author | Rui Ueyama <ruiu@google.com> | 2015-04-10 21:40:59 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2015-04-10 21:40:59 +0000 |
commit | aabd7ca452ec652d34b98e428545a9cc55d0db60 (patch) | |
tree | 14d4ae869befb41641a7de4e537d2a19baebab2d /lld/lib/Core/SymbolTable.cpp | |
parent | 08d9520f890f71065c4bb088bf5f568491ae8da7 (diff) | |
download | bcm5719-llvm-aabd7ca452ec652d34b98e428545a9cc55d0db60.tar.gz bcm5719-llvm-aabd7ca452ec652d34b98e428545a9cc55d0db60.zip |
Do s/_context/_ctx/g globally.
I believe this patch eliminates all remaining uses of _context
or _linkingContext variable names. Consistent naming improves
readability.
llvm-svn: 234645
Diffstat (limited to 'lld/lib/Core/SymbolTable.cpp')
-rw-r--r-- | lld/lib/Core/SymbolTable.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lld/lib/Core/SymbolTable.cpp b/lld/lib/Core/SymbolTable.cpp index f3f2da9262e..b85a83ffbfe 100644 --- a/lld/lib/Core/SymbolTable.cpp +++ b/lld/lib/Core/SymbolTable.cpp @@ -28,7 +28,7 @@ #include <vector> namespace lld { -SymbolTable::SymbolTable(LinkingContext &context) : _context(context) {} +SymbolTable::SymbolTable(LinkingContext &context) : _ctx(context) {} bool SymbolTable::add(const UndefinedAtom &atom) { return addByName(atom); } @@ -185,7 +185,7 @@ bool SymbolTable::addByName(const Atom &newAtom) { // fallthrough } case MCR_Error: - if (!_context.getAllowDuplicates()) { + if (!_ctx.getAllowDuplicates()) { llvm::errs() << "Duplicate symbols: " << existing->name() << ":" @@ -207,8 +207,7 @@ bool SymbolTable::addByName(const Atom &newAtom) { const UndefinedAtom* newUndef = cast<UndefinedAtom>(&newAtom); bool sameCanBeNull = (existingUndef->canBeNull() == newUndef->canBeNull()); - if (!sameCanBeNull && - _context.warnIfCoalesableAtomsHaveDifferentCanBeNull()) { + if (!sameCanBeNull && _ctx.warnIfCoalesableAtomsHaveDifferentCanBeNull()) { llvm::errs() << "lld warning: undefined symbol " << existingUndef->name() << " has different weakness in " @@ -244,14 +243,14 @@ bool SymbolTable::addByName(const Atom &newAtom) { (curShLib->canBeNullAtRuntime() == newShLib->canBeNullAtRuntime()); bool sameName = curShLib->loadName().equals(newShLib->loadName()); if (sameName && !sameNullness && - _context.warnIfCoalesableAtomsHaveDifferentCanBeNull()) { + _ctx.warnIfCoalesableAtomsHaveDifferentCanBeNull()) { // FIXME: need diagonstics interface for writing warning messages llvm::errs() << "lld warning: shared library symbol " << curShLib->name() << " has different weakness in " << curShLib->file().path() << " and in " << newShLib->file().path(); } - if (!sameName && _context.warnIfCoalesableAtomsHaveDifferentLoadName()) { + if (!sameName && _ctx.warnIfCoalesableAtomsHaveDifferentLoadName()) { // FIXME: need diagonstics interface for writing warning messages llvm::errs() << "lld warning: shared library symbol " << curShLib->name() << " has different load path in " @@ -268,7 +267,7 @@ bool SymbolTable::addByName(const Atom &newAtom) { } // Give context a chance to change which is kept. - _context.notifySymbolTableCoalesce(existing, &newAtom, useNew); + _ctx.notifySymbolTableCoalesce(existing, &newAtom, useNew); if (useNew) { // Update name table to use new atom. |