diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -1230,7 +1230,8 @@ : SyntheticSection(dynamic ? (uint64_t)SHF_ALLOC : 0, SHT_STRTAB, 1, name), dynamic(dynamic) { // ELF string tables start with a NUL byte. - addString(""); + strings.push_back(""); + size = 1; } // Adds a string to the string table. If `hashIt` is true we hash and check for @@ -1243,6 +1244,8 @@ if (!r.second) return r.first->second; } + if (s.empty()) + return 0; unsigned ret = this->size; this->size = this->size + s.size() + 1; strings.push_back(s); @@ -2155,7 +2158,7 @@ // Adding a local symbol to a .dynsym is a bug. assert(this->type != SHT_DYNSYM || !b->isLocal()); - bool hashIt = b->isLocal(); + bool hashIt = b->isLocal() && config->optimize >= 2; symbols.push_back({b, strTabSec.addString(b->getName(), hashIt)}); } diff --git a/lld/docs/ReleaseNotes.rst b/lld/docs/ReleaseNotes.rst --- a/lld/docs/ReleaseNotes.rst +++ b/lld/docs/ReleaseNotes.rst @@ -33,6 +33,9 @@ (`D110014 `_) * If ``-Map`` is specified, ``--cref`` will be printed to the specified file. (`D114663 `_) +* No longer deduplicate local symbol names at the default optimization level of ``-O1``. + This results in a larger ``.strtab`` (usually less than 1%) but a faster link + time. Use optimization level ``-O2`` to restore the deduplication. Architecture specific changes: diff --git a/lld/test/ELF/strtab-dedup.s b/lld/test/ELF/strtab-dedup.s new file mode 100644 --- /dev/null +++ b/lld/test/ELF/strtab-dedup.s @@ -0,0 +1,33 @@ +# REQUIRES: x86 +# RUN: split-file %s %t +# RUN: llvm-mc -filetype=obj -triple=x86_64 %t/a.s -o %t/a.o +# RUN: llvm-mc -filetype=obj -triple=x86_64 %t/b.s -o %t/b.o + +## By default local symbol names are not deduplicated. +# RUN: ld.lld %t/a.o %t/b.o -o %t/a +# RUN: llvm-readelf -p .strtab %t/a | FileCheck %s --check-prefix=NODEDUP + +# NODEDUP: [ 1] local +# NODEDUP-NEXT: [ 7] local +# NODEDUP-NEXT: [ d] foo +# NODEDUP-EMPTY: + +## -O2 deduplicates local symbol names. +# RUN: ld.lld -O2 %t/a.o %t/b.o -o %t/a +# RUN: llvm-readelf -p .strtab %t/a | FileCheck %s --check-prefix=DEDUP + +# DEDUP: [ 1] local +# DEDUP-NEXT: [ 7] foo +# DEDUP-EMPTY: + +#--- a.s +.global foo +foo: +local: + ret + +#--- b.s +.weak foo +foo: +local: + ret