This is an archive of the discontinued LLVM Phabricator instance.

Differential D88023

[LLD][ELF][test] Fix CHECKs in map-file test
ClosedPublic

Authored by edd on Sep 21 2020, 7:38 AM.

Details

Reviewers
grimar
MaskRay
psmith
ruiu
• espindola
Commits
rG0a6860521eb8: [LLD][ELF][test] Fix CHECKs in map-file test
Summary

A repeated typo in lld/test/ELF/map-file.s prevented a number of checks from being executed.

CHECk-NEXT -> CHECK-NEXT
^ ^

After correcting the typo, a small adjustment was needed to match the size of the synthetic .comment section (which always contains "LLD 1.0" in the test environment).

Diff Detail

Event Timeline

edd created this revision.Sep 21 2020, 7:38 AM
Herald added a reviewer: • espindola. · View Herald TranscriptSep 21 2020, 7:38 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, emaste. · View Herald Transcript
edd requested review of this revision.Sep 21 2020, 7:38 AM
grimar accepted this revision.Sep 21 2020, 7:39 AM

LGTM, thanks!

This revision is now accepted and ready to land.Sep 21 2020, 7:39 AM
edd added a comment.Sep 21 2020, 7:48 AM

Thanks for the review. I don't have commit access. Would you be willing to commit on my behalf?

grimar added a comment.Sep 21 2020, 7:48 AM
In D88023#2285358, @edd wrote:

Thanks for the review. I don't have commit access. Would you be willing to commit on my behalf?

Sure.

grimar added a comment.EditedSep 21 2020, 7:50 AM

I need the name and email you'd like to use to set patch author info.
E.g:

Name Surname <namesurname@mail.com>
edd added a comment.Sep 21 2020, 8:00 AM
In D88023#2285370, @grimar wrote:

I need the name and email you'd like to use to set patch author info.
E.g:

Name Surname <namesurname@mail.com>
Edd Dawson <edd.dawson@sony.com>

Thanks!

Harbormaster completed remote builds in B72383: Diff 293166.Sep 21 2020, 8:14 AM
MaskRay accepted this revision.Sep 21 2020, 8:36 AM

LGTM.

Closed by commit rG0a6860521eb8: [LLD][ELF][test] Fix CHECKs in map-file test (authored by edd, committed by grimar). · Explain WhySep 21 2020, 8:39 AM
This revision was automatically updated to reflect the committed changes.
grimar added a commit: rG0a6860521eb8: [LLD][ELF][test] Fix CHECKs in map-file test.

Revision Contents

PathSize
lld/
test/
ELF/
32 lines

Diff 293185

lld/test/ELF/map-file.s

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
# CHECK-NEXT: 2013f8 2013f8 0 1 baz # CHECK-NEXT: 2013f8 2013f8 0 1 baz
# CHECK-NEXT: 201400 201400 30 16 .plt # CHECK-NEXT: 201400 201400 30 16 .plt
# CHECK-NEXT: 201400 201400 30 16 <internal>:(.plt) # CHECK-NEXT: 201400 201400 30 16 <internal>:(.plt)
# CHECK-NEXT: 201410 201410 0 1 sharedFunc1 # CHECK-NEXT: 201410 201410 0 1 sharedFunc1
# CHECK-NEXT: 201420 201420 0 1 sharedFunc2 # CHECK-NEXT: 201420 201420 0 1 sharedFunc2
# CHECK-NEXT: 202430 202430 100 8 .dynamic # CHECK-NEXT: 202430 202430 100 8 .dynamic
# CHECK-NEXT: 202430 202430 100 8 <internal>:(.dynamic) # CHECK-NEXT: 202430 202430 100 8 <internal>:(.dynamic)
# CHECK-NEXT: 203530 203530 28 8 .got.plt # CHECK-NEXT: 203530 203530 28 8 .got.plt
# CHECk-NEXT: 203530 203530 28 8 <internal>:(.got.plt) # CHECK-NEXT: 203530 203530 28 8 <internal>:(.got.plt)
# CHECk-NEXT: 203560 203560 10 16 .bss # CHECK-NEXT: 203560 203560 10 16 .bss
# CHECk-NEXT: 203560 203560 4 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON) # CHECK-NEXT: 203560 203560 4 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON)
# CHECk-NEXT: 203560 203560 4 1 common # CHECK-NEXT: 203560 203560 4 1 common
# CHECk-NEXT: 203564 203564 4 1 <internal>:(.bss) # CHECK-NEXT: 203564 203564 4 1 <internal>:(.bss)
# CHECk-NEXT: 203564 203564 4 1 sharedFoo # CHECK-NEXT: 203564 203564 4 1 sharedFoo
# CHECk-NEXT: 203568 203568 8 1 <internal>:(.bss) # CHECK-NEXT: 203568 203568 8 1 <internal>:(.bss)
# CHECk-NEXT: 203568 203568 8 1 sharedBar # CHECK-NEXT: 203568 203568 8 1 sharedBar
# CHECk-NEXT: 0 0 48 1 .comment # CHECK-NEXT: 0 0 8 1 .comment
# CHECk-NEXT: 0 0 48 1 <internal>:(.comment) # CHECK-NEXT: 0 0 8 1 <internal>:(.comment)
# CHECk-NEXT: 0 0 198 8 .symtab # CHECK-NEXT: 0 0 198 8 .symtab
# CHECk-NEXT: 0 0 198 8 <internal>:(.symtab) # CHECK-NEXT: 0 0 198 8 <internal>:(.symtab)
# CHECk-NEXT: 0 0 84 1 .shstrtab # CHECK-NEXT: 0 0 84 1 .shstrtab
# CHECk-NEXT: 0 0 84 1 <internal>:(.shstrtab) # CHECK-NEXT: 0 0 84 1 <internal>:(.shstrtab)
# CHECk-NEXT: 0 0 6d 1 .strtab # CHECK-NEXT: 0 0 6d 1 .strtab
# CHECk-NEXT: 0 0 6d 1 <internal>:(.strtab) # CHECK-NEXT: 0 0 6d 1 <internal>:(.strtab)
# RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o /dev/null -Map=/ 2>&1 \ # RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o /dev/null -Map=/ 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s # RUN: | FileCheck --check-prefix=FAIL %s
# FAIL: cannot open map file / # FAIL: cannot open map file /