This is an archive of the discontinued LLVM Phabricator instance.

Differential D116813

[lld][macho] Fix test to sort symbol table before dumping
ClosedPublic

Authored by oontvoo on Jan 7 2022, 8:13 AM.

Details

Reviewers
int3
MaskRay
Group Reviewers
Restricted Project
Commits
rG14779644133d: [lld][macho]Fix test to sort symbol table before dumping
Summary

Detail: The test previously expected a specific order of those symbols,
which is not guaranteed (could change simply due to hashing changes, etc).
So have it explicitly sort the symbols before checking the content.

PR/53026

Diff Detail

Event Timeline

oontvoo created this revision.Jan 7 2022, 8:13 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 7 2022, 8:13 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
oontvoo requested review of this revision.Jan 7 2022, 8:13 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 7 2022, 8:13 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
oontvoo added a parent revision: D116787: [llvm-readobj][MachO] Add option to sort the symbol table before dumping (MachO only, for now)..Jan 7 2022, 8:14 AM
oontvoo updated this revision to Diff 398156.Jan 7 2022, 8:16 AM

fix values

Harbormaster completed remote builds in B142093: Diff 398156.Jan 7 2022, 8:34 AM
int3 accepted this revision.Jan 7 2022, 2:07 PM
int3 added a subscriber: int3.

Thanks!

This revision is now accepted and ready to land.Jan 7 2022, 2:07 PM
MaskRay accepted this revision.Jan 7 2022, 3:32 PM
oontvoo updated this revision to Diff 421941.Apr 11 2022, 9:00 AM

rebase before submitting

Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2022, 9:00 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
Harbormaster completed remote builds in B159025: Diff 421941.Apr 11 2022, 9:01 AM
This revision was landed with ongoing or failed builds.Apr 11 2022, 9:01 AM
Closed by commit rG14779644133d: [lld][macho]Fix test to sort symbol table before dumping (authored by oontvoo). · Explain Why
This revision was automatically updated to reflect the committed changes.
oontvoo added a commit: rG14779644133d: [lld][macho]Fix test to sort symbol table before dumping.

Revision Contents

PathSize
lld/
test/
MachO/
90 lines

Diff 398154

lld/test/MachO/symtab.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: rm -rf %t && split-file %s %t # RUN: rm -rf %t && split-file %s %t
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test2.s -o %t/test2.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test2.s -o %t/test2.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o
# RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib # RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib
# RUN: %lld -lSystem %t/test.o %t/test2.o %t/libfoo.dylib -o %t/test # RUN: %lld -lSystem %t/test.o %t/test2.o %t/libfoo.dylib -o %t/test
# RUN: llvm-readobj --syms --macho-dysymtab %t/test | FileCheck %s # RUN: llvm-readobj --syms --sort-symbols --macho-dysymtab %t/test | FileCheck %s
# CHECK: Symbols [ # CHECK: Symbols [
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _local # CHECK-NEXT: Name: __dyld_private (9)
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __data # CHECK-NEXT: Section: __data (0x6)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x100002010
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: __dyld_private # CHECK-NEXT: Name: __mh_execute_header (122)
# CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __data # CHECK-NEXT: Section: __text (0x1)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x10)
# CHECK-NEXT: ReferencedDynamically (0x10)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x100000000
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _private_external # CHECK-NEXT: Name: _dynamic (113)
# CHECK-NEXT: PrivateExtern # CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Undef (0x0)
# CHECK-NEXT: Section: __text (0x1) # CHECK-NEXT: Section: (0x0)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x200)
# CHECK-NEXT: AltEntry (0x200)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x0
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _private_external_weak # CHECK-NEXT: Name: _external (103)
# CHECK-NEXT: PrivateExtern # CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __text (0x1) # CHECK-NEXT: Section: __data (0x6)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x100002008
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _main # CHECK-NEXT: Name: _external_weak (47)
# CHECK-NEXT: Extern # CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __text (0x1) # CHECK-NEXT: Section: __text (0x1)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x80)
# CHECK-NEXT: WeakDef (0x80)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x100000568
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _external_weak # CHECK-NEXT: Name: _local (2)
# CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __text (0x1) # CHECK-NEXT: Section: __data (0x6)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x80) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: WeakDef (0x80)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x100002009
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _external # CHECK-NEXT: Name: _main (24)
# CHECK-NEXT: Extern # CHECK-NEXT: Extern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __data # CHECK-NEXT: Section: __text (0x1)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x1{{[0-9a-f]*}} # CHECK-NEXT: Value: 0x10000056B
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: __mh_execute_header # CHECK-NEXT: Name: _private_external (62)
# CHECK-NEXT: Extern # CHECK-NEXT: PrivateExtern
# CHECK-NEXT: Type: Section (0xE) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: __text (0x1) # CHECK-NEXT: Section: __text (0x1)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x10) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: ReferencedDynamically (0x10)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x100000000 # CHECK-NEXT: Value: 0x100000569
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: dyld_stub_binder # CHECK-NEXT: Name: _private_external_weak (80)
# CHECK-NEXT: Extern # CHECK-NEXT: PrivateExtern
# CHECK-NEXT: Type: Undef (0x0) # CHECK-NEXT: Type: Section (0xE)
# CHECK-NEXT: Section: (0x0) # CHECK-NEXT: Section: __text (0x1)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x100) # CHECK-NEXT: Flags [ (0x0)
# CHECK-NEXT: SymbolResolver (0x100)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x0 # CHECK-NEXT: Value: 0x10000056A
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Symbol { # CHECK-NEXT: Symbol {
# CHECK-NEXT: Name: _dynamic # CHECK-NEXT: Name: dyld_stub_binder (30)
# CHECK-NEXT: Extern # CHECK-NEXT: Extern
# CHECK-NEXT: Type: Undef (0x0) # CHECK-NEXT: Type: Undef (0x0)
# CHECK-NEXT: Section: (0x0) # CHECK-NEXT: Section: (0x0)
# CHECK-NEXT: RefType: UndefinedNonLazy (0x0) # CHECK-NEXT: RefType: UndefinedNonLazy (0x0)
# CHECK-NEXT: Flags [ (0x200) # CHECK-NEXT: Flags [ (0x100)
# CHECK-NEXT: AltEntry (0x200) # CHECK-NEXT: SymbolResolver (0x100)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Value: 0x0 # CHECK-NEXT: Value: 0x0
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Dysymtab { # CHECK-NEXT: Dysymtab {
# CHECK-NEXT: ilocalsym: 0 # CHECK-NEXT: ilocalsym: 0
# CHECK-NEXT: nlocalsym: 4 # CHECK-NEXT: nlocalsym: 4
# CHECK-NEXT: iextdefsym: 4 # CHECK-NEXT: iextdefsym: 4
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines