diff --git a/lld/MachO/MapFile.cpp b/lld/MachO/MapFile.cpp --- a/lld/MachO/MapFile.cpp +++ b/lld/MachO/MapFile.cpp @@ -40,23 +40,51 @@ using namespace lld; using namespace lld::macho; -// Returns a list of all symbols that we want to print out. -static std::vector getSymbols() { - std::vector v; +namespace { + +template class SymbolVector { +public: + void conditionalInsert(Defined *symbol) { + assert(symbol != nullptr); + if (symbol->isLive() == Live) + data.push_back(symbol); + } + + void sort() { + parallelSort(data.begin(), data.end(), [](Defined *a, Defined *b) { + return Live && a->getVA() != b->getVA() ? a->getVA() < b->getVA() + : a->getName() < b->getName(); + }); + } + + const std::vector &getData() { return data; } + + bool isLive() { return Live; } + +private: + std::vector data; +}; + +} // namespace + +// Returns only live symbols if `Live` is true. Else, returns only dead-stripped +// symbols. +static std::pair, SymbolVector> getSymbols() { + SymbolVector liveSymbols; + SymbolVector deadSymbols; for (InputFile *file : inputFiles) if (isa(file)) for (Symbol *sym : file->symbols) if (auto *d = dyn_cast_or_null(sym)) - if (d->isLive() && d->isec && d->getFile() == file) { - assert(!shouldOmitFromOutput(d->isec)); - v.push_back(d); + if (d->isec && d->getFile() == file) { + assert(!d->isLive() || !shouldOmitFromOutput(d->isec)); + liveSymbols.conditionalInsert(d); + deadSymbols.conditionalInsert(d); } - parallelSort(v.begin(), v.end(), [](Defined *a, Defined *b) { - return a->getVA() != b->getVA() ? a->getVA() < b->getVA() - : a->getName() < b->getName(); - }); - return v; + liveSymbols.sort(); + deadSymbols.sort(); + return std::make_pair(liveSymbols, deadSymbols); } // Construct a map from symbols to their stringified representations. @@ -109,10 +137,6 @@ } } - // Collect symbol info that we want to print out. - std::vector syms = getSymbols(); - DenseMap symStr = getSymbolStrings(syms); - // Dump table of sections os << "# Sections:\n"; os << "# Address\tSize \tSegment\tSection\n"; @@ -126,12 +150,29 @@ } // Dump table of symbols + auto dumpSymbols = [&](auto &symbols) { + DenseMap symStr = + getSymbolStrings(symbols.getData()); + os << "# Address\t File Name\n"; + for (Symbol *sym : symbols.getData()) { + if (symbols.isLive()) { + os << format("0x%08llX\t[%3u] %s\n", sym->getVA(), + readerToFileOrdinal[sym->getFile()], symStr[sym].c_str()); + } else { + os << format("<>\t[%3u] %s\n", + readerToFileOrdinal[sym->getFile()], symStr[sym].c_str()); + } + } + }; + SymbolVector liveSymbols; + SymbolVector deadSymbols; + std::tie(liveSymbols, deadSymbols) = getSymbols(); + os << "# Symbols:\n"; - os << "# Address\t File Name\n"; - for (Symbol *sym : syms) { - os << format("0x%08llX\t[%3u] %s\n", sym->getVA(), - readerToFileOrdinal[sym->getFile()], symStr[sym].c_str()); - } + dumpSymbols(liveSymbols); - // TODO: when we implement -dead_strip, we should dump dead stripped symbols + if (config->deadStrip) { + os << "# Dead Stripped Symbols:\n"; + dumpSymbols(deadSymbols); + } } diff --git a/lld/test/MachO/dead-strip.s b/lld/test/MachO/dead-strip.s --- a/lld/test/MachO/dead-strip.s +++ b/lld/test/MachO/dead-strip.s @@ -16,7 +16,7 @@ # RUN: --exports-trie --indirect-symbols %t/basics | \ # RUN: FileCheck --check-prefix=EXECDATA --implicit-check-not _unref %s # RUN: llvm-otool -l %t/basics | grep -q 'segname __PAGEZERO' -# RUN: FileCheck --check-prefix=MAP --implicit-check-not _unref %s < %t/map +# RUN: FileCheck --check-prefix=MAP %s < %t/map # EXEC-LABEL: Sections: # EXEC-LABEL: Name # EXEC-NEXT: __text @@ -45,6 +45,13 @@ # EXECDATA-NEXT: _ref_com # EXECDATA-NEXT: _no_dead_strip_globl # MAP: _main +# MAP-LABEL: Dead Stripped Symbols +# MAP: <> [ 1] _unref_com +# MAP: <> [ 1] _unref_data +# MAP: <> [ 1] _unref_extern +# MAP: <> [ 1] _unref_local +# MAP: <> [ 1] _unref_private_extern +# MAP: <> [ 1] l_unref_data # RUN: %lld -dylib -dead_strip -u _ref_private_extern_u %t/basics.o -o %t/basics.dylib # RUN: llvm-objdump --syms %t/basics.dylib | \