mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 17:06:07 +00:00
Code Issues Projects Releases Wiki Activity

[lld-macho] Use source information in duplicate symbol errors

Browse Source 
Similarly to how undefined symbol diagnostics were changed in D128184,
we now show where in the source file duplicate symbols are defined at:

  ld64.lld: error: duplicate symbol: _foo
  >> defined in bar.c:42
  >>            /path/to/bar.o
  >> defined in baz.c:1
  >>            /path/to/libbaz.a(baz.o)

For objects that don't contain DWARF data, the format is unchanged.

A slight difference to undefined symbol diagnostics is that we don't
print the name of the symbol on the third line, as it's already
contained on the first line.

Differential Revision: https://reviews.llvm.org/D128425
This commit is contained in:
Daniel Bertalan 2022-06-23 11:07:15 -04:00 committed by Nico Weber
parent 6f27df5084
commit ed39fd515a
5 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/MachO/InputSection.cpp
View File

@ -85,7 +85,7 @@ std::string InputSection::getLocation(uint64_t off) const {
}
std::string InputSection::getSourceLocation(uint64_t off) const {
auto *obj = dyn_cast<ObjFile>(getFile());
auto *obj = dyn_cast_or_null<ObjFile>(getFile());
if (!obj)
return {};

14
lld/MachO/SymbolTable.cpp
View File

@ -83,9 +83,17 @@ Defined *SymbolTable::addDefined(StringRef name, InputFile *file,
concatIsec->symbols.erase(llvm::find(concatIsec->symbols, defined));
}
} else {
error("duplicate symbol: " + toString(*defined) + "\n>>> defined in " +
toString(defined->getFile()) + "\n>>> defined in " +
toString(file));
std::string src1 = defined->getSourceLocation();
std::string src2 = isec ? isec->getSourceLocation(value) : "";
std::string message =
"duplicate symbol: " + toString(*defined) + "\n>>> defined in ";
if (!src1.empty())
message += src1 + "\n>>> ";
message += toString(defined->getFile()) + "\n>>> defined in ";
if (!src2.empty())
message += src2 + "\n>>> ";
error(message + toString(file));
}
} else if (auto *dysym = dyn_cast<DylibSymbol>(s)) {

6
lld/MachO/Symbols.cpp
View File

@ -100,6 +100,12 @@ void Defined::canonicalize() {
isec = isec->canonical();
}
std::string Defined::getSourceLocation() {
if (!isec)
return {};
return isec->getSourceLocation(value);
}
uint64_t DylibSymbol::getVA() const {
return isInStubs() ? getStubVA() : Symbol::getVA();
}

2
lld/MachO/Symbols.h
View File

@ -132,6 +132,8 @@ public:
uint64_t getVA() const override;
std::string getSourceLocation();
// Ensure this symbol's pointers to InputSections point to their canonical
// copies.
void canonicalize();

43
lld/test/MachO/invalid/duplicate-symbol-debug.s Normal file
View File

@ -0,0 +1,43 @@
# REQUIRES: aarch64
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-darwin %s -o %t.o
# RUN: llvm-mc -filetype=obj -triple=arm64-apple-darwin %s -o %t-dup.o
# RUN: not %lld -dylib -arch arm64 -o /dev/null %t.o %t-dup.o 2>&1 | FileCheck %s -DFILE_1=%t.o -DFILE_2=%t-dup.o
# CHECK: error: duplicate symbol: _foo
# CHECK-NEXT: >>> defined in duplicate-symbol-debug.s:20
# CHECK-NEXT: >>> [[FILE_1]]
# CHECK-NEXT: >>> defined in duplicate-symbol-debug.s:20
# CHECK-NEXT: >>> [[FILE_2]]
## Test case adapted from lld/test/ELF/Inputs/vs-diagnostics-duplicate2.s
.file 1 "" "duplicate-symbol-debug.s"
.text
.globl _foo
.loc 1 20
_foo:
nop
.section __DWARF,__debug_abbrev,regular,debug
.byte 1 ; Abbreviation code
.byte 17 ; DW_TAG_compile_unit
.byte 0 ; DW_CHILDREN_no
.byte 16 ; DW_AT_stmt_list
.byte 23 ; DW_FORM_sec_offset
.byte 0 ; EOM(1)
.byte 0 ; EOM(2)
.byte 0 ; EOM(3)
.section __DWARF,__debug_info,regular,debug
.long Lend0 - Lbegin0 ; Length of Unit
Lbegin0:
.short 4 ; DWARF version number
.long __debug_abbrev ; Offset Into Abbrev. Section
.byte 8 ; Address Size (in bytes)
.byte 1 ; Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
.long __debug_line ; DW_AT_stmt_list
Lend0:
.section __DWARF,__debug_line,regular,debug