maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld][YAML] RefNameResolver : add only if name/refname is not empty 

llvm-svn: 190903
This commit is contained in:
Shankar Easwaran 2013-09-17 23:38:04 +00:00
parent 138be5e9f4
commit 1b0256c379
2 changed files with 167 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
View File

@ -1146,10 +1146,10 @@ RefNameResolver::RefNameResolver(const lld::File *file, IO &io) : _io(io) {
NormalizedAtom;
for (const lld::DefinedAtom *a : file->defined()) {
NormalizedAtom *na = (NormalizedAtom *)a;
if (na->_refName.empty())
add(na->_name, a);
else
if (!na->_refName.empty())
add(na->_refName, a);
else if (!na->_name.empty())
add(na->_name, a);
}
for (const lld::UndefinedAtom *a : file->undefined())

164
lld/test/elf/X86_64/yamlinput.test Normal file
View File

@ -0,0 +1,164 @@
# This tests the functionality that lld is able to read
# an input YAML from a previous link
RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/initfini.o \
RUN: --noinhibit-exec -emit-yaml -o %t.objtxt
RUN: lld -flavor gnu -target x86_64-linux %t.objtxt \
RUN: --noinhibit-exec -o %t1
RUN: llvm-readobj -sections %t1 | FileCheck %s -check-prefix=SECTIONS
SECTIONS: Section {
SECTIONS: Index: 0
SECTIONS: Name: (0)
SECTIONS: Type: SHT_NULL (0x0)
SECTIONS: Flags [ (0x0)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 1
SECTIONS: Name: .interp (1)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 2
SECTIONS: Name: .hash (9)
SECTIONS: Type: SHT_HASH (0x5)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 3
SECTIONS: Name: .dynsym (15)
SECTIONS: Type: SHT_DYNSYM (0xB)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 4
SECTIONS: Name: .dynstr (23)
SECTIONS: Type: SHT_STRTAB (0x3)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 5
SECTIONS: Name: .note.GNU-stack (31)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 6
SECTIONS: Name: .text (47)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x6)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_EXECINSTR (0x4)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 7
SECTIONS: Name: .rodata (53)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 8
SECTIONS: Name: .comment (61)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 9
SECTIONS: Name: .eh_frame (70)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x2)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 10
SECTIONS: Name: .init_array (80)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 11
SECTIONS: Name: .fini_array (92)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 12
SECTIONS: Name: .dynamic (104)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 13
SECTIONS: Name: .got.plt (113)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 14
SECTIONS: Name: .data (122)
SECTIONS: Type: SHT_PROGBITS (0x1)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 15
SECTIONS: Name: .bss (128)
SECTIONS: Type: SHT_NOBITS (0x8)
SECTIONS: Flags [ (0x3)
SECTIONS: SHF_ALLOC (0x2)
SECTIONS: SHF_WRITE (0x1)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 16
SECTIONS: Name: .shstrtab (133)
SECTIONS: Type: SHT_STRTAB (0x3)
SECTIONS: Flags [ (0x0)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 17
SECTIONS: Name: .symtab (143)
SECTIONS: Type: SHT_SYMTAB (0x2)
SECTIONS: Flags [ (0x0)
SECTIONS: ]
SECTIONS: }
SECTIONS: Section {
SECTIONS: Index: 18
SECTIONS: Name: .strtab (151)
SECTIONS: Type: SHT_STRTAB (0x3)
SECTIONS: Flags [ (0x0)
SECTIONS: ]
SECTIONS: }