This is an archive of the discontinued LLVM Phabricator instance.

Differential D67609

[llvm-readobj] - Fix a TODO in elf-reloc-zero-name-or-value.test.
ClosedPublic

Authored by grimar on Sep 16 2019, 2:05 AM.

Details

Reviewers
MaskRay
jhenderson
Commits
rGde1bef0b1b2d: [llvm-readobj] - Fix a TODO in elf-reloc-zero-name-or-value.test.
rL372087: [llvm-readobj] - Fix a TODO in elf-reloc-zero-name-or-value.test.
Summary

The "TODO" mentioned was:

"Add test for symbol with no name but with a value once yaml2obj allows
referencing symbols with no name from relocations."

We can do it now.

Diff Detail

Repository
rL LLVM

Event Timeline

grimar created this revision.Sep 16 2019, 2:05 AM
Herald added subscribers: seiya, rupprecht. · View Herald TranscriptSep 16 2019, 2:05 AM
jhenderson accepted this revision.Sep 16 2019, 2:28 AM

LGTM.

This revision is now accepted and ready to land.Sep 16 2019, 2:28 AM
MaskRay accepted this revision.Sep 16 2019, 3:22 AM
Closed by commit rL372087: [llvm-readobj] - Fix a TODO in elf-reloc-zero-name-or-value.test. (authored by grimar). · Explain WhySep 17 2019, 2:10 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 17 2019, 2:10 AM

Revision Contents

PathSize
llvm/
trunk/
test/
tools/
llvm-readobj/
26 lines

Diff 220453

llvm/trunk/test/tools/llvm-readobj/elf-reloc-zero-name-or-value.test

# Show that the value field is omitted if a symbol has no name or value, but is # Show that the value field is omitted if a symbol has no name or value, but is
# printed if one is present. Test for both static and dynamic relocation # printed if one is present. Test for both static and dynamic relocation
# printing. # printing.
# RUN: yaml2obj %s -o %t # RUN: yaml2obj %s -o %t
# RUN: llvm-readelf --relocations --dyn-relocations %t | FileCheck %s # RUN: llvm-readelf --relocations --dyn-relocations %t | FileCheck %s
# CHECK: Relocation section '.rela.text' at offset {{.*}} contains 2 entries: # CHECK: Relocation section '.rela.text' at offset {{.*}} contains 3 entries:
# CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend # CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend
# CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1 # CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1
# CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1 # CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1
# CHECK-NEXT: 0000000000000000 0000000200000000 R_X86_64_NONE 0000000000000123 456
# CHECK: Relocation section '.rela.dyn' at offset {{.*}} contains 2 entries: # CHECK: Relocation section '.rela.dyn' at offset {{.*}} contains 3 entries:
# CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend # CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend
# CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1 # CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1
# CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1 # CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1
# CHECK-NEXT: 0000000000000000 0000000200000000 R_X86_64_NONE 0000000000000123 456
# CHECK: 'RELA' relocation section at offset {{.*}} contains 48 bytes: # CHECK: 'RELA' relocation section at offset {{.*}} contains 48 bytes:
# CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend # CHECK-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend
# CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1 # CHECK-NEXT: 0000000000000000 0000000000000000 R_X86_64_NONE 1
# CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1 # CHECK-NEXT: 0000000000000000 0000000100000000 R_X86_64_NONE 0000000000000000 sym + 1
# CHECK-NEXT: 0000000000000000 0000000200000000 R_X86_64_NONE 0000000000000123 456
# TODO: Add test for symbol with no name but with a value once yaml2obj allows
# referencing symbols with no name from relocations.
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_EXEC Type: ET_EXEC
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .text - Name: .text
Type: SHT_PROGBITS Type: SHT_PROGBITS
Size: 0x10 Size: 0x10
- Name: .rela.text - Name: .rela.text
Type: SHT_RELA Type: SHT_RELA
Link: .symtab Link: .symtab
Info: .text Info: .text
Relocations: Relocations:
- Offset: 0 - Offset: 0
Type: R_X86_64_NONE Type: R_X86_64_NONE
Addend: 1 Addend: 1
- Offset: 0 - Offset: 0
Type: R_X86_64_NONE Type: R_X86_64_NONE
Addend: 1 Addend: 1
Symbol: sym Symbol: sym
- Offset: 0
Type: R_X86_64_NONE
Addend: 0x456
Symbol: 2
- Name: .dynamic - Name: .dynamic
Type: SHT_DYNAMIC Type: SHT_DYNAMIC
Flags: [SHF_ALLOC] Flags: [SHF_ALLOC]
Address: 0x1000 Address: 0x1000
AddressAlign: 0x1000 AddressAlign: 0x1000
Entries: Entries:
- Tag: DT_RELA - Tag: DT_RELA
Value: 0x1100 Value: 0x1100
- Tag: DT_RELASZ - Tag: DT_RELASZ
Value: 48 Value: 72
- Tag: DT_RELAENT - Tag: DT_RELAENT
Value: 24 Value: 24
- Tag: DT_NULL - Tag: DT_NULL
Value: 0 Value: 0
- Name: .rela.dyn - Name: .rela.dyn
Type: SHT_RELA Type: SHT_RELA
Flags: [SHF_ALLOC] Flags: [SHF_ALLOC]
Info: .text Info: .text
Address: 0x1100 Address: 0x1100
AddressAlign: 0x100 AddressAlign: 0x100
Relocations: Relocations:
- Offset: 0 - Offset: 0
Type: R_X86_64_NONE Type: R_X86_64_NONE
Addend: 1 Addend: 1
- Offset: 0 - Offset: 0
Type: R_X86_64_NONE Type: R_X86_64_NONE
Addend: 1 Addend: 1
Symbol: sym Symbol: sym
- Offset: 0
Type: R_X86_64_NONE
Addend: 0x456
Symbol: 2
Symbols: Symbols:
- Name: sym - Name: sym
Value: 0 Value: 0
Section: .text Section: .text
Binding: STB_GLOBAL Binding: STB_GLOBAL
- Value: 0x123
Section: .text
Binding: STB_GLOBAL
DynamicSymbols: DynamicSymbols:
- Name: sym - Name: sym
Value: 0 Value: 0
Section: .text Section: .text
Binding: STB_GLOBAL Binding: STB_GLOBAL
- Value: 0x123
Section: .text
Binding: STB_GLOBAL
ProgramHeaders: ProgramHeaders:
- Type: PT_LOAD - Type: PT_LOAD
VAddr: 0x1000 VAddr: 0x1000
Sections: Sections:
- Section: .rela.dyn - Section: .rela.dyn
- Section: .dynamic - Section: .dynamic
- Type: PT_DYNAMIC - Type: PT_DYNAMIC
VAddr: 0x1000 VAddr: 0x1000
Sections: Sections:
- Section: .dynamic - Section: .dynamic