Skip to content

Commit

Permalink
[lld-macho] Demangle symbol names in export-symbol error messages whe…
Browse files Browse the repository at this point in the history
…n -demangle is specified.

PR/55512

Reviewed By: keith

Differential Revision: https://reviews.llvm.org/D125732
  • Loading branch information
oontvoo committed May 16, 2022
1 parent 6593886 commit 4c5b187
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lld/MachO/Driver.cpp
Expand Up @@ -1519,7 +1519,7 @@ bool macho::link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
// The former can be exported but the latter cannot.
defined->privateExtern = false;
} else {
warn("cannot export hidden symbol " + symbolName +
warn("cannot export hidden symbol " + toString(*defined) +
"\n>>> defined in " + toString(defined->getFile()));
}
}
Expand Down
43 changes: 37 additions & 6 deletions lld/test/MachO/demangle.s
@@ -1,15 +1,46 @@
# REQUIRES: x86

# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
# RUN: rm -rf %t; split-file %s %t

# RUN: not %lld %t.o -o /dev/null 2>&1 | FileCheck %s
# RUN: not %lld -demangle %t.o -o /dev/null 2>&1 | \
# RUN: FileCheck --check-prefix=DEMANGLE %s
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/undefined-symbol.s -o %t/undefined-symbol.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/export-symbols.s -o %t/export-symbols.o

# CHECK: undefined symbol: __Z1fv
# DEMANGLE: undefined symbol: f()
# RUN: not %lld %t/undefined-symbol.o -o /dev/null 2>&1 | FileCheck --check-prefix=UNDEF %s
# RUN: not %lld -demangle %t/undefined-symbol.o -o /dev/null 2>&1 | \
# RUN: FileCheck --check-prefix=DEMANGLE-UNDEF %s

# RUN: not %lld -exported_symbol __ZTIN3foo3bar4MethE -exported_symbol __ZTSN3foo3bar4MethE %t/export-symbols.o -o /dev/null 2>&1 | FileCheck --check-prefix=EXPORT %s
# RUN: not %lld -demangle -exported_symbol __ZTIN3foo3bar4MethE -exported_symbol __ZTSN3foo3bar4MethE %t/export-symbols.o -o /dev/null 2>&1 | FileCheck --check-prefix=DEMANGLE-EXPORT %s

# UNDEF: undefined symbol: __Z1fv
# DEMANGLE-UNDEF: undefined symbol: f()

# EXPORT: cannot export hidden symbol __ZTSN3foo3bar4MethE
# EXPORT: cannot export hidden symbol __ZTIN3foo3bar4MethE

# DEMANGLE-EXPORT: cannot export hidden symbol typeinfo name for foo::bar::Meth
# DEMANGLE-EXPORT: cannot export hidden symbol typeinfo for foo::bar::Meth

#--- undefined-symbol.s
.globl _main
_main:
callq __Z1fv
ret


#--- export-symbols.s
.globl _main
_main:
ret

.globl __ZTIN3foo3bar4MethE
.weak_def_can_be_hidden __ZTIN3foo3bar4MethE
.private_extern __ZTIN3foo3bar4MethE
__ZTIN3foo3bar4MethE:
retq

.globl __ZTSN3foo3bar4MethE
.weak_def_can_be_hidden __ZTSN3foo3bar4MethE
.private_extern __ZTSN3foo3bar4MethE
__ZTSN3foo3bar4MethE:
retq

0 comments on commit 4c5b187

Please sign in to comment.