This is an archive of the discontinued LLVM Phabricator instance.

Differential D69558

[ObjectYAML] - Redefine LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex*) as LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR.
ClosedPublic

Authored by grimar on Oct 29 2019, 5:04 AM.

Details

Reviewers
jhenderson
MaskRay
Commits
rG6e779e953e9d: [ObjectYAML] - Redefine LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex*) as…
Summary

I am using it in https://reviews.llvm.org/D69399.

This change changes how obj2yaml dumps arrays of llvm::yaml::Hex8/llvm::yaml::Hex16/llvm::yaml::Hex32
from:

PayloadBytes:
- 0x01
- 0x02
...

To

PayloadBytes:    [ 0x01, 0x02, ... ]

The latter way is shorter and looks better for arrays.

Diff Detail

Event Timeline

grimar created this revision.Oct 29 2019, 5:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 29 2019, 5:04 AM
jhenderson added subscribers: seiya, alexander-shaposhnikov.Oct 29 2019, 5:17 AM

Looks fine to me, aside from one concern.

llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
40

Not knowing much about Mach-O, I'm slightly concerned that these extra four zeros were never intended and might be highlighting a bug. @alexshap/@seiya etc might have a better idea?

grimar marked an inline comment as done.Oct 29 2019, 5:26 AM
grimar added inline comments.
llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
40

Here is the output without this patch applied:

  - cmd:             0xDEADBEEF
    cmdsize:         24
    PayloadBytes:
      - 0x01
      - 0x02
      - 0x03
      - 0x04
      - 0x05
      - 0x06
      - 0x07
      - 0x08
      - 0x09
      - 0x0A
      - 0x0B
      - 0x0C
      - 0x00
      - 0x00
      - 0x00
      - 0x00
...

So these bytes were there before my change, but have never been tested/shown in the test case.

jhenderson added inline comments.Oct 29 2019, 5:35 AM
llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
40

Yes, that's what I assumed. My concern is whether they should be there at all, as they weren't being tested before. It's possible the writer of this test didn't realise they were being emitted and didn't want them to be in this case.

grimar added a child revision: D69399: [yaml2obj/obj2yaml] - Add support for SHT_GNU_HASH section..Oct 29 2019, 6:58 AM
MaskRay resigned from this revision.Oct 29 2019, 9:30 AM

It seems the problem in ObjectYAML/MachO/bogus_load_command.yaml was introduced before this patch, and Mach-O developers have been notified. LG

BTW, have you tested lldb? It recently gets some YAML tests.

llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
441–442

Just a thought: there are 7 elements on one line. 8 may look slightly better if we can make the column limit softer..

The default WrapColumn used in llvm::yaml::Output::Output is 70. YAMLTraits tries to wrap the line when the column number exceeds 70.

bool Output::preflightFlowElement(unsigned, void *&) {
  if (NeedFlowSequenceComma)
    output(", ");
  if (WrapColumn && Column > WrapColumn) {
    output("\n");
    for (int i = 0; i < ColumnAtFlowStart; ++i)
      output(" ");
    Column = ColumnAtFlowStart;
    output("  ");
  }
  return true;
}
MaskRay accepted this revision.Oct 29 2019, 9:30 AM
This revision is now accepted and ready to land.Oct 29 2019, 9:30 AM
grimar marked an inline comment as done.EditedOct 30 2019, 3:43 AM
In D69558#1725533, @MaskRay wrote:

BTW, have you tested lldb? It recently gets some YAML tests.

<there was something here saying it is not needed, but see below>

Upd: I am taking the words above back. I've found LLDB is also affected. Thanks!

llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
441–442

Yeah. And we probably might remove the excessive identation too. I.e. make obj2yaml produce the output which is often requested during reviews anyways. This would save some space for softening of this limit here and in other possible places.

grimar planned changes to this revision.Oct 30 2019, 4:07 AM

Returning to this, LLDB uses YAMLs in the old form for inputs. But this patch only affects output. We accept both the old and the new way for describing arrays.
(MachO tests in this diff do the same, they read the old style and check the YAML produced which is in a new style)
So, LDLB tests are fine.

But there is another problem: this patch never tests we can read arrays in the new style.
I am going to add few tests to Support/YAMLIOTest.cpp and update this diff.

grimar updated this revision to Diff 227064.EditedOct 30 2019, 4:44 AM
  • Add test cases to SupportTests to check that we can read arrays of Hex* described in a new output style.
  • Make Hex16 to be LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR too.
This revision is now accepted and ready to land.Oct 30 2019, 4:44 AM
grimar requested review of this revision.Oct 30 2019, 4:44 AM
jhenderson accepted this revision.Oct 30 2019, 6:23 AM

Looks good to me. I still think the Mach-O test point needs addressing, but that doesn't necessarily need to block this commit.

This revision is now accepted and ready to land.Oct 30 2019, 6:23 AM
Closed by commit rG6e779e953e9d: [ObjectYAML] - Redefine LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex*) as… (authored by grimar). · Explain WhyOct 30 2019, 8:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
include/
llvm/
ObjectYAML/
2 lines
Support/
5 lines
test/
ObjectYAML/
MachO/
11 lines
52 lines
11 lines
3 lines
15 lines
45 lines
9 lines
6 lines
3 lines
unittests/
Support/
59 lines

Diff 227110

llvm/include/llvm/ObjectYAML/DWARFYAML.h

Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Linesstruct Data {
std::vector<LineTable> DebugLines; std::vector<LineTable> DebugLines;
bool isEmpty() const; bool isEmpty() const;
}; };
} // end namespace DWARFYAML } // end namespace DWARFYAML
} // end namespace llvm } // end namespace llvm
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex64)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex8)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::AttributeAbbrev) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::AttributeAbbrev)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Abbrev) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Abbrev)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARangeDescriptor) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARangeDescriptor)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARange) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARange)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::PubEntry) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::PubEntry)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Unit) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Unit)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::FormValue) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::FormValue)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Entry) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Entry)
▲ Show 20 Lines • Show All 135 Lines • Show Last 20 Lines

llvm/include/llvm/Support/YAMLTraits.h

Show First 20 Lines • Show All 2,029 Lines • ▼ Show 20 Lines#define LLVM_YAML_IS_STRING_MAP(_type) \
namespace llvm { \ namespace llvm { \
namespace yaml { \ namespace yaml { \
template <> \ template <> \
struct CustomMappingTraits<std::map<std::string, _type>> \ struct CustomMappingTraits<std::map<std::string, _type>> \
: public StdMapStringCustomMappingTraitsImpl<_type> {}; \ : public StdMapStringCustomMappingTraitsImpl<_type> {}; \
} \ } \
} }
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(llvm::yaml::Hex64)
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(llvm::yaml::Hex32)
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(llvm::yaml::Hex16)
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(llvm::yaml::Hex8)
#endif // LLVM_SUPPORT_YAMLTRAITS_H #endif // LLVM_SUPPORT_YAMLTRAITS_H

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

Show First 20 Lines • Show All 525 Lines • ▼ Show 20 Lines
#CHECK: - Value: 0x0000000000000046 #CHECK: - Value: 0x0000000000000046
#CHECK: - Value: 0x0000000100000F50 #CHECK: - Value: 0x0000000100000F50
#CHECK: - Value: 0x0000000000000034 #CHECK: - Value: 0x0000000000000034
#CHECK: - AbbrCode: 0x00000002 #CHECK: - AbbrCode: 0x00000002
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000100000F50 #CHECK: - Value: 0x0000000100000F50
#CHECK: - Value: 0x0000000000000034 #CHECK: - Value: 0x0000000000000034
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: BlockData: #CHECK: BlockData: [ 0x56 ]
#CHECK: - 0x56
#CHECK: - Value: 0x0000000000000076 #CHECK: - Value: 0x0000000000000076
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000060 #CHECK: - Value: 0x0000000000000060
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - AbbrCode: 0x00000003 #CHECK: - AbbrCode: 0x00000003
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000000000002 #CHECK: - Value: 0x0000000000000002
#CHECK: BlockData: #CHECK: BlockData: [ 0x91, 0x78 ]
#CHECK: - 0x91
#CHECK: - 0x78
#CHECK: - Value: 0x000000000000007B #CHECK: - Value: 0x000000000000007B
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000060 #CHECK: - Value: 0x0000000000000060
#CHECK: - AbbrCode: 0x00000003 #CHECK: - AbbrCode: 0x00000003
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000000000002 #CHECK: - Value: 0x0000000000000002
#CHECK: BlockData: #CHECK: BlockData: [ 0x91, 0x70 ]
#CHECK: - 0x91
#CHECK: - 0x70
#CHECK: - Value: 0x0000000000000080 #CHECK: - Value: 0x0000000000000080
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000067 #CHECK: - Value: 0x0000000000000067
#CHECK: - AbbrCode: 0x00000000 #CHECK: - AbbrCode: 0x00000000
#CHECK: Values: #CHECK: Values:
#CHECK: - AbbrCode: 0x00000004 #CHECK: - AbbrCode: 0x00000004
#CHECK: Values: #CHECK: Values:
Show All 16 Lines

llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml

Show First 20 Lines • Show All 432 Lines • ▼ Show 20 Lines
#CHECK: Version: 2 #CHECK: Version: 2
#CHECK: AbbrOffset: 0 #CHECK: AbbrOffset: 0
#CHECK: AddrSize: 8 #CHECK: AddrSize: 8
#CHECK: Entries: #CHECK: Entries:
#CHECK: - AbbrCode: 0x00000001 #CHECK: - AbbrCode: 0x00000001
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0123456789ABCDEF #CHECK: - Value: 0x0123456789ABCDEF
#CHECK: - Value: 0x000000000000000A #CHECK: - Value: 0x000000000000000A
#CHECK: BlockData: #CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
#CHECK: - 0x01 #CHECK: 0x08, 0x09, 0x00 ]
MaskRayUnsubmitted
Not Done
ReplyInline Actions

Just a thought: there are 7 elements on one line. 8 may look slightly better if we can make the column limit softer..

The default WrapColumn used in llvm::yaml::Output::Output is 70. YAMLTraits tries to wrap the line when the column number exceeds 70.

bool Output::preflightFlowElement(unsigned, void *&) {
  if (NeedFlowSequenceComma)
    output(", ");
  if (WrapColumn && Column > WrapColumn) {
    output("\n");
    for (int i = 0; i < ColumnAtFlowStart; ++i)
      output(" ");
    Column = ColumnAtFlowStart;
    output("  ");
  }
  return true;
}
MaskRay: Just a thought: there are 7 elements on one line. 8 may look slightly better if we can make the…
grimarAuthorUnsubmitted
Done
ReplyInline Actions

Yeah. And we probably might remove the excessive identation too. I.e. make obj2yaml produce the output which is often requested during reviews anyways. This would save some space for softening of this limit here and in other possible places.

grimar: Yeah. And we probably might remove the excessive identation too. I.e. make obj2yaml produce the…
#CHECK: - 0x02
#CHECK: - 0x03
#CHECK: - 0x04
#CHECK: - 0x05
#CHECK: - 0x06
#CHECK: - 0x07
#CHECK: - 0x08
#CHECK: - 0x09
#CHECK: - 0x00
#CHECK: - Value: 0x000000000000000A #CHECK: - Value: 0x000000000000000A
#CHECK: BlockData: #CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
#CHECK: - 0x01 #CHECK: 0x08, 0x09, 0x00 ]
#CHECK: - 0x02
#CHECK: - 0x03
#CHECK: - 0x04
#CHECK: - 0x05
#CHECK: - 0x06
#CHECK: - 0x07
#CHECK: - 0x08
#CHECK: - 0x09
#CHECK: - 0x00
#CHECK: - Value: 0x000000000000000A #CHECK: - Value: 0x000000000000000A
#CHECK: BlockData: #CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
#CHECK: - 0x01 #CHECK: 0x08, 0x09, 0x00 ]
#CHECK: - 0x02
#CHECK: - 0x03
#CHECK: - 0x04
#CHECK: - 0x05
#CHECK: - 0x06
#CHECK: - 0x07
#CHECK: - 0x08
#CHECK: - 0x09
#CHECK: - 0x00
#CHECK: - Value: 0x000000000000000A #CHECK: - Value: 0x000000000000000A
#CHECK: BlockData: #CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
#CHECK: - 0x01 #CHECK: 0x08, 0x09, 0x00 ]
#CHECK: - 0x02
#CHECK: - 0x03
#CHECK: - 0x04
#CHECK: - 0x05
#CHECK: - 0x06
#CHECK: - 0x07
#CHECK: - 0x08
#CHECK: - 0x09
#CHECK: - 0x00
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000002345 #CHECK: - Value: 0x0000000000002345
#CHECK: - Value: 0x000000006789ABCD #CHECK: - Value: 0x000000006789ABCD
#CHECK: - Value: 0x0011223344556677 #CHECK: - Value: 0x0011223344556677
#CHECK: CStr: Hello #CHECK: CStr: Hello
#CHECK: - Value: 0x0000000000000000 #CHECK: - Value: 0x0000000000000000
#CHECK: - Value: 0x0000000012345678 #CHECK: - Value: 0x0000000012345678
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
Show All 12 Lines

llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml

Show First 20 Lines • Show All 526 Lines • ▼ Show 20 Lines
#CHECK: - Value: 0x0000000000000046 #CHECK: - Value: 0x0000000000000046
#CHECK: - Value: 0x0000000100000F50 #CHECK: - Value: 0x0000000100000F50
#CHECK: - Value: 0x0000000000000034 #CHECK: - Value: 0x0000000000000034
#CHECK: - AbbrCode: 0x00000002 #CHECK: - AbbrCode: 0x00000002
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000100000F50 #CHECK: - Value: 0x0000000100000F50
#CHECK: - Value: 0x0000000000000034 #CHECK: - Value: 0x0000000000000034
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: BlockData: #CHECK: BlockData: [ 0x56 ]
#CHECK: - 0x56
#CHECK: - Value: 0x0000000000000076 #CHECK: - Value: 0x0000000000000076
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000060 #CHECK: - Value: 0x0000000000000060
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - AbbrCode: 0x00000003 #CHECK: - AbbrCode: 0x00000003
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000000000002 #CHECK: - Value: 0x0000000000000002
#CHECK: BlockData: #CHECK: BlockData: [ 0x91, 0x78 ]
#CHECK: - 0x91
#CHECK: - 0x78
#CHECK: - Value: 0x000000000000007B #CHECK: - Value: 0x000000000000007B
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000060 #CHECK: - Value: 0x0000000000000060
#CHECK: - AbbrCode: 0x00000003 #CHECK: - AbbrCode: 0x00000003
#CHECK: Values: #CHECK: Values:
#CHECK: - Value: 0x0000000000000002 #CHECK: - Value: 0x0000000000000002
#CHECK: BlockData: #CHECK: BlockData: [ 0x91, 0x70 ]
#CHECK: - 0x91
#CHECK: - 0x70
#CHECK: - Value: 0x0000000000000080 #CHECK: - Value: 0x0000000000000080
#CHECK: - Value: 0x0000000000000001 #CHECK: - Value: 0x0000000000000001
#CHECK: - Value: 0x0000000000000003 #CHECK: - Value: 0x0000000000000003
#CHECK: - Value: 0x0000000000000067 #CHECK: - Value: 0x0000000000000067
#CHECK: - AbbrCode: 0x00000000 #CHECK: - AbbrCode: 0x00000000
#CHECK: Values: #CHECK: Values:
#CHECK: - AbbrCode: 0x00000004 #CHECK: - AbbrCode: 0x00000004
#CHECK: Values: #CHECK: Values:
Show All 16 Lines

llvm/test/ObjectYAML/MachO/bind_opcode.yaml

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__14coutE #CHECK: Symbol: __ZNSt3__14coutE
#CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM #CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000000 ]
#CHECK: - 0x0000000000000000
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__15ctypeIcE2idE #CHECK: Symbol: __ZNSt3__15ctypeIcE2idE
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
Show All 14 Lines

llvm/test/ObjectYAML/MachO/bogus_load_command.yaml

Show All 30 Lines PayloadBytes:
- 0x0C - 0x0C
... ...
#CHECK: - cmd: 0xDEADBEEF #CHECK: - cmd: 0xDEADBEEF
#CHECK: cmdsize: 32 #CHECK: cmdsize: 32
#CHECK: ZeroPadBytes: #CHECK: ZeroPadBytes:
#CHECK: - cmd: 0xDEADBEEF #CHECK: - cmd: 0xDEADBEEF
#CHECK: cmdsize: 24 #CHECK: cmdsize: 24
#CHECK: PayloadBytes: #CHECK: PayloadBytes: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
#CHECK: - 0x01 #CHECK: 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00, 0x00, 0x00 ]
jhendersonUnsubmitted
Not Done
ReplyInline Actions

Not knowing much about Mach-O, I'm slightly concerned that these extra four zeros were never intended and might be highlighting a bug. @alexshap/@seiya etc might have a better idea?

jhenderson: Not knowing much about Mach-O, I'm slightly concerned that these extra four zeros were never…
grimarAuthorUnsubmitted
Done
ReplyInline Actions

Here is the output without this patch applied:

  - cmd:             0xDEADBEEF
    cmdsize:         24
    PayloadBytes:
      - 0x01
      - 0x02
      - 0x03
      - 0x04
      - 0x05
      - 0x06
      - 0x07
      - 0x08
      - 0x09
      - 0x0A
      - 0x0B
      - 0x0C
      - 0x00
      - 0x00
      - 0x00
      - 0x00
...

So these bytes were there before my change, but have never been tested/shown in the test case.

grimar: Here is the output without this patch applied: ``` - cmd: 0xDEADBEEF cmdsize…
jhendersonUnsubmitted
Not Done
ReplyInline Actions

Yes, that's what I assumed. My concern is whether they should be there at all, as they weren't being tested before. It's possible the writer of this test didn't realise they were being emitted and didn't want them to be in this case.

jhenderson: Yes, that's what I assumed. My concern is whether they should be there at all, as they weren't…
#CHECK: - 0x02
#CHECK: - 0x03
#CHECK: - 0x04
#CHECK: - 0x05
#CHECK: - 0x06
#CHECK: - 0x07
#CHECK: - 0x08
#CHECK: - 0x09
#CHECK: - 0x0A
#CHECK: - 0x0B
#CHECK: - 0x0C
#CHECK-NOT: LinkEditData: #CHECK-NOT: LinkEditData:

llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml

Show First 20 Lines • Show All 261 Lines • ▼ Show 20 Lines LazyBindOpcodes:
- Opcode: BIND_OPCODE_DONE - Opcode: BIND_OPCODE_DONE
Imm: 0 Imm: 0
... ...
#CHECK: LinkEditData: #CHECK: LinkEditData:
#CHECK: LazyBindOpcodes: #CHECK: LazyBindOpcodes:
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000028 ]
#CHECK: - 0x0000000000000028
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNKSt3__16locale9use_facetERNS0_2idE #CHECK: Symbol: __ZNKSt3__16locale9use_facetERNS0_2idE
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000030 ]
#CHECK: - 0x0000000000000030
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNKSt3__18ios_base6getlocEv #CHECK: Symbol: __ZNKSt3__18ios_base6getlocEv
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000038 ]
#CHECK: - 0x0000000000000038
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initEmc #CHECK: Symbol: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6__initEmc
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000040 ]
#CHECK: - 0x0000000000000040
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev #CHECK: Symbol: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEED1Ev
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000048 ]
#CHECK: - 0x0000000000000048
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryC1ERS3_ #CHECK: Symbol: __ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryC1ERS3_
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000050 ]
#CHECK: - 0x0000000000000050
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryD1Ev #CHECK: Symbol: __ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryD1Ev
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000058 ]
#CHECK: - 0x0000000000000058
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__16localeD1Ev #CHECK: Symbol: __ZNSt3__16localeD1Ev
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000060 ]
#CHECK: - 0x0000000000000060
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__18ios_base33__set_badbit_and_consider_rethrowEv #CHECK: Symbol: __ZNSt3__18ios_base33__set_badbit_and_consider_rethrowEv
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000068 ]
#CHECK: - 0x0000000000000068
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__18ios_base5clearEj #CHECK: Symbol: __ZNSt3__18ios_base5clearEj
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000070 ]
#CHECK: - 0x0000000000000070
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZSt9terminatev #CHECK: Symbol: __ZSt9terminatev
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000078 ]
#CHECK: - 0x0000000000000078
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: ___cxa_begin_catch #CHECK: Symbol: ___cxa_begin_catch
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000080 ]
#CHECK: - 0x0000000000000080
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: ___cxa_end_catch #CHECK: Symbol: ___cxa_end_catch
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000088 ]
#CHECK: - 0x0000000000000088
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __Unwind_Resume #CHECK: Symbol: __Unwind_Resume
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000090 ]
#CHECK: - 0x0000000000000090
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: _memset #CHECK: Symbol: _memset
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000098 ]
#CHECK: - 0x0000000000000098
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: _strlen #CHECK: Symbol: _strlen
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_DONE #CHECK: - Opcode: BIND_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0

llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml

Show First 20 Lines • Show All 208 Lines • ▼ Show 20 Lines
#CHECK: export_off: 13016 #CHECK: export_off: 13016
#CHECK: export_size: 48 #CHECK: export_size: 48
#CHECK: LinkEditData: #CHECK: LinkEditData:
#CHECK: RebaseOpcodes: #CHECK: RebaseOpcodes:
#CHECK: - Opcode: REBASE_OPCODE_SET_TYPE_IMM #CHECK: - Opcode: REBASE_OPCODE_SET_TYPE_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ExtraData: #CHECK: ExtraData: [ 0x0000000000000028 ]
#CHECK: - 0x0000000000000028
#CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES #CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: ExtraData: #CHECK: ExtraData: [ 0x000000000000000F ]
#CHECK: - 0x000000000000000F
#CHECK: - Opcode: REBASE_OPCODE_DONE #CHECK: - Opcode: REBASE_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: BindOpcodes: #CHECK: BindOpcodes:
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM #CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: Symbol: '' #CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__14coutE #CHECK: Symbol: __ZNSt3__14coutE
#CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM #CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: Symbol: '' #CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000000 ]
#CHECK: - 0x0000000000000000
#CHECK: Symbol: '' #CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: '' #CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__15ctypeIcE2idE #CHECK: Symbol: __ZNSt3__15ctypeIcE2idE
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
Show All 20 Lines

llvm/test/ObjectYAML/MachO/rebase_opcode.yaml

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines
... ...
#CHECK: LinkEditData: #CHECK: LinkEditData:
#CHECK: RebaseOpcodes: #CHECK: RebaseOpcodes:
#CHECK: - Opcode: REBASE_OPCODE_SET_TYPE_IMM #CHECK: - Opcode: REBASE_OPCODE_SET_TYPE_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ExtraData: #CHECK: ExtraData: [ 0x0000000000000028 ]
#CHECK: - 0x0000000000000028
#CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES #CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: ExtraData: #CHECK: ExtraData: [ 0x000000000000000F ]
#CHECK: - 0x000000000000000F
#CHECK: - Opcode: REBASE_OPCODE_DONE #CHECK: - Opcode: REBASE_OPCODE_DONE
#CHECK: Imm: 0 #CHECK: Imm: 0

llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__14coutE #CHECK: Symbol: __ZNSt3__14coutE
#CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM #CHECK: - Opcode: BIND_OPCODE_SET_TYPE_IMM
#CHECK: Imm: 1 #CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB #CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2 #CHECK: Imm: 2
#CHECK: ULEBExtraData: #CHECK: ULEBExtraData: [ 0x0000000000000000 ]
#CHECK: - 0x0000000000000000
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: Symbol: __ZNSt3__15ctypeIcE2idE #CHECK: Symbol: __ZNSt3__15ctypeIcE2idE
#CHECK: - Opcode: BIND_OPCODE_DO_BIND #CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0 #CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM #CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
Show All 14 Lines

llvm/unittests/Support/YAMLIOTest.cpp

Show First 20 Lines • Show All 2,183 Lines • ▼ Show 20 LinesTEST(YAMLIO, TestReadBuiltInTypesDoubleError) {
yin >> seq; yin >> seq;
EXPECT_TRUE(!!yin.error()); EXPECT_TRUE(!!yin.error());
} }
// //
// Test error handling reading built-in Hex8 type // Test error handling reading built-in Hex8 type
// //
LLVM_YAML_IS_SEQUENCE_VECTOR(Hex8)
TEST(YAMLIO, TestReadBuiltInTypesHex8Error) { TEST(YAMLIO, TestReadBuiltInTypesHex8Error) {
std::vector<Hex8> seq; std::vector<Hex8> seq;
Input yin("---\n" Input yin("---\n"
"- 0x12\n" "- 0x12\n"
"- 0xFE\n" "- 0xFE\n"
"- 0x123\n" "- 0x123\n"
"...\n", "...\n",
/*Ctxt=*/nullptr, /*Ctxt=*/nullptr,
suppressErrorMessages); suppressErrorMessages);
yin >> seq; yin >> seq;
EXPECT_TRUE(!!yin.error()); EXPECT_TRUE(!!yin.error());
std::vector<Hex8> seq2;
Input yin2("---\n"
"[ 0x12, 0xFE, 0x123 ]\n"
"...\n",
/*Ctxt=*/nullptr, suppressErrorMessages);
yin2 >> seq2;
EXPECT_TRUE(!!yin2.error());
EXPECT_TRUE(seq.size() == 3);
EXPECT_TRUE(seq.size() == seq2.size());
for (size_t i = 0; i < seq.size(); ++i)
EXPECT_TRUE(seq[i] == seq2[i]);
} }
// //
// Test error handling reading built-in Hex16 type // Test error handling reading built-in Hex16 type
// //
LLVM_YAML_IS_SEQUENCE_VECTOR(Hex16)
TEST(YAMLIO, TestReadBuiltInTypesHex16Error) { TEST(YAMLIO, TestReadBuiltInTypesHex16Error) {
std::vector<Hex16> seq; std::vector<Hex16> seq;
Input yin("---\n" Input yin("---\n"
"- 0x0012\n" "- 0x0012\n"
"- 0xFEFF\n" "- 0xFEFF\n"
"- 0x12345\n" "- 0x12345\n"
"...\n", "...\n",
/*Ctxt=*/nullptr, /*Ctxt=*/nullptr,
suppressErrorMessages); suppressErrorMessages);
yin >> seq; yin >> seq;
EXPECT_TRUE(!!yin.error()); EXPECT_TRUE(!!yin.error());
std::vector<Hex16> seq2;
Input yin2("---\n"
"[ 0x0012, 0xFEFF, 0x12345 ]\n"
"...\n",
/*Ctxt=*/nullptr, suppressErrorMessages);
yin2 >> seq2;
EXPECT_TRUE(!!yin2.error());
EXPECT_TRUE(seq.size() == 3);
EXPECT_TRUE(seq.size() == seq2.size());
for (size_t i = 0; i < seq.size(); ++i)
EXPECT_TRUE(seq[i] == seq2[i]);
} }
// //
// Test error handling reading built-in Hex32 type // Test error handling reading built-in Hex32 type
// //
LLVM_YAML_IS_SEQUENCE_VECTOR(Hex32)
TEST(YAMLIO, TestReadBuiltInTypesHex32Error) { TEST(YAMLIO, TestReadBuiltInTypesHex32Error) {
std::vector<Hex32> seq; std::vector<Hex32> seq;
Input yin("---\n" Input yin("---\n"
"- 0x0012\n" "- 0x0012\n"
"- 0xFEFF0000\n" "- 0xFEFF0000\n"
"- 0x1234556789\n" "- 0x1234556789\n"
"...\n", "...\n",
/*Ctxt=*/nullptr, /*Ctxt=*/nullptr,
suppressErrorMessages); suppressErrorMessages);
yin >> seq; yin >> seq;
EXPECT_TRUE(!!yin.error()); EXPECT_TRUE(!!yin.error());
std::vector<Hex32> seq2;
Input yin2("---\n"
"[ 0x0012, 0xFEFF0000, 0x1234556789 ]\n"
"...\n",
/*Ctxt=*/nullptr, suppressErrorMessages);
yin2 >> seq2;
EXPECT_TRUE(!!yin2.error());
EXPECT_TRUE(seq.size() == 3);
EXPECT_TRUE(seq.size() == seq2.size());
for (size_t i = 0; i < seq.size(); ++i)
EXPECT_TRUE(seq[i] == seq2[i]);
} }
// //
// Test error handling reading built-in Hex64 type // Test error handling reading built-in Hex64 type
// //
LLVM_YAML_IS_SEQUENCE_VECTOR(Hex64)
TEST(YAMLIO, TestReadBuiltInTypesHex64Error) { TEST(YAMLIO, TestReadBuiltInTypesHex64Error) {
std::vector<Hex64> seq; std::vector<Hex64> seq;
Input yin("---\n" Input yin("---\n"
"- 0x0012\n" "- 0x0012\n"
"- 0xFFEEDDCCBBAA9988\n" "- 0xFFEEDDCCBBAA9988\n"
"- 0x12345567890ABCDEF0\n" "- 0x12345567890ABCDEF0\n"
"...\n", "...\n",
/*Ctxt=*/nullptr, /*Ctxt=*/nullptr,
suppressErrorMessages); suppressErrorMessages);
yin >> seq; yin >> seq;
EXPECT_TRUE(!!yin.error()); EXPECT_TRUE(!!yin.error());
std::vector<Hex64> seq2;
Input yin2("---\n"
"[ 0x0012, 0xFFEEDDCCBBAA9988, 0x12345567890ABCDEF0 ]\n"
"...\n",
/*Ctxt=*/nullptr, suppressErrorMessages);
yin2 >> seq2;
EXPECT_TRUE(!!yin2.error());
EXPECT_TRUE(seq.size() == 3);
EXPECT_TRUE(seq.size() == seq2.size());
for (size_t i = 0; i < seq.size(); ++i)
EXPECT_TRUE(seq[i] == seq2[i]);
} }
TEST(YAMLIO, TestMalformedMapFailsGracefully) { TEST(YAMLIO, TestMalformedMapFailsGracefully) {
FooBar doc; FooBar doc;
{ {
// We pass the suppressErrorMessages handler to handle the error // We pass the suppressErrorMessages handler to handle the error
// message generated in the constructor of Input. // message generated in the constructor of Input.
Input yin("{foo:3, bar: 5}", /*Ctxt=*/nullptr, suppressErrorMessages); Input yin("{foo:3, bar: 5}", /*Ctxt=*/nullptr, suppressErrorMessages);
▲ Show 20 Lines • Show All 740 Lines • Show Last 20 Lines