This is an archive of the discontinued LLVM Phabricator instance.

Differential D143727

[Test][lldb] Fix YAML mapping keys duplication. NFC.
ClosedPublic

Authored by asi-sc on Feb 10 2023, 4:39 AM.

Details

Reviewers
clayborg
DavidSpickett
Commits
rGafe9b0ba87b7: [Test][lldb] Fix YAML mapping keys duplication. NFC.
Summary

YAML specification does not allow keys duplication an a mapping. However, YAML
parser in LLVM does not have any check on that and uses only the last key entry.
In this change duplicated keys are merged to satisfy the spec.

Diff Detail

Event Timeline

asi-sc created this revision.Feb 10 2023, 4:39 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 10 2023, 4:39 AM
asi-sc requested review of this revision.Feb 10 2023, 4:39 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 10 2023, 4:39 AM
Herald added a subscriber: lldb-commits. · View Herald Transcript
asi-sc added a reviewer: clayborg.Feb 10 2023, 4:39 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptFeb 10 2023, 4:39 AM
asi-sc added a comment.Feb 10 2023, 4:41 AM

Similar fixes review: D141848
LLVM YAML parser improvement that depends on this: D140474

Harbormaster completed remote builds in B213021: Diff 496428.Feb 13 2023, 12:21 AM
DavidSpickett accepted this revision.Feb 13 2023, 1:58 AM
DavidSpickett added a reviewer: DavidSpickett.
DavidSpickett added a subscriber: DavidSpickett.

LGTM.

This revision was not accepted when it landed; it landed in state Needs Review.Feb 13 2023, 5:42 AM
Closed by commit rGafe9b0ba87b7: [Test][lldb] Fix YAML mapping keys duplication. NFC. (authored by asi-sc). · Explain Why
This revision was automatically updated to reflect the committed changes.
asi-sc added a commit: rGafe9b0ba87b7: [Test][lldb] Fix YAML mapping keys duplication. NFC..
asi-sc mentioned this in rG388d679c1dfa: Recommit [YAML IO] Check that mapping doesn't contain duplicating keys.Feb 13 2023, 6:52 AM

Revision Contents

PathSize
lldb/
test/
API/
functionalities/
postmortem/
minidump-new/
1 line
1 line
1 line

Diff 496428

lldb/test/API/functionalities/postmortem/minidump-new/libbreakpad-decoy.yaml

# This has different .text contents than libbreakpad-yaml, # This has different .text contents than libbreakpad-yaml,
# to simulate having different versions of the module (to # to simulate having different versions of the module (to
# test that we pick the one matching the minidump UUID). # test that we pick the one matching the minidump UUID).
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS32 Class: ELFCLASS32
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_ARM Machine: EM_ARM
Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ] Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ]
Sections: Sections:
Sections:
- Name: .text - Name: .text
Type: SHT_PROGBITS Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ] Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0x0000000000010000 Address: 0x0000000000010000
AddressAlign: 0x0000000000000004 AddressAlign: 0x0000000000000004
Content: 040000001400000003000000474E5500CC Content: 040000001400000003000000474E5500CC

lldb/test/API/functionalities/postmortem/minidump-new/libbreakpad-overflow.yaml

--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS32 Class: ELFCLASS32
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_ARM Machine: EM_ARM
Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ] Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ]
Sections: Sections:
Sections:
- Name: .text - Name: .text
Type: SHT_PROGBITS Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ] Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0x0000000000010000 Address: 0x0000000000010000
AddressAlign: 0x0000000000000001 AddressAlign: 0x0000000000000001
Content: 04 Content: 04
- Name: .data - Name: .data
Type: SHT_PROGBITS Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_WRITE ] Flags: [ SHF_ALLOC, SHF_WRITE ]
Address: 0x0000000000010001 Address: 0x0000000000010001
AddressAlign: 0x0000000000000001 AddressAlign: 0x0000000000000001
Content: 0000001400000003000000474E5500 Content: 0000001400000003000000474E5500

lldb/test/API/functionalities/postmortem/minidump-new/libbreakpad.yaml

--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS32 Class: ELFCLASS32
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_ARM Machine: EM_ARM
Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ] Flags: [ EF_ARM_SOFT_FLOAT, EF_ARM_EABI_VER5 ]
Sections: Sections:
Sections:
- Name: .text - Name: .text
Type: SHT_PROGBITS Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ] Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0x0000000000010000 Address: 0x0000000000010000
AddressAlign: 0x0000000000000004 AddressAlign: 0x0000000000000004
Content: 040000001400000003000000474E5500 Content: 040000001400000003000000474E5500