This is an archive of the discontinued LLVM Phabricator instance.

Differential D120941

[lld-macho][nfc] Use %X in mapfile test
ClosedPublic

Authored by int3 on Mar 3 2022, 2:07 PM.

Details

Reviewers
Roger
thakis
Group Reviewers
Restricted Project
Commits
rG72c5b26f3d65: [lld-macho][nfc] Use %X in mapfile test
Summary

LLD (and ld64) emits uppercase hex addresses in the mapfile. The
map-file.s test passes right now because the addresses we emit happen
not to include any alphabets, but that can easily change.

I noticed this while dealing with
https://github.com/llvm/llvm-project/issues/54184.

Diff Detail

Event Timeline

int3 created this revision.Mar 3 2022, 2:07 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 3 2022, 2:07 PM
int3 requested review of this revision.Mar 3 2022, 2:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 3 2022, 2:07 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B152462: Diff 412837.Mar 3 2022, 2:34 PM
thakis accepted this revision.Mar 3 2022, 6:18 PM
thakis added a subscriber: thakis.

Lg

This revision is now accepted and ready to land.Mar 3 2022, 6:18 PM
Closed by commit rG72c5b26f3d65: [lld-macho][nfc] Use %X in mapfile test (authored by int3). · Explain WhyMar 4 2022, 11:23 AM
This revision was automatically updated to reflect the committed changes.
int3 added a commit: rG72c5b26f3d65: [lld-macho][nfc] Use %X in mapfile test.

Revision Contents

PathSize
lld/
test/
MachO/
16 lines

Diff 412837

lld/test/MachO/map-file.s

Show All 24 Lines
# CHECK-NEXT: # Path: {{.*}}{{/|\\}}map-file.s.tmp/test-map # CHECK-NEXT: # Path: {{.*}}{{/|\\}}map-file.s.tmp/test-map
# CHECK-NEXT: # Arch: x86_64 # CHECK-NEXT: # Arch: x86_64
# CHECK-NEXT: # Object files: # CHECK-NEXT: # Object files:
# CHECK-NEXT: [ 0] linker synthesized # CHECK-NEXT: [ 0] linker synthesized
# CHECK-NEXT: [ 1] {{.*}}{{/|\\}}map-file.s.tmp/test.o # CHECK-NEXT: [ 1] {{.*}}{{/|\\}}map-file.s.tmp/test.o
# CHECK-NEXT: [ 2] {{.*}}{{/|\\}}map-file.s.tmp/foo.o # CHECK-NEXT: [ 2] {{.*}}{{/|\\}}map-file.s.tmp/foo.o
# CHECK-NEXT: # Sections: # CHECK-NEXT: # Sections:
# CHECK-NEXT: # Address Size Segment Section # CHECK-NEXT: # Address Size Segment Section
# CHECK-NEXT: 0x[[#TEXT]] 0x{{[0-9a-f]+}} __TEXT __text # CHECK-NEXT: 0x[[#%X,TEXT]] 0x{{[0-9a-f]+}} __TEXT __text
# CHECK-NEXT: 0x[[#DATA]] 0x{{[0-9a-f]+}} __TEXT obj # CHECK-NEXT: 0x[[#%X,DATA]] 0x{{[0-9a-f]+}} __TEXT obj
# CHECK-NEXT: 0x[[#BSS]] 0x{{[0-9a-f]+}} __DATA __common # CHECK-NEXT: 0x[[#%X,BSS]] 0x{{[0-9a-f]+}} __DATA __common
# CHECK-NEXT: # Symbols: # CHECK-NEXT: # Symbols:
# CHECK-NEXT: # Address File Name # CHECK-NEXT: # Address File Name
# CHECK-NEXT: 0x[[#MAIN]] [ 1] _main # CHECK-NEXT: 0x[[#%X,MAIN]] [ 1] _main
# CHECK-NEXT: 0x[[#FOO]] [ 2] _foo # CHECK-NEXT: 0x[[#%X,FOO]] [ 2] _foo
# CHECK-NEXT: 0x[[#NUMBER]] [ 1] _number # CHECK-NEXT: 0x[[#%X,NUMBER]] [ 1] _number
# RUN: %lld -map %t/c-string-literal-map %t/c-string-literal.o -o %t/c-string-literal-out # RUN: %lld -map %t/c-string-literal-map %t/c-string-literal.o -o %t/c-string-literal-out
# RUN: FileCheck --check-prefix=CSTRING %s < %t/c-string-literal-map # RUN: FileCheck --check-prefix=CSTRING %s < %t/c-string-literal-map
## C-string literals should be printed as "literal string: <C string literal>" ## C-string literals should be printed as "literal string: <C string literal>"
# CSTRING-LABEL: Symbols: # CSTRING-LABEL: Symbols:
# CSTRING-DAG: _main # CSTRING-DAG: _main
# CSTRING-DAG: literal string: Hello world!\n # CSTRING-DAG: literal string: Hello world!\n
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines