This is an archive of the discontinued LLVM Phabricator instance.

Differential D60438

[llvm-readobj] Should declare `ListScope` for `verneed` entries.
ClosedPublic

Authored by Higuoxing on Apr 8 2019, 8:33 PM.

Details

Reviewers
jhenderson
grimar
rupprecht
• espindola
ruiu
Commits
rG8ab74145808b: [llvm-readobj] Should declare `ListScope` for `verneed` entries.
rL358078: [llvm-readobj] Should declare `ListScope` for `verneed` entries.
rLLD358078: [llvm-readobj] Should declare `ListScope` for `verneed` entries.
Summary

YAML mappings require keys to be unique. See: https://yaml.org/spec/1.2/spec.html#id2764652

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

Higuoxing created this revision.Apr 8 2019, 8:33 PM
Herald added a reviewer: • espindola. · View Herald TranscriptApr 8 2019, 8:33 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, MaskRay, arichardson, emaste. · View Herald Transcript
Harbormaster completed remote builds in B30211: Diff 194241.Apr 8 2019, 8:34 PM
ruiu added a subscriber: ruiu.Apr 8 2019, 8:51 PM

Looks like this is a correct patch, as YAML requires map keys to be unique (https://yaml.org/spec/1.2/spec.html#id2764652)

ruiu added a comment.Apr 8 2019, 8:51 PM

Can you mention that in the commit message?

Higuoxing added a comment.Apr 8 2019, 8:53 PM
In D60438#1459144, @ruiu wrote:

Can you mention that in the commit message?

Sure, thanks a lot.

Higuoxing updated this revision to Diff 194307.Apr 9 2019, 6:30 AM

Addressed @ruiu 's comments.

  • Add commit message.
Harbormaster completed remote builds in B30231: Diff 194307.Apr 9 2019, 6:30 AM
Higuoxing edited the summary of this revision. (Show Details)Apr 9 2019, 6:32 AM
ruiu accepted this revision.Apr 10 2019, 2:08 AM

LGTM

This revision is now accepted and ready to land.Apr 10 2019, 2:08 AM
Closed by commit rLLD358078: [llvm-readobj] Should declare `ListScope` for `verneed` entries. (authored by Higuoxing). · Explain WhyApr 10 2019, 5:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
ELF/
26 lines
40 lines

Diff 194500

test/ELF/verdef-defaultver.s

Show First 20 Lines • Show All 173 Lines • ▼ Show 20 Lines
# EXE-NEXT: } # EXE-NEXT: }
# EXE-NEXT: SHT_GNU_verdef { # EXE-NEXT: SHT_GNU_verdef {
# EXE-NEXT: } # EXE-NEXT: }
# EXE-NEXT: SHT_GNU_verneed { # EXE-NEXT: SHT_GNU_verneed {
# EXE-NEXT: Dependency { # EXE-NEXT: Dependency {
# EXE-NEXT: Version: 1 # EXE-NEXT: Version: 1
# EXE-NEXT: Count: 2 # EXE-NEXT: Count: 2
# EXE-NEXT: FileName: shared # EXE-NEXT: FileName: shared
# EXE-NEXT: Entries [
# EXE-NEXT: Entry { # EXE-NEXT: Entry {
# EXE-NEXT: Hash: 1425 # EXE-NEXT: Hash: 1425
# EXE-NEXT: Flags: 0x0 # EXE-NEXT: Flags: 0x0
# EXE-NEXT: Index: 2 # EXE-NEXT: Index: 2
# EXE-NEXT: Name: V1 # EXE-NEXT: Name: V1
# EXE-NEXT: } # EXE-NEXT: }
# EXE-NEXT: Entry { # EXE-NEXT: Entry {
# EXE-NEXT: Hash: 1426 # EXE-NEXT: Hash: 1426
# EXE-NEXT: Flags: 0x0 # EXE-NEXT: Flags: 0x0
# EXE-NEXT: Index: 3 # EXE-NEXT: Index: 3
# EXE-NEXT: Name: V2 # EXE-NEXT: Name: V2
# EXE-NEXT: } # EXE-NEXT: }
# EXE-NEXT: ]
# EXE-NEXT: } # EXE-NEXT: }
# EXE-NEXT: } # EXE-NEXT: }
.globl _start .globl _start
_start: _start:
.long a - . .long a - .
.long b - . .long b - .
.long c - . .long c - .

test/ELF/verneed.s

Show First 20 Lines • Show All 142 Lines • ▼ Show 20 Lines
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: SHT_GNU_verdef { # CHECK-NEXT: SHT_GNU_verdef {
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: SHT_GNU_verneed { # CHECK-NEXT: SHT_GNU_verneed {
# CHECK-NEXT: Dependency { # CHECK-NEXT: Dependency {
# CHECK-NEXT: Version: 1 # CHECK-NEXT: Version: 1
# CHECK-NEXT: Count: 2 # CHECK-NEXT: Count: 2
# CHECK-NEXT: FileName: verneed1.so.0 # CHECK-NEXT: FileName: verneed1.so.0
# CHECK-NEXT: Entries [
# CHECK-NEXT: Entry { # CHECK-NEXT: Entry {
# CHECK-NEXT: Hash: 1938 # CHECK-NEXT: Hash: 1938
# CHECK-NEXT: Flags: 0x0 # CHECK-NEXT: Flags: 0x0
# CHECK-NEXT: Index: 3 # CHECK-NEXT: Index: 3
# CHECK-NEXT: Name: v2 # CHECK-NEXT: Name: v2
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Entry { # CHECK-NEXT: Entry {
# CHECK-NEXT: Hash: 1939 # CHECK-NEXT: Hash: 1939
# CHECK-NEXT: Flags: 0x0 # CHECK-NEXT: Flags: 0x0
# CHECK-NEXT: Index: 2 # CHECK-NEXT: Index: 2
# CHECK-NEXT: Name: v3 # CHECK-NEXT: Name: v3
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ]
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: Dependency { # CHECK-NEXT: Dependency {
# CHECK-NEXT: Version: 1 # CHECK-NEXT: Version: 1
# CHECK-NEXT: Count: 1 # CHECK-NEXT: Count: 1
# CHECK-NEXT: FileName: verneed2.so.0 # CHECK-NEXT: FileName: verneed2.so.0
# CHECK-NEXT: Entries [
# CHECK-NEXT: Entry { # CHECK-NEXT: Entry {
# CHECK-NEXT: Hash: 1937 # CHECK-NEXT: Hash: 1937
# CHECK-NEXT: Flags: 0x0 # CHECK-NEXT: Flags: 0x0
# CHECK-NEXT: Index: 4 # CHECK-NEXT: Index: 4
# CHECK-NEXT: Name: v1 # CHECK-NEXT: Name: v1
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ]
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: } # CHECK-NEXT: }
.globl _start .globl _start
_start: _start:
call f1@plt call f1@plt
call f2@plt call f2@plt
call g1@plt call g1@plt