From b05dbc4d5f28e4fe6ac4486925e09d64861720cc Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 10 Oct 2023 20:14:20 -0700 Subject: [llvm] Use llvm::endianness::{big,little,native} (NFC) Now that llvm::support::endianness has been renamed to llvm::endianness, we can use the shorter form. This patch replaces support::endianness::{big,little,native} with llvm::endianness::{big,little,native}. --- .../ProfileData/Coverage/CoverageMappingReader.cpp | 41 ++++++++++------------ 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp') diff --git a/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp b/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp index e468fbf..dbba5bc 100644 --- a/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp +++ b/llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp @@ -857,25 +857,23 @@ BinaryCoverageReader::createCoverageReaderFromBuffer( new BinaryCoverageReader(std::move(FuncRecords))); Reader->ProfileNames = std::move(ProfileNames); StringRef FuncRecordsRef = Reader->FuncRecords->getBuffer(); - if (BytesInAddress == 4 && Endian == support::endianness::little) { - if (Error E = - readCoverageMappingData( - Reader->ProfileNames, Coverage, FuncRecordsRef, - Reader->MappingRecords, CompilationDir, Reader->Filenames)) + if (BytesInAddress == 4 && Endian == llvm::endianness::little) { + if (Error E = readCoverageMappingData( + Reader->ProfileNames, Coverage, FuncRecordsRef, + Reader->MappingRecords, CompilationDir, Reader->Filenames)) return std::move(E); - } else if (BytesInAddress == 4 && Endian == support::endianness::big) { - if (Error E = readCoverageMappingData( + } else if (BytesInAddress == 4 && Endian == llvm::endianness::big) { + if (Error E = readCoverageMappingData( Reader->ProfileNames, Coverage, FuncRecordsRef, Reader->MappingRecords, CompilationDir, Reader->Filenames)) return std::move(E); - } else if (BytesInAddress == 8 && Endian == support::endianness::little) { - if (Error E = - readCoverageMappingData( - Reader->ProfileNames, Coverage, FuncRecordsRef, - Reader->MappingRecords, CompilationDir, Reader->Filenames)) + } else if (BytesInAddress == 8 && Endian == llvm::endianness::little) { + if (Error E = readCoverageMappingData( + Reader->ProfileNames, Coverage, FuncRecordsRef, + Reader->MappingRecords, CompilationDir, Reader->Filenames)) return std::move(E); - } else if (BytesInAddress == 8 && Endian == support::endianness::big) { - if (Error E = readCoverageMappingData( + } else if (BytesInAddress == 8 && Endian == llvm::endianness::big) { + if (Error E = readCoverageMappingData( Reader->ProfileNames, Coverage, FuncRecordsRef, Reader->MappingRecords, CompilationDir, Reader->Filenames)) return std::move(E); @@ -889,7 +887,7 @@ BinaryCoverageReader::createCoverageReaderFromBuffer( static Expected> loadTestingFormat(StringRef Data, StringRef CompilationDir) { uint8_t BytesInAddress = 8; - support::endianness Endian = support::endianness::little; + support::endianness Endian = llvm::endianness::little; // Read the magic and version. Data = Data.substr(sizeof(TestingFormatMagic)); @@ -897,7 +895,7 @@ loadTestingFormat(StringRef Data, StringRef CompilationDir) { return make_error(coveragemap_error::malformed, "the size of data is too small"); auto TestingVersion = - support::endian::byte_swap( + support::endian::byte_swap( *reinterpret_cast(Data.data())); Data = Data.substr(sizeof(uint64_t)); @@ -957,7 +955,7 @@ loadTestingFormat(StringRef Data, StringRef CompilationDir) { auto const *CovHeader = reinterpret_cast( Data.substr(0, sizeof(CovMapHeader)).data()); auto Version = - CovMapVersion(CovHeader->getVersion()); + CovMapVersion(CovHeader->getVersion()); // In Version1, the size of CoverageMapping is calculated. if (TestingVersion == uint64_t(TestingFormatVersion::Version1)) { @@ -965,7 +963,7 @@ loadTestingFormat(StringRef Data, StringRef CompilationDir) { CoverageMappingSize = Data.size(); } else { auto FilenamesSize = - CovHeader->getFilenamesSize(); + CovHeader->getFilenamesSize(); CoverageMappingSize = sizeof(CovMapHeader) + FilenamesSize; } } @@ -1046,9 +1044,8 @@ loadBinaryFormat(std::unique_ptr Bin, StringRef Arch, // The coverage uses native pointer sizes for the object it's written in. uint8_t BytesInAddress = OF->getBytesInAddress(); - support::endianness Endian = OF->isLittleEndian() - ? support::endianness::little - : support::endianness::big; + support::endianness Endian = + OF->isLittleEndian() ? llvm::endianness::little : llvm::endianness::big; // Look for the sections that we are interested in. auto ObjFormat = OF->getTripleObjectFormat(); @@ -1156,7 +1153,7 @@ BinaryCoverageReader::create( if (ObjectBuffer.getBuffer().size() > sizeof(TestingFormatMagic)) { uint64_t Magic = - support::endian::byte_swap( + support::endian::byte_swap( *reinterpret_cast(ObjectBuffer.getBufferStart())); if (Magic == TestingFormatMagic) { // This is a special format used for testing. -- cgit v1.1