Skip to content

Commit ed67dda

Browse files
andrurogerzandrurogerz
committed
[llvm] clang-format changes to ObjectYAML library
1 parent 5eaec80 commit ed67dda

File tree

8 files changed

+63
-42
lines changed

8 files changed

+63
-42
lines changed

‎llvm/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLDEBUGSECTIONS_H
1515
#define LLVM_OBJECTYAML_CODEVIEWYAMLDEBUGSECTIONS_H
1616

17-
#include "llvm/Support/Compiler.h"
1817
#include "llvm/ADT/ArrayRef.h"
1918
#include "llvm/ADT/StringRef.h"
2019
#include "llvm/DebugInfo/CodeView/CodeView.h"
2120
#include "llvm/DebugInfo/CodeView/DebugSubsection.h"
2221
#include "llvm/DebugInfo/CodeView/DebugSubsectionRecord.h"
22+
#include "llvm/Support/Compiler.h"
2323
#include "llvm/Support/Error.h"
2424
#include "llvm/Support/YAMLTraits.h"
2525
#include <cstdint>
@@ -124,8 +124,9 @@ toCodeViewSubsectionList(BumpPtrAllocator &Allocator,
124124
LLVM_ABI std::vector<YAMLDebugSubsection>
125125
fromDebugS(ArrayRef<uint8_t> Data, const codeview::StringsAndChecksumsRef &SC);
126126

127-
LLVM_ABI void initializeStringsAndChecksums(ArrayRef<YAMLDebugSubsection> Sections,
128-
codeview::StringsAndChecksums &SC);
127+
LLVM_ABI void
128+
initializeStringsAndChecksums(ArrayRef<YAMLDebugSubsection> Sections,
129+
codeview::StringsAndChecksums &SC);
129130

130131
} // end namespace CodeViewYAML
131132

‎llvm/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLSYMBOLS_H
1515
#define LLVM_OBJECTYAML_CODEVIEWYAMLSYMBOLS_H
1616

17-
#include "llvm/Support/Compiler.h"
1817
#include "llvm/DebugInfo/CodeView/CodeView.h"
1918
#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
19+
#include "llvm/Support/Compiler.h"
2020
#include "llvm/Support/Error.h"
2121
#include "llvm/Support/YAMLTraits.h"
2222
#include <memory>
@@ -37,7 +37,8 @@ struct SymbolRecord {
3737
toCodeViewSymbol(BumpPtrAllocator &Allocator,
3838
codeview::CodeViewContainer Container) const;
3939

40-
LLVM_ABI static Expected<SymbolRecord> fromCodeViewSymbol(codeview::CVSymbol Symbol);
40+
LLVM_ABI static Expected<SymbolRecord>
41+
fromCodeViewSymbol(codeview::CVSymbol Symbol);
4142
};
4243

4344
} // end namespace CodeViewYAML

‎llvm/include/llvm/ObjectYAML/CodeViewYAMLTypes.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLTYPES_H
1515
#define LLVM_OBJECTYAML_CODEVIEWYAMLTYPES_H
1616

17-
#include "llvm/Support/Compiler.h"
1817
#include "llvm/ADT/ArrayRef.h"
1918
#include "llvm/DebugInfo/CodeView/TypeRecord.h"
2019
#include "llvm/Support/Allocator.h"
20+
#include "llvm/Support/Compiler.h"
2121
#include "llvm/Support/Error.h"
2222
#include "llvm/Support/YAMLTraits.h"
2323
#include <cstdint>
@@ -48,13 +48,14 @@ struct LeafRecord {
4848

4949
LLVM_ABI codeview::CVType
5050
toCodeViewRecord(codeview::AppendingTypeTableBuilder &Serializer) const;
51-
LLVM_ABI static Expected<LeafRecord> fromCodeViewRecord(codeview::CVType Type);
51+
LLVM_ABI static Expected<LeafRecord>
52+
fromCodeViewRecord(codeview::CVType Type);
5253
};
5354

5455
LLVM_ABI std::vector<LeafRecord> fromDebugT(ArrayRef<uint8_t> DebugTorP,
55-
StringRef SectionName);
56-
LLVM_ABI ArrayRef<uint8_t> toDebugT(ArrayRef<LeafRecord>, BumpPtrAllocator &Alloc,
57-
StringRef SectionName);
56+
StringRef SectionName);
57+
LLVM_ABI ArrayRef<uint8_t>
58+
toDebugT(ArrayRef<LeafRecord>, BumpPtrAllocator &Alloc, StringRef SectionName);
5859

5960
} // end namespace CodeViewYAML
6061

‎llvm/include/llvm/ObjectYAML/DWARFEmitter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#ifndef LLVM_OBJECTYAML_DWARFEMITTER_H
1313
#define LLVM_OBJECTYAML_DWARFEMITTER_H
1414

15-
#include "llvm/Support/Compiler.h"
1615
#include "llvm/ADT/StringMap.h"
1716
#include "llvm/ADT/StringRef.h"
17+
#include "llvm/Support/Compiler.h"
1818
#include "llvm/Support/Error.h"
1919
#include "llvm/Support/MemoryBuffer.h"
2020
#include "llvm/TargetParser/Host.h"

‎llvm/include/llvm/ObjectYAML/DWARFYAML.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#ifndef LLVM_OBJECTYAML_DWARFYAML_H
1616
#define LLVM_OBJECTYAML_DWARFYAML_H
1717

18-
#include "llvm/Support/Compiler.h"
1918
#include "llvm/ADT/SetVector.h"
2019
#include "llvm/ADT/StringRef.h"
2120
#include "llvm/BinaryFormat/Dwarf.h"
2221
#include "llvm/ObjectYAML/YAML.h"
22+
#include "llvm/Support/Compiler.h"
2323
#include "llvm/Support/YAMLTraits.h"
2424
#include <cstdint>
2525
#include <optional>
@@ -380,7 +380,8 @@ template <> struct MappingTraits<DWARFYAML::File> {
380380
};
381381

382382
template <> struct MappingTraits<DWARFYAML::LineTableOpcode> {
383-
LLVM_ABI static void mapping(IO &IO, DWARFYAML::LineTableOpcode &LineTableOpcode);
383+
LLVM_ABI static void mapping(IO &IO,
384+
DWARFYAML::LineTableOpcode &LineTableOpcode);
384385
};
385386

386387
template <> struct MappingTraits<DWARFYAML::LineTable> {
@@ -392,7 +393,8 @@ template <> struct MappingTraits<DWARFYAML::SegAddrPair> {
392393
};
393394

394395
template <> struct MappingTraits<DWARFYAML::DWARFOperation> {
395-
LLVM_ABI static void mapping(IO &IO, DWARFYAML::DWARFOperation &DWARFOperation);
396+
LLVM_ABI static void mapping(IO &IO,
397+
DWARFYAML::DWARFOperation &DWARFOperation);
396398
};
397399

398400
template <typename EntryType>
@@ -420,7 +422,8 @@ template <> struct MappingTraits<DWARFYAML::AddrTableEntry> {
420422
};
421423

422424
template <> struct MappingTraits<DWARFYAML::StringOffsetsTable> {
423-
LLVM_ABI static void mapping(IO &IO, DWARFYAML::StringOffsetsTable &StrOffsetsTable);
425+
LLVM_ABI static void mapping(IO &IO,
426+
DWARFYAML::StringOffsetsTable &StrOffsetsTable);
424427
};
425428

426429
template <> struct ScalarEnumerationTraits<dwarf::DwarfFormat> {

‎llvm/include/llvm/ObjectYAML/DXContainerYAML.h

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#ifndef LLVM_OBJECTYAML_DXCONTAINERYAML_H
1616
#define LLVM_OBJECTYAML_DXCONTAINERYAML_H
1717

18-
#include "llvm/Support/Compiler.h"
1918
#include "llvm/ADT/StringRef.h"
2019
#include "llvm/BinaryFormat/DXContainer.h"
2120
#include "llvm/Object/DXContainer.h"
2221
#include "llvm/ObjectYAML/YAML.h"
22+
#include "llvm/Support/Compiler.h"
2323
#include "llvm/Support/YAMLTraits.h"
2424
#include <array>
2525
#include <optional>
@@ -341,7 +341,8 @@ template <> struct MappingTraits<DXContainerYAML::DXILProgram> {
341341
};
342342

343343
template <> struct MappingTraits<DXContainerYAML::ShaderFeatureFlags> {
344-
LLVM_ABI static void mapping(IO &IO, DXContainerYAML::ShaderFeatureFlags &Flags);
344+
LLVM_ABI static void mapping(IO &IO,
345+
DXContainerYAML::ShaderFeatureFlags &Flags);
345346
};
346347

347348
template <> struct MappingTraits<DXContainerYAML::ShaderHash> {
@@ -369,48 +370,55 @@ template <> struct MappingTraits<DXContainerYAML::ResourceBindInfo> {
369370
};
370371

371372
template <> struct MappingTraits<DXContainerYAML::SignatureElement> {
372-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::SignatureElement &El);
373+
LLVM_ABI static void mapping(IO &IO,
374+
llvm::DXContainerYAML::SignatureElement &El);
373375
};
374376

375377
template <> struct MappingTraits<DXContainerYAML::SignatureParameter> {
376-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::SignatureParameter &El);
378+
LLVM_ABI static void mapping(IO &IO,
379+
llvm::DXContainerYAML::SignatureParameter &El);
377380
};
378381

379382
template <> struct MappingTraits<DXContainerYAML::Signature> {
380383
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::Signature &El);
381384
};
382385

383386
template <> struct MappingTraits<DXContainerYAML::RootSignatureYamlDesc> {
384-
LLVM_ABI static void mapping(IO &IO,
385-
DXContainerYAML::RootSignatureYamlDesc &RootSignature);
387+
LLVM_ABI static void
388+
mapping(IO &IO, DXContainerYAML::RootSignatureYamlDesc &RootSignature);
386389
};
387390

388391
template <>
389392
struct MappingContextTraits<DXContainerYAML::RootParameterLocationYaml,
390393
DXContainerYAML::RootSignatureYamlDesc> {
391-
LLVM_ABI static void mapping(IO &IO,
392-
llvm::DXContainerYAML::RootParameterLocationYaml &L,
393-
DXContainerYAML::RootSignatureYamlDesc &S);
394+
LLVM_ABI static void
395+
mapping(IO &IO, llvm::DXContainerYAML::RootParameterLocationYaml &L,
396+
DXContainerYAML::RootSignatureYamlDesc &S);
394397
};
395398

396399
template <> struct MappingTraits<llvm::DXContainerYAML::RootConstantsYaml> {
397-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::RootConstantsYaml &C);
400+
LLVM_ABI static void mapping(IO &IO,
401+
llvm::DXContainerYAML::RootConstantsYaml &C);
398402
};
399403

400404
template <> struct MappingTraits<llvm::DXContainerYAML::RootDescriptorYaml> {
401-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::RootDescriptorYaml &D);
405+
LLVM_ABI static void mapping(IO &IO,
406+
llvm::DXContainerYAML::RootDescriptorYaml &D);
402407
};
403408

404409
template <> struct MappingTraits<llvm::DXContainerYAML::DescriptorTableYaml> {
405-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::DescriptorTableYaml &D);
410+
LLVM_ABI static void mapping(IO &IO,
411+
llvm::DXContainerYAML::DescriptorTableYaml &D);
406412
};
407413

408414
template <> struct MappingTraits<llvm::DXContainerYAML::DescriptorRangeYaml> {
409-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::DescriptorRangeYaml &D);
415+
LLVM_ABI static void mapping(IO &IO,
416+
llvm::DXContainerYAML::DescriptorRangeYaml &D);
410417
};
411418

412419
template <> struct MappingTraits<llvm::DXContainerYAML::StaticSamplerYamlDesc> {
413-
LLVM_ABI static void mapping(IO &IO, llvm::DXContainerYAML::StaticSamplerYamlDesc &S);
420+
LLVM_ABI static void mapping(IO &IO,
421+
llvm::DXContainerYAML::StaticSamplerYamlDesc &S);
414422
};
415423

416424
} // namespace yaml

‎llvm/include/llvm/ObjectYAML/YAML.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#ifndef LLVM_OBJECTYAML_YAML_H
1010
#define LLVM_OBJECTYAML_YAML_H
1111

12-
#include "llvm/Support/Compiler.h"
1312
#include "llvm/ADT/ArrayRef.h"
1413
#include "llvm/ADT/StringRef.h"
14+
#include "llvm/Support/Compiler.h"
1515
#include "llvm/Support/YAMLTraits.h"
1616
#include <cstdint>
1717

‎llvm/include/llvm/ObjectYAML/yaml2obj.h

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#ifndef LLVM_OBJECTYAML_YAML2OBJ_H
1212
#define LLVM_OBJECTYAML_YAML2OBJ_H
1313

14-
#include "llvm/Support/Compiler.h"
1514
#include "llvm/ADT/STLExtras.h"
15+
#include "llvm/Support/Compiler.h"
1616
#include <memory>
1717

1818
namespace llvm {
@@ -67,22 +67,29 @@ struct YamlObjectFile;
6767

6868
using ErrorHandler = llvm::function_ref<void(const Twine &Msg)>;
6969

70-
LLVM_ABI bool yaml2archive(ArchYAML::Archive &Doc, raw_ostream &Out, ErrorHandler EH);
71-
LLVM_ABI bool yaml2coff(COFFYAML::Object &Doc, raw_ostream &Out, ErrorHandler EH);
72-
LLVM_ABI bool yaml2goff(GOFFYAML::Object &Doc, raw_ostream &Out, ErrorHandler EH);
70+
LLVM_ABI bool yaml2archive(ArchYAML::Archive &Doc, raw_ostream &Out,
71+
ErrorHandler EH);
72+
LLVM_ABI bool yaml2coff(COFFYAML::Object &Doc, raw_ostream &Out,
73+
ErrorHandler EH);
74+
LLVM_ABI bool yaml2goff(GOFFYAML::Object &Doc, raw_ostream &Out,
75+
ErrorHandler EH);
7376
LLVM_ABI bool yaml2elf(ELFYAML::Object &Doc, raw_ostream &Out, ErrorHandler EH,
74-
uint64_t MaxSize);
75-
LLVM_ABI bool yaml2macho(YamlObjectFile &Doc, raw_ostream &Out, ErrorHandler EH);
77+
uint64_t MaxSize);
78+
LLVM_ABI bool yaml2macho(YamlObjectFile &Doc, raw_ostream &Out,
79+
ErrorHandler EH);
7680
LLVM_ABI bool yaml2minidump(MinidumpYAML::Object &Doc, raw_ostream &Out,
77-
ErrorHandler EH);
78-
LLVM_ABI bool yaml2offload(OffloadYAML::Binary &Doc, raw_ostream &Out, ErrorHandler EH);
79-
LLVM_ABI bool yaml2wasm(WasmYAML::Object &Doc, raw_ostream &Out, ErrorHandler EH);
80-
LLVM_ABI bool yaml2xcoff(XCOFFYAML::Object &Doc, raw_ostream &Out, ErrorHandler EH);
81+
ErrorHandler EH);
82+
LLVM_ABI bool yaml2offload(OffloadYAML::Binary &Doc, raw_ostream &Out,
83+
ErrorHandler EH);
84+
LLVM_ABI bool yaml2wasm(WasmYAML::Object &Doc, raw_ostream &Out,
85+
ErrorHandler EH);
86+
LLVM_ABI bool yaml2xcoff(XCOFFYAML::Object &Doc, raw_ostream &Out,
87+
ErrorHandler EH);
8188
LLVM_ABI bool yaml2dxcontainer(DXContainerYAML::Object &Doc, raw_ostream &Out,
82-
ErrorHandler EH);
89+
ErrorHandler EH);
8390

8491
LLVM_ABI bool convertYAML(Input &YIn, raw_ostream &Out, ErrorHandler ErrHandler,
85-
unsigned DocNum = 1, uint64_t MaxSize = UINT64_MAX);
92+
unsigned DocNum = 1, uint64_t MaxSize = UINT64_MAX);
8693

8794
/// Convenience function for tests.
8895
LLVM_ABI std::unique_ptr<object::ObjectFile>

0 commit comments

Comments
 (0)