Skip to content

Commit b888592

Browse files
kazutakahiratakazutakahirata
committed
Use llvm::endianness::{big,little,native} (NFC)
Note that llvm::support::endianness has been renamed to llvm::endianness while becoming an enum class as opposed to an enum. This patch replaces llvm::support::{big,little,native} with llvm::endianness::{big,little,native}.
1 parent 0439a01 commit b888592

33 files changed

+165
-181
lines changed

‎clang/lib/APINotes/APINotesWriter.cpp‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ class IdentifierTableInfo {
294294
uint32_t KeyLength = Key.size();
295295
uint32_t DataLength = sizeof(uint32_t);
296296

297-
llvm::support::endian::Writer writer(OS, llvm::support::little);
297+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
298298
writer.write<uint16_t>(KeyLength);
299299
writer.write<uint16_t>(DataLength);
300300
return {KeyLength, DataLength};
@@ -303,7 +303,7 @@ class IdentifierTableInfo {
303303
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) { OS << Key; }
304304

305305
void EmitData(raw_ostream &OS, key_type_ref, data_type_ref Data, unsigned) {
306-
llvm::support::endian::Writer writer(OS, llvm::support::little);
306+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
307307
writer.write<uint32_t>(Data);
308308
}
309309
};
@@ -326,7 +326,7 @@ void APINotesWriter::Implementation::writeIdentifierBlock(
326326
llvm::raw_svector_ostream BlobStream(HashTableBlob);
327327
// Make sure that no bucket is at offset 0
328328
llvm::support::endian::write<uint32_t>(BlobStream, 0,
329-
llvm::support::little);
329+
llvm::endianness::little);
330330
Offset = Generator.Emit(BlobStream);
331331
}
332332

@@ -354,21 +354,21 @@ class ObjCContextIDTableInfo {
354354
uint32_t KeyLength = sizeof(uint32_t) + sizeof(uint8_t) + sizeof(uint32_t);
355355
uint32_t DataLength = sizeof(uint32_t);
356356

357-
llvm::support::endian::Writer writer(OS, llvm::support::little);
357+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
358358
writer.write<uint16_t>(KeyLength);
359359
writer.write<uint16_t>(DataLength);
360360
return {KeyLength, DataLength};
361361
}
362362

363363
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
364-
llvm::support::endian::Writer writer(OS, llvm::support::little);
364+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
365365
writer.write<uint32_t>(Key.parentContextID);
366366
writer.write<uint8_t>(Key.contextKind);
367367
writer.write<uint32_t>(Key.contextID);
368368
}
369369

370370
void EmitData(raw_ostream &OS, key_type_ref, data_type_ref Data, unsigned) {
371-
llvm::support::endian::Writer writer(OS, llvm::support::little);
371+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
372372
writer.write<uint32_t>(Data);
373373
}
374374
};
@@ -406,7 +406,7 @@ unsigned getVersionedInfoSize(
406406

407407
/// Emit a serialized representation of a version tuple.
408408
void emitVersionTuple(raw_ostream &OS, const VersionTuple &VT) {
409-
llvm::support::endian::Writer writer(OS, llvm::support::little);
409+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
410410

411411
// First byte contains the number of components beyond the 'major' component.
412412
uint8_t descriptor;
@@ -445,7 +445,7 @@ void emitVersionedInfo(
445445
return LHS.first < RHS.first;
446446
});
447447

448-
llvm::support::endian::Writer writer(OS, llvm::support::little);
448+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
449449
writer.write<uint16_t>(VI.size());
450450
for (const auto &E : VI) {
451451
emitVersionTuple(OS, E.first);
@@ -479,7 +479,7 @@ class VersionedTableInfo {
479479
return asDerived().getUnversionedInfoSize(UI);
480480
});
481481

482-
llvm::support::endian::Writer writer(OS, llvm::support::little);
482+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
483483
writer.write<uint16_t>(KeyLength);
484484
writer.write<uint16_t>(DataLength);
485485
return {KeyLength, DataLength};
@@ -495,7 +495,7 @@ class VersionedTableInfo {
495495

496496
/// Emit a serialized representation of the common entity information.
497497
void emitCommonEntityInfo(raw_ostream &OS, const CommonEntityInfo &CEI) {
498-
llvm::support::endian::Writer writer(OS, llvm::support::little);
498+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
499499

500500
uint8_t payload = 0;
501501
if (auto swiftPrivate = CEI.isSwiftPrivate()) {
@@ -535,7 +535,7 @@ unsigned getCommonTypeInfoSize(const CommonTypeInfo &CTI) {
535535
void emitCommonTypeInfo(raw_ostream &OS, const CommonTypeInfo &CTI) {
536536
emitCommonEntityInfo(OS, CTI);
537537

538-
llvm::support::endian::Writer writer(OS, llvm::support::little);
538+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
539539
if (auto swiftBridge = CTI.getSwiftBridge()) {
540540
writer.write<uint16_t>(swiftBridge->size() + 1);
541541
OS.write(swiftBridge->c_str(), swiftBridge->size());
@@ -558,7 +558,7 @@ class ObjCContextInfoTableInfo
558558
unsigned getKeyLength(key_type_ref) { return sizeof(uint32_t); }
559559

560560
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
561-
llvm::support::endian::Writer writer(OS, llvm::support::little);
561+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
562562
writer.write<uint32_t>(Key);
563563
}
564564

@@ -607,7 +607,7 @@ void APINotesWriter::Implementation::writeObjCContextBlock(
607607
llvm::raw_svector_ostream BlobStream(HashTableBlob);
608608
// Make sure that no bucket is at offset 0
609609
llvm::support::endian::write<uint32_t>(BlobStream, 0,
610-
llvm::support::little);
610+
llvm::endianness::little);
611611
Offset = Generator.Emit(BlobStream);
612612
}
613613

@@ -626,7 +626,7 @@ void APINotesWriter::Implementation::writeObjCContextBlock(
626626
llvm::raw_svector_ostream BlobStream(HashTableBlob);
627627
// Make sure that no bucket is at offset 0
628628
llvm::support::endian::write<uint32_t>(BlobStream, 0,
629-
llvm::support::little);
629+
llvm::endianness::little);
630630
Offset = Generator.Emit(BlobStream);
631631
}
632632

@@ -656,7 +656,7 @@ void emitVariableInfo(raw_ostream &OS, const VariableInfo &VI) {
656656

657657
OS.write(reinterpret_cast<const char *>(bytes), 2);
658658

659-
llvm::support::endian::Writer writer(OS, llvm::support::little);
659+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
660660
writer.write<uint16_t>(VI.getType().size());
661661
OS.write(VI.getType().data(), VI.getType().size());
662662
}
@@ -672,7 +672,7 @@ class ObjCPropertyTableInfo
672672
}
673673

674674
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
675-
llvm::support::endian::Writer writer(OS, llvm::support::little);
675+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
676676
writer.write<uint32_t>(std::get<0>(Key));
677677
writer.write<uint32_t>(std::get<1>(Key));
678678
writer.write<uint8_t>(std::get<2>(Key));
@@ -717,7 +717,7 @@ void APINotesWriter::Implementation::writeObjCPropertyBlock(
717717
llvm::raw_svector_ostream BlobStream(HashTableBlob);
718718
// Make sure that no bucket is at offset 0
719719
llvm::support::endian::write<uint32_t>(BlobStream, 0,
720-
llvm::support::little);
720+
llvm::endianness::little);
721721
Offset = Generator.Emit(BlobStream);
722722
}
723723

@@ -741,7 +741,7 @@ class ObjCMethodTableInfo
741741
}
742742

743743
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
744-
llvm::support::endian::Writer writer(OS, llvm::support::little);
744+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
745745
writer.write<uint32_t>(std::get<0>(Key));
746746
writer.write<uint32_t>(std::get<1>(Key));
747747
writer.write<uint8_t>(std::get<2>(Key));
@@ -757,7 +757,7 @@ class ObjCMethodTableInfo
757757

758758
void emitUnversionedInfo(raw_ostream &OS, const ObjCMethodInfo &OMI) {
759759
uint8_t flags = 0;
760-
llvm::support::endian::Writer writer(OS, llvm::support::little);
760+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
761761
flags = (flags << 1) | OMI.DesignatedInit;
762762
flags = (flags << 1) | OMI.RequiredInit;
763763
writer.write<uint8_t>(flags);
@@ -785,7 +785,7 @@ void APINotesWriter::Implementation::writeObjCMethodBlock(
785785
llvm::raw_svector_ostream BlobStream(HashTableBlob);
786786
// Make sure that no bucket is at offset 0
787787
llvm::support::endian::write<uint32_t>(BlobStream, 0,
788-
llvm::support::little);
788+
llvm::endianness::little);
789789
Offset = Generator.Emit(BlobStream);
790790
}
791791

@@ -815,21 +815,21 @@ class ObjCSelectorTableInfo {
815815
sizeof(uint16_t) + sizeof(uint32_t) * Key.Identifiers.size();
816816
uint32_t DataLength = sizeof(uint32_t);
817817

818-
llvm::support::endian::Writer writer(OS, llvm::support::little);
818+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
819819
writer.write<uint16_t>(KeyLength);
820820
writer.write<uint16_t>(DataLength);
821821
return {KeyLength, DataLength};
822822
}
823823

824824
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
825-
llvm::support::endian::Writer writer(OS, llvm::support::little);
825+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
826826
writer.write<uint16_t>(Key.NumPieces);
827827
for (auto Identifier : Key.Identifiers)
828828
writer.write<uint32_t>(Identifier);
829829
}
830830

831831
void EmitData(raw_ostream &OS, key_type_ref, data_type_ref Data, unsigned) {
832-
llvm::support::endian::Writer writer(OS, llvm::support::little);
832+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
833833
writer.write<uint32_t>(Data);
834834
}
835835
};
@@ -853,7 +853,7 @@ void APINotesWriter::Implementation::writeObjCSelectorBlock(
853853
llvm::raw_svector_ostream BlobStream(HashTableBlob);
854854
// Make sure that no bucket is at offset 0
855855
llvm::support::endian::write<uint32_t>(BlobStream, 0,
856-
llvm::support::little);
856+
llvm::endianness::little);
857857
Offset = Generator.Emit(BlobStream);
858858
}
859859

@@ -873,7 +873,7 @@ class GlobalVariableTableInfo
873873
}
874874

875875
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
876-
llvm::support::endian::Writer writer(OS, llvm::support::little);
876+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
877877
writer.write<uint32_t>(Key.parentContextID);
878878
writer.write<uint8_t>(Key.contextKind);
879879
writer.write<uint32_t>(Key.contextID);
@@ -911,7 +911,7 @@ void APINotesWriter::Implementation::writeGlobalVariableBlock(
911911
llvm::raw_svector_ostream BlobStream(HashTableBlob);
912912
// Make sure that no bucket is at offset 0
913913
llvm::support::endian::write<uint32_t>(BlobStream, 0,
914-
llvm::support::little);
914+
llvm::endianness::little);
915915
Offset = Generator.Emit(BlobStream);
916916
}
917917

@@ -938,7 +938,7 @@ void emitParamInfo(raw_ostream &OS, const ParamInfo &PI) {
938938
if (auto RCC = PI.getRetainCountConvention())
939939
flags |= static_cast<uint8_t>(RCC.value()) + 1;
940940

941-
llvm::support::endian::Writer writer(OS, llvm::support::little);
941+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
942942
writer.write<uint8_t>(flags);
943943
}
944944

@@ -963,7 +963,7 @@ void emitFunctionInfo(raw_ostream &OS, const FunctionInfo &FI) {
963963
if (auto RCC = FI.getRetainCountConvention())
964964
flags |= static_cast<uint8_t>(RCC.value()) + 1;
965965

966-
llvm::support::endian::Writer writer(OS, llvm::support::little);
966+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
967967

968968
writer.write<uint8_t>(flags);
969969
writer.write<uint8_t>(FI.NumAdjustedNullable);
@@ -987,7 +987,7 @@ class GlobalFunctionTableInfo
987987
}
988988

989989
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
990-
llvm::support::endian::Writer writer(OS, llvm::support::little);
990+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
991991
writer.write<uint32_t>(Key.parentContextID);
992992
writer.write<uint8_t>(Key.contextKind);
993993
writer.write<uint32_t>(Key.contextID);
@@ -1025,7 +1025,7 @@ void APINotesWriter::Implementation::writeGlobalFunctionBlock(
10251025
llvm::raw_svector_ostream BlobStream(HashTableBlob);
10261026
// Make sure that no bucket is at offset 0
10271027
llvm::support::endian::write<uint32_t>(BlobStream, 0,
1028-
llvm::support::little);
1028+
llvm::endianness::little);
10291029
Offset = Generator.Emit(BlobStream);
10301030
}
10311031

@@ -1043,7 +1043,7 @@ class EnumConstantTableInfo
10431043
unsigned getKeyLength(key_type_ref) { return sizeof(uint32_t); }
10441044

10451045
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
1046-
llvm::support::endian::Writer writer(OS, llvm::support::little);
1046+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
10471047
writer.write<uint32_t>(Key);
10481048
}
10491049

@@ -1079,7 +1079,7 @@ void APINotesWriter::Implementation::writeEnumConstantBlock(
10791079
llvm::raw_svector_ostream BlobStream(HashTableBlob);
10801080
// Make sure that no bucket is at offset 0
10811081
llvm::support::endian::write<uint32_t>(BlobStream, 0,
1082-
llvm::support::little);
1082+
llvm::endianness::little);
10831083
Offset = Generator.Emit(BlobStream);
10841084
}
10851085

@@ -1101,7 +1101,7 @@ class CommonTypeTableInfo
11011101
}
11021102

11031103
void EmitKey(raw_ostream &OS, key_type_ref Key, unsigned) {
1104-
llvm::support::endian::Writer writer(OS, llvm::support::little);
1104+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
11051105
writer.write<uint32_t>(Key.parentContextID);
11061106
writer.write<uint8_t>(Key.contextKind);
11071107
writer.write<IdentifierID>(Key.contextID);
@@ -1131,7 +1131,7 @@ class TagTableInfo : public CommonTypeTableInfo<TagTableInfo, TagInfo> {
11311131
}
11321132

11331133
void emitUnversionedInfo(raw_ostream &OS, const TagInfo &TI) {
1134-
llvm::support::endian::Writer writer(OS, llvm::support::little);
1134+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
11351135

11361136
uint8_t Flags = 0;
11371137
if (auto extensibility = TI.EnumExtensibility) {
@@ -1187,7 +1187,7 @@ void APINotesWriter::Implementation::writeTagBlock(
11871187
llvm::raw_svector_ostream BlobStream(HashTableBlob);
11881188
// Make sure that no bucket is at offset 0
11891189
llvm::support::endian::write<uint32_t>(BlobStream, 0,
1190-
llvm::support::little);
1190+
llvm::endianness::little);
11911191
Offset = Generator.Emit(BlobStream);
11921192
}
11931193

@@ -1206,7 +1206,7 @@ class TypedefTableInfo
12061206
}
12071207

12081208
void emitUnversionedInfo(raw_ostream &OS, const TypedefInfo &TI) {
1209-
llvm::support::endian::Writer writer(OS, llvm::support::little);
1209+
llvm::support::endian::Writer writer(OS, llvm::endianness::little);
12101210

12111211
uint8_t Flags = 0;
12121212
if (auto swiftWrapper = TI.SwiftWrapper)
@@ -1237,7 +1237,7 @@ void APINotesWriter::Implementation::writeTypedefBlock(
12371237
llvm::raw_svector_ostream BlobStream(HashTableBlob);
12381238
// Make sure that no bucket is at offset 0
12391239
llvm::support::endian::write<uint32_t>(BlobStream, 0,
1240-
llvm::support::little);
1240+
llvm::endianness::little);
12411241
Offset = Generator.Emit(BlobStream);
12421242
}
12431243

‎clang/lib/Basic/SourceManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ LineOffsetMapping LineOffsetMapping::get(llvm::MemoryBufferRef Buffer,
12191219
// This is much faster than scanning each byte independently.
12201220
if ((unsigned long)(End - Start) > sizeof(Word)) {
12211221
do {
1222-
Word = llvm::support::endian::read64(Buf, llvm::support::little);
1222+
Word = llvm::support::endian::read64(Buf, llvm::endianness::little);
12231223
// no new line => jump over sizeof(Word) bytes.
12241224
auto Mask = likelyhasbetween(Word, '\n', '\r');
12251225
if (!Mask) {

‎clang/lib/Driver/OffloadBundler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static uint64_t Read8byteIntegerFromBuffer(StringRef Buffer, size_t pos) {
324324

325325
/// Write 8-byte integers to a buffer in little-endian format.
326326
static void Write8byteIntegerToBuffer(raw_ostream &OS, uint64_t Val) {
327-
llvm::support::endian::write(OS, Val, llvm::support::little);
327+
llvm::support::endian::write(OS, Val, llvm::endianness::little);
328328
}
329329

330330
class BinaryFileHandler final : public FileHandler {

‎lld/ELF/DWARF.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ template <class ELFT> class LLDDwarfObj final : public llvm::DWARFObject {
7373
StringRef getLineStrSection() const override { return lineStrSection; }
7474

7575
bool isLittleEndian() const override {
76-
return ELFT::TargetEndianness == llvm::support::little;
76+
return ELFT::TargetEndianness == llvm::endianness::little;
7777
}
7878

7979
std::optional<llvm::RelocAddrEntry> find(const llvm::DWARFSection &sec,

‎lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ObjectFilePDB::loadPDBFile(std::string PdbPath,
179179

180180
llvm::StringRef Path = Buffer->getBufferIdentifier();
181181
auto Stream = std::make_unique<llvm::MemoryBufferByteStream>(
182-
std::move(Buffer), llvm::support::little);
182+
std::move(Buffer), llvm::endianness::little);
183183

184184
auto File = std::make_unique<PDBFile>(Path, std::move(Stream), Allocator);
185185
if (auto EC = File->parseFileHeaders()) {

‎llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SymbolVisitorDelegate;
2424
class SymbolDeserializer : public SymbolVisitorCallbacks {
2525
struct MappingInfo {
2626
MappingInfo(ArrayRef<uint8_t> RecordData, CodeViewContainer Container)
27-
: Stream(RecordData, llvm::support::little), Reader(Stream),
27+
: Stream(RecordData, llvm::endianness::little), Reader(Stream),
2828
Mapping(Reader, Container) {}
2929

3030
BinaryByteStream Stream;

‎llvm/include/llvm/DebugInfo/CodeView/TypeDeserializer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace codeview {
2828
class TypeDeserializer : public TypeVisitorCallbacks {
2929
struct MappingInfo {
3030
explicit MappingInfo(ArrayRef<uint8_t> RecordData)
31-
: Stream(RecordData, llvm::support::little), Reader(Stream),
31+
: Stream(RecordData, llvm::endianness::little), Reader(Stream),
3232
Mapping(Reader) {}
3333

3434
BinaryByteStream Stream;

‎llvm/include/llvm/Support/BinaryByteStream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class MutableBinaryByteStream : public WritableBinaryStream {
133133
/// causing the underlying data to grow. This class owns the underlying data.
134134
class AppendingBinaryByteStream : public WritableBinaryStream {
135135
std::vector<uint8_t> Data;
136-
llvm::endianness Endian = llvm::support::little;
136+
llvm::endianness Endian = llvm::endianness::little;
137137

138138
public:
139139
AppendingBinaryByteStream() = default;

0 commit comments

Comments
 (0)