This is an archive of the discontinued LLVM Phabricator instance.

Differential D119203

[test][llvm-objcopy/mac] Fix invalid strip tests
ClosedPublic

Authored by keith on Feb 7 2022, 4:42 PM.

Details

Reviewers
alexander-shaposhnikov
rupprecht
jhenderson
Commits
rG4669cc93948e: [test][llvm-objcopy/mac] Fix invalid strip tests
Summary

I discovered some of these tests had cmp statements that weren't
actually being run. I had also recently copied this broken setup for a
new test around chained fixups. Fixing this revealed that the binaries
did differ because of their code signature so I regenerated the fixture
here with this source:

c
int main() {
   return 0;
}

Passing -Wl,-no_adhoc_codesign on my M1 machine to make sure it didn't
get any signature.

Diff Detail

Event Timeline

keith created this revision.Feb 7 2022, 4:42 PM
Herald added a reviewer: alexander-shaposhnikov. · View Herald TranscriptFeb 7 2022, 4:42 PM
Herald added a reviewer: rupprecht. · View Herald Transcript
Herald added a reviewer: jhenderson. · View Herald Transcript
Herald added a subscriber: abrachet. · View Herald Transcript
keith requested review of this revision.Feb 7 2022, 4:42 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 7 2022, 4:42 PM
Herald added subscribers: llvm-commits, MaskRay. · View Herald Transcript
keith updated this revision to Diff 406651.Feb 7 2022, 4:44 PM

Formatting fixes

alexander-shaposhnikov accepted this revision.Feb 7 2022, 6:31 PM

LG, thanks!

This revision is now accepted and ready to land.Feb 7 2022, 6:31 PM
This revision was landed with ongoing or failed builds.Feb 7 2022, 8:07 PM
Closed by commit rG4669cc93948e: [test][llvm-objcopy/mac] Fix invalid strip tests (authored by keith). · Explain Why
This revision was automatically updated to reflect the committed changes.
keith added a commit: rG4669cc93948e: [test][llvm-objcopy/mac] Fix invalid strip tests.
Harbormaster completed remote builds in B148131: Diff 406651.Feb 7 2022, 8:22 PM

Revision Contents

PathSize
llvm/
test/
tools/
llvm-objcopy/
MachO/
Inputs/
131 lines
16 lines

Diff 406688

llvm/test/tools/llvm-objcopy/MachO/Inputs/strip-chained-fixups.yaml

--- !mach-o --- !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x100000C cputype: 0x100000C
cpusubtype: 0x0 cpusubtype: 0x0
filetype: 0x2 filetype: 0x2
ncmds: 16 ncmds: 15
sizeofcmds: 744 sizeofcmds: 728
flags: 0x200085 flags: 0x200085
reserved: 0x0 reserved: 0x0
LoadCommands: LoadCommands:
- cmd: LC_SEGMENT_64 - cmd: LC_SEGMENT_64
cmdsize: 72 cmdsize: 72
segname: __PAGEZERO segname: __PAGEZERO
vmaddr: 0 vmaddr: 0
vmsize: 4294967296 vmsize: 4294967296
Show All 12 Lines - cmd: LC_SEGMENT_64
filesize: 16384 filesize: 16384
maxprot: 5 maxprot: 5
initprot: 5 initprot: 5
nsects: 2 nsects: 2
flags: 0 flags: 0
Sections: Sections:
- sectname: __text - sectname: __text
segname: __TEXT segname: __TEXT
addr: 0x100003F98 addr: 0x100003FA4
size: 24 size: 20
offset: 0x3F98 offset: 0x3FA4
align: 2 align: 2
reloff: 0x0 reloff: 0x0
nreloc: 0 nreloc: 0
flags: 0x80000400 flags: 0x80000400
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
reserved3: 0x0 reserved3: 0x0
content: C0035FD6FF4300D100008052FF0F00B9FF430091C0035FD6 content: FF4300D100008052FF0F00B9FF430091C0035FD6
- sectname: __unwind_info - sectname: __unwind_info
segname: __TEXT segname: __TEXT
addr: 0x100003FB0 addr: 0x100003FB8
size: 80 size: 72
offset: 0x3FB0 offset: 0x3FB8
align: 2 align: 2
reloff: 0x0 reloff: 0x0
nreloc: 0 nreloc: 0
flags: 0x0 flags: 0x0
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
reserved3: 0x0 reserved3: 0x0
content: 010000001C000000000000001C000000000000001C00000002000000983F00003400000034000000B13F00000000000034000000030000000C0002001400020000000001040000000010000200000002 content: 010000001C000000000000001C000000000000001C00000002000000A43F00003400000034000000B93F00000000000034000000030000000C000100100001000000000000100002
- cmd: LC_SEGMENT_64 - cmd: LC_SEGMENT_64
cmdsize: 72 cmdsize: 72
segname: __LINKEDIT segname: __LINKEDIT
vmaddr: 4294983680 vmaddr: 4294983680
vmsize: 16384 vmsize: 16384
fileoff: 16384 fileoff: 16384
filesize: 753 filesize: 176
maxprot: 1 maxprot: 1
initprot: 1 initprot: 1
nsects: 0 nsects: 0
flags: 0 flags: 0
- cmd: LC_DYLD_CHAINED_FIXUPS - cmd: LC_DYLD_CHAINED_FIXUPS
cmdsize: 16 cmdsize: 16
dataoff: 16384 dataoff: 16384
datasize: 56 datasize: 56
- cmd: LC_DYLD_EXPORTS_TRIE - cmd: LC_DYLD_EXPORTS_TRIE
cmdsize: 16 cmdsize: 16
dataoff: 16440 dataoff: 16440
datasize: 56 datasize: 48
- cmd: LC_SYMTAB - cmd: LC_SYMTAB
cmdsize: 24 cmdsize: 24
symoff: 16504 symoff: 16496
nsyms: 15 nsyms: 2
stroff: 16744 stroff: 16528
strsize: 120 strsize: 32
- cmd: LC_DYSYMTAB - cmd: LC_DYSYMTAB
cmdsize: 80 cmdsize: 80
ilocalsym: 0 ilocalsym: 0
nlocalsym: 12 nlocalsym: 0
iextdefsym: 12 iextdefsym: 0
nextdefsym: 3 nextdefsym: 2
iundefsym: 15 iundefsym: 2
nundefsym: 0 nundefsym: 0
tocoff: 0 tocoff: 0
ntoc: 0 ntoc: 0
modtaboff: 0 modtaboff: 0
nmodtab: 0 nmodtab: 0
extrefsymoff: 0 extrefsymoff: 0
nextrefsyms: 0 nextrefsyms: 0
indirectsymoff: 0 indirectsymoff: 0
nindirectsyms: 0 nindirectsyms: 0
extreloff: 0 extreloff: 0
nextrel: 0 nextrel: 0
locreloff: 0 locreloff: 0
nlocrel: 0 nlocrel: 0
- cmd: LC_LOAD_DYLINKER - cmd: LC_LOAD_DYLINKER
cmdsize: 32 cmdsize: 32
name: 12 name: 12
Content: '/usr/lib/dyld' Content: '/usr/lib/dyld'
ZeroPadBytes: 7 ZeroPadBytes: 7
- cmd: LC_UUID - cmd: LC_UUID
cmdsize: 24 cmdsize: 24
uuid: F445529E-643C-3A38-8F59-AB64566BCAFF uuid: 9F5977A4-F4EB-3BE2-BB19-E21B49454091
- cmd: LC_BUILD_VERSION - cmd: LC_BUILD_VERSION
cmdsize: 32 cmdsize: 32
platform: 1 platform: 1
minos: 786432 minos: 786432
sdk: 786432 sdk: 786688
ntools: 1 ntools: 1
Tools: Tools:
- tool: 3 - tool: 3
version: 46596096 version: 46596096
- cmd: LC_SOURCE_VERSION - cmd: LC_SOURCE_VERSION
cmdsize: 16 cmdsize: 16
version: 0 version: 0
- cmd: LC_MAIN - cmd: LC_MAIN
cmdsize: 24 cmdsize: 24
entryoff: 16284 entryoff: 16292
stacksize: 0 stacksize: 0
- cmd: LC_LOAD_DYLIB - cmd: LC_LOAD_DYLIB
cmdsize: 56 cmdsize: 56
dylib: dylib:
name: 24 name: 24
timestamp: 2 timestamp: 2
current_version: 85917696 current_version: 85917696
compatibility_version: 65536 compatibility_version: 65536
Content: '/usr/lib/libSystem.B.dylib' Content: '/usr/lib/libSystem.B.dylib'
ZeroPadBytes: 6 ZeroPadBytes: 6
- cmd: LC_FUNCTION_STARTS - cmd: LC_FUNCTION_STARTS
cmdsize: 16 cmdsize: 16
dataoff: 16496 dataoff: 16488
datasize: 8 datasize: 8
- cmd: LC_DATA_IN_CODE - cmd: LC_DATA_IN_CODE
cmdsize: 16 cmdsize: 16
dataoff: 16504 dataoff: 16496
datasize: 0 datasize: 0
- cmd: LC_CODE_SIGNATURE
cmdsize: 16
dataoff: 16864
datasize: 273
LinkEditData: LinkEditData:
NameList: NameList:
- n_strx: 33
n_type: 0x64
n_sect: 0
n_desc: 0
n_value: 0
- n_strx: 39
n_type: 0x64
n_sect: 0
n_desc: 0
n_value: 0
- n_strx: 46
n_type: 0x66
n_sect: 0
n_desc: 1
n_value: 1636754403
- n_strx: 1
n_type: 0x2E
n_sect: 1
n_desc: 0
n_value: 4294983576
- n_strx: 109
n_type: 0x24
n_sect: 1
n_desc: 0
n_value: 4294983576
- n_strx: 1
n_type: 0x24
n_sect: 0
n_desc: 0
n_value: 4
- n_strx: 1
n_type: 0x4E
n_sect: 1
n_desc: 0
n_value: 4
- n_strx: 1
n_type: 0x2E
n_sect: 1
n_desc: 0
n_value: 4294983580
- n_strx: 114
n_type: 0x24
n_sect: 1
n_desc: 0
n_value: 4294983580
- n_strx: 1
n_type: 0x24
n_sect: 0
n_desc: 0
n_value: 20
- n_strx: 1
n_type: 0x4E
n_sect: 1
n_desc: 0
n_value: 20
- n_strx: 1
n_type: 0x64
n_sect: 1
n_desc: 0
n_value: 0
- n_strx: 2 - n_strx: 2
n_type: 0xF n_type: 0xF
n_sect: 1 n_sect: 1
n_desc: 16 n_desc: 16
n_value: 4294967296 n_value: 4294967296
- n_strx: 22 - n_strx: 22
n_type: 0xF n_type: 0xF
n_sect: 1 n_sect: 1
n_desc: 0 n_desc: 0
n_value: 4294983576 n_value: 4294983588
- n_strx: 27
n_type: 0xF
n_sect: 1
n_desc: 0
n_value: 4294983580
StringTable: StringTable:
- ' ' - ' '
- __mh_execute_header - __mh_execute_header
- _foo
- _main
- '/tmp/'
- main.c
- '/var/folders/gj/wf3swl0x215b2sq1qy84kzkm0000gn/T/main-e32fe7.o'
- _foo
- _main - _main
- ''
- ''
- ''
- ''
... ...

llvm/test/tools/llvm-objcopy/MachO/strip-all.test

Show All 18 Lines
# RUN: llvm-objcopy --strip-all %t.fixups %t.fixups.stripped # RUN: llvm-objcopy --strip-all %t.fixups %t.fixups.stripped
# RUN: llvm-readobj --sections --relocations --symbols %t.fixups.stripped \ # RUN: llvm-readobj --sections --relocations --symbols %t.fixups.stripped \
# RUN: | FileCheck --check-prefix=COMMON %s # RUN: | FileCheck --check-prefix=COMMON %s
## The output of "llvm-strip" should be identical with that of ## The output of "llvm-strip" should be identical with that of
## "llvm-strip --strip-all" and "llvm-objcopy --strip-all". ## "llvm-strip --strip-all" and "llvm-objcopy --strip-all".
# RUN: llvm-strip %t.exec -o %t2 # RUN: llvm-strip %t.exec -o %t2
# RUN: llvm-strip --strip-all %t.exec -o %t3 # RUN: llvm-strip --strip-all %t.exec -o %t3
# cmp %t2 %t.exec.stripped # RUN: cmp %t2 %t.exec.stripped
# cmp %t3 %t.exec.stripped # RUN: cmp %t3 %t.exec.stripped
# RUN: llvm-strip %t.dwarf -o %t4 # RUN: llvm-strip %t.dwarf -o %t4
# RUN: llvm-strip --strip-all %t.dwarf -o %t5 # RUN: llvm-strip --strip-all %t.dwarf -o %t5
# cmp %t4 %t.dwarf.stripped # RUN: cmp %t4 %t.dwarf.stripped
# cmp %t5 %t.dwarf.stripped # RUN: cmp %t5 %t.dwarf.stripped
# RUN: llvm-lipo %t.dwarf -create -output %t.dwarf.universal # RUN: llvm-lipo %t.dwarf -create -output %t.dwarf.universal
# RUN: llvm-strip %t.dwarf.universal -o %t.dwarf.universal.stripped # RUN: llvm-strip %t.dwarf.universal -o %t.dwarf.universal.stripped
# RUN: llvm-lipo %t.dwarf.universal.stripped -thin x86_64 -output %t6 # RUN: llvm-lipo %t.dwarf.universal.stripped -thin x86_64 -output %t6
# RUN: cmp %t6 %t.dwarf.stripped # RUN: cmp %t6 %t.dwarf.stripped
# RUN: llvm-strip %t.exec -o %t7 # RUN: llvm-strip %t.fixups -o %t7
# RUN: llvm-strip --strip-all %t.exec -o %t8 # RUN: llvm-strip --strip-all %t.fixups -o %t8
# cmp %t7 %t.fixups.stripped # RUN: cmp %t7 %t.fixups.stripped
# cmp %t8 %t.fixups.stripped # RUN: cmp %t8 %t.fixups.stripped
## Make sure that debug sections are removed. ## Make sure that debug sections are removed.
# DWARF: Sections [ # DWARF: Sections [
# DWARF-NOT: Name: __debug_str # DWARF-NOT: Name: __debug_str
# DWARF-NOT: Name: __debug_abbrev # DWARF-NOT: Name: __debug_abbrev
# DWARF-NOT: Name: __debug_info # DWARF-NOT: Name: __debug_info
# DWARF-NOT: Name: __debug_macinfo # DWARF-NOT: Name: __debug_macinfo
# DWARF-NOT: Name: __apple_names # DWARF-NOT: Name: __apple_names
Show All 23 Lines