This is an archive of the discontinued LLVM Phabricator instance.

Differential D87876

[DWARFYAML][test] Use 'CHECK-NEXT:' to make checkers stricter. NFC.
ClosedPublic

Authored by Higuoxing on Sep 17 2020, 7:46 PM.

Details

Reviewers
jhenderson
grimar
MaskRay
Commits
rGa761e81e2202: [DWARFYAML][test] Use 'CHECK-NEXT:' to make checkers stricter. NFC.
Summary

This patch makes checkers stricter so that we are able to avoid
some potential problems earlier.

Diff Detail

Event Timeline

Higuoxing created this revision.Sep 17 2020, 7:46 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 17 2020, 7:46 PM
Herald added subscribers: llvm-commits, Charusso. · View Herald Transcript
Higuoxing requested review of this revision.Sep 17 2020, 7:46 PM
Higuoxing updated this revision to Diff 292693.Sep 17 2020, 7:49 PM

Check the DWARF: tag.

Higuoxing added a child revision: D87878: [DWARFYAML] Make the include_directories, file_names and opcodes fields of the line table optional..Sep 17 2020, 8:03 PM
Harbormaster completed remote builds in B72122: Diff 292693.Sep 17 2020, 8:19 PM
Harbormaster completed remote builds in B72121: Diff 292692.
MaskRay accepted this revision.Sep 17 2020, 11:34 PM

LGTM.

This revision is now accepted and ready to land.Sep 17 2020, 11:34 PM
jhenderson accepted this revision.Sep 18 2020, 1:23 AM

Maybe worth stating in the description and/or title that you are using CHECK-NEXT explicitly to achieve this. Otherwise, LGTM.

Higuoxing retitled this revision from [DWARFYAML][test] Make checkers stricter. NFC. to [DWARFYAML][test] Use 'CHECK-NEXT:' to make checkers stricter. NFC..Sep 18 2020, 1:32 AM
This revision was landed with ongoing or failed builds.Sep 18 2020, 5:20 AM
Closed by commit rGa761e81e2202: [DWARFYAML][test] Use 'CHECK-NEXT:' to make checkers stricter. NFC. (authored by Higuoxing). · Explain Why
This revision was automatically updated to reflect the committed changes.
Higuoxing added a commit: rGa761e81e2202: [DWARFYAML][test] Use 'CHECK-NEXT:' to make checkers stricter. NFC..

Revision Contents

PathSize
llvm/
test/
ObjectYAML/
MachO/
80 lines
40 lines

Diff 292761

llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml

Show First 20 Lines • Show All 524 Lines • ▼ Show 20 Lines - Length: 65
- Opcode: DW_LNS_advance_pc - Opcode: DW_LNS_advance_pc
Data: 11 Data: 11
- Opcode: DW_LNS_extended_op - Opcode: DW_LNS_extended_op
ExtLen: 1 ExtLen: 1
SubOpcode: DW_LNE_end_sequence SubOpcode: DW_LNE_end_sequence
Data: 11 Data: 11
... ...
#CHECK: debug_line: # CHECK: debug_line:
#CHECK: - Length: 65 # CHECK-NEXT: - Length: 65
#CHECK: Version: 2 # CHECK-NEXT: Version: 2
#CHECK: PrologueLength: 36 # CHECK-NEXT: PrologueLength: 36
#CHECK: MinInstLength: 1 # CHECK-NEXT: MinInstLength: 1
#CHECK: DefaultIsStmt: 1 # CHECK-NEXT: DefaultIsStmt: 1
#CHECK: LineBase: 251 # CHECK-NEXT: LineBase: 251
#CHECK: LineRange: 14 # CHECK-NEXT: LineRange: 14
#CHECK: OpcodeBase: 13 # CHECK-NEXT: OpcodeBase: 13
#CHECK: StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ] # CHECK-NEXT: StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ]
#CHECK: IncludeDirs: # CHECK-NEXT: IncludeDirs:
#CHECK: Files: # CHECK-NEXT: Files:
#CHECK: - Name: hello_world.c # CHECK-NEXT: - Name: hello_world.c
#CHECK: DirIdx: 0 # CHECK-NEXT: DirIdx: 0
#CHECK: ModTime: 0 # CHECK-NEXT: ModTime: 0
#CHECK: Length: 0 # CHECK-NEXT: Length: 0
#CHECK: Opcodes: # CHECK-NEXT: Opcodes:
#CHECK: - Opcode: DW_LNS_extended_op # CHECK-NEXT: - Opcode: DW_LNS_extended_op
#CHECK: ExtLen: 9 # CHECK-NEXT: ExtLen: 9
#CHECK: SubOpcode: DW_LNE_set_address # CHECK-NEXT: SubOpcode: DW_LNE_set_address
#CHECK: Data: 4294971216 # CHECK-NEXT: Data: 4294971216
#CHECK: - Opcode: 0x14 # CHECK-NEXT: - Opcode: 0x14
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: - Opcode: DW_LNS_set_column # CHECK-NEXT: - Opcode: DW_LNS_set_column
#CHECK: Data: 3 # CHECK-NEXT: Data: 3
#CHECK: - Opcode: DW_LNS_set_prologue_end # CHECK-NEXT: - Opcode: DW_LNS_set_prologue_end
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: - Opcode: DW_LNS_const_add_pc # CHECK-NEXT: - Opcode: DW_LNS_const_add_pc
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: - Opcode: 0xBB # CHECK-NEXT: - Opcode: 0xBB
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: - Opcode: 0xBB # CHECK-NEXT: - Opcode: 0xBB
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: - Opcode: DW_LNS_advance_pc # CHECK-NEXT: - Opcode: DW_LNS_advance_pc
#CHECK: Data: 11 # CHECK-NEXT: Data: 11
#CHECK: - Opcode: DW_LNS_extended_op # CHECK-NEXT: - Opcode: DW_LNS_extended_op
#CHECK: ExtLen: 1 # CHECK-NEXT: ExtLen: 1
#CHECK: SubOpcode: DW_LNE_end_sequence # CHECK-NEXT: SubOpcode: DW_LNE_end_sequence
#CHECK: Data: 0 # CHECK-NEXT: Data: 0
#CHECK: ... # CHECK-NEXT: ...

llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml

Show First 20 Lines • Show All 321 Lines • ▼ Show 20 Lines debug_pubtypes:
UnitSize: 121 UnitSize: 121
Entries: Entries:
- DieOffset: 0x00000060 - DieOffset: 0x00000060
Name: int Name: int
- DieOffset: 0x00000071 - DieOffset: 0x00000071
Name: char Name: char
... ...
#CHECK: DWARF: # CHECK: DWARF:
#CHECK: debug_pubnames: # CHECK: debug_pubnames:
#CHECK: Length: 0x0000000000000017 # CHECK-NEXT: Length: 0x0000000000000017
#CHECK: Version: 2 # CHECK-NEXT: Version: 2
#CHECK: UnitOffset: 0 # CHECK-NEXT: UnitOffset: 0
#CHECK: UnitSize: 121 # CHECK-NEXT: UnitSize: 121
#CHECK: Entries: # CHECK-NEXT: Entries:
#CHECK: - DieOffset: 0x0000002A # CHECK-NEXT: - DieOffset: 0x0000002A
#CHECK: Name: main # CHECK-NEXT: Name: main
#CHECK: debug_pubtypes: # CHECK-NEXT: debug_pubtypes:
#CHECK: Length: 0x000000000000001F # CHECK-NEXT: Length: 0x000000000000001F
#CHECK: Version: 2 # CHECK-NEXT: Version: 2
#CHECK: UnitOffset: 0 # CHECK-NEXT: UnitOffset: 0
#CHECK: UnitSize: 121 # CHECK-NEXT: UnitSize: 121
#CHECK: Entries: # CHECK-NEXT: Entries:
#CHECK: - DieOffset: 0x00000060 # CHECK-NEXT: - DieOffset: 0x00000060
#CHECK: Name: int # CHECK-NEXT: Name: int
#CHECK: - DieOffset: 0x00000071 # CHECK-NEXT: - DieOffset: 0x00000071
#CHECK: Name: char # CHECK-NEXT: Name: char
#CHECK: ... # CHECK-NEXT: ...
## b) Test that yaml2obj will not emit the .debug_pubnames/.debug_pubtypes section's ## b) Test that yaml2obj will not emit the .debug_pubnames/.debug_pubtypes section's
## contents, if the "debug_pubnames"/"debug_pubtypes" entry doesn't exist in the ## contents, if the "debug_pubnames"/"debug_pubtypes" entry doesn't exist in the
## "DWARF" entry. ## "DWARF" entry.
# RUN: yaml2obj --docnum=2 %s -o %t2 # RUN: yaml2obj --docnum=2 %s -o %t2
# RUN: obj2yaml %t2 | FileCheck %s --check-prefix=EMPTY # RUN: obj2yaml %t2 | FileCheck %s --check-prefix=EMPTY
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines