Skip to content

Commit 6a0746a

Browse files
MaskRayMaskRay
committed
Change some StringRef::data() reinterpret_cast to bytes_begin() or arrayRefFromStringRef()
llvm-svn: 357852
1 parent fca0789 commit 6a0746a

File tree

15 files changed

+24
-41
lines changed

15 files changed

+24
-41
lines changed

‎llvm/include/llvm/Bitcode/BitstreamReader.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ class SimpleBitstreamCursor {
103103
explicit SimpleBitstreamCursor(ArrayRef<uint8_t> BitcodeBytes)
104104
: BitcodeBytes(BitcodeBytes) {}
105105
explicit SimpleBitstreamCursor(StringRef BitcodeBytes)
106-
: BitcodeBytes(reinterpret_cast<const uint8_t *>(BitcodeBytes.data()),
107-
BitcodeBytes.size()) {}
106+
: BitcodeBytes(arrayRefFromStringRef(BitcodeBytes)) {}
108107
explicit SimpleBitstreamCursor(MemoryBufferRef BitcodeBytes)
109108
: SimpleBitstreamCursor(BitcodeBytes.getBuffer()) {}
110109

‎llvm/include/llvm/Object/ELF.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ class ELFFile {
7979
using Elf_Relr_Range = typename ELFT::RelrRange;
8080
using Elf_Phdr_Range = typename ELFT::PhdrRange;
8181

82-
const uint8_t *base() const {
83-
return reinterpret_cast<const uint8_t *>(Buf.data());
84-
}
82+
const uint8_t *base() const { return Buf.bytes_begin(); }
8583

8684
size_t getBufSize() const { return Buf.size(); }
8785

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ class BinaryRef {
7373
public:
7474
BinaryRef() = default;
7575
BinaryRef(ArrayRef<uint8_t> Data) : Data(Data), DataIsHexString(false) {}
76-
BinaryRef(StringRef Data)
77-
: Data(reinterpret_cast<const uint8_t *>(Data.data()), Data.size()) {}
76+
BinaryRef(StringRef Data) : Data(arrayRefFromStringRef(Data)) {}
7877

7978
/// The number of bytes that are represented by this BinaryRef.
8079
/// This is the number of bytes that writeAsBinary() will write.

‎llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ bool DWARFFormValue::extractValue(const DWARFDataExtractor &Data,
354354
StringRef Str = Data.getData().substr(*OffsetPtr, Value.uval);
355355
Value.data = nullptr;
356356
if (!Str.empty()) {
357-
Value.data = reinterpret_cast<const uint8_t *>(Str.data());
357+
Value.data = Str.bytes_begin();
358358
*OffsetPtr += Value.uval;
359359
}
360360
}

‎llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,7 @@ class RuntimeDyldCheckerExprEval {
666666
bool decodeInst(StringRef Symbol, MCInst &Inst, uint64_t &Size) const {
667667
MCDisassembler *Dis = Checker.Disassembler;
668668
StringRef SectionMem = Checker.getSubsectionStartingAt(Symbol);
669-
ArrayRef<uint8_t> SectionBytes(
670-
reinterpret_cast<const uint8_t *>(SectionMem.data()),
671-
SectionMem.size());
669+
ArrayRef<uint8_t> SectionBytes(SectionMem.bytes_begin(), SectionMem.size());
672670

673671
MCDisassembler::DecodeStatus S =
674672
Dis->getInstruction(Inst, Size, SectionBytes, 0, nulls(), nulls());

‎llvm/lib/IR/Constants.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,7 @@ Constant *ConstantDataArray::getFP(LLVMContext &Context,
25762576
Constant *ConstantDataArray::getString(LLVMContext &Context,
25772577
StringRef Str, bool AddNull) {
25782578
if (!AddNull) {
2579-
const uint8_t *Data = reinterpret_cast<const uint8_t *>(Str.data());
2579+
const uint8_t *Data = Str.bytes_begin();
25802580
return get(Context, makeArrayRef(Data, Str.size()));
25812581
}
25822582

‎llvm/lib/Object/WasmObjectFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ WasmObjectFile::WasmObjectFile(MemoryBufferRef Buffer, Error &Err)
255255
}
256256

257257
ReadContext Ctx;
258-
Ctx.Start = reinterpret_cast<const uint8_t *>(getData().data());
258+
Ctx.Start = getData().bytes_begin();
259259
Ctx.Ptr = Ctx.Start + 4;
260260
Ctx.End = Ctx.Start + getData().size();
261261

‎llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Error RawCoverageReader::readULEB128(uint64_t &Result) {
5959
if (Data.empty())
6060
return make_error<CoverageMapError>(coveragemap_error::truncated);
6161
unsigned N = 0;
62-
Result = decodeULEB128(reinterpret_cast<const uint8_t *>(Data.data()), &N);
62+
Result = decodeULEB128(Data.bytes_begin(), &N);
6363
if (N > Data.size())
6464
return make_error<CoverageMapError>(coveragemap_error::malformed);
6565
Data = Data.substr(N);
@@ -595,16 +595,14 @@ static Error loadTestingFormat(StringRef Data, InstrProfSymtab &ProfileNames,
595595
if (Data.empty())
596596
return make_error<CoverageMapError>(coveragemap_error::truncated);
597597
unsigned N = 0;
598-
auto ProfileNamesSize =
599-
decodeULEB128(reinterpret_cast<const uint8_t *>(Data.data()), &N);
598+
uint64_t ProfileNamesSize = decodeULEB128(Data.bytes_begin(), &N);
600599
if (N > Data.size())
601600
return make_error<CoverageMapError>(coveragemap_error::malformed);
602601
Data = Data.substr(N);
603602
if (Data.empty())
604603
return make_error<CoverageMapError>(coveragemap_error::truncated);
605604
N = 0;
606-
uint64_t Address =
607-
decodeULEB128(reinterpret_cast<const uint8_t *>(Data.data()), &N);
605+
uint64_t Address = decodeULEB128(Data.bytes_begin(), &N);
608606
if (N > Data.size())
609607
return make_error<CoverageMapError>(coveragemap_error::malformed);
610608
Data = Data.substr(N);

‎llvm/lib/ProfileData/InstrProf.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,8 @@ Error collectPGOFuncNameStrings(ArrayRef<GlobalVariable *> NameVars,
434434
}
435435

436436
Error readPGOFuncNameStrings(StringRef NameStrings, InstrProfSymtab &Symtab) {
437-
const uint8_t *P = reinterpret_cast<const uint8_t *>(NameStrings.data());
438-
const uint8_t *EndP = reinterpret_cast<const uint8_t *>(NameStrings.data() +
439-
NameStrings.size());
437+
const uint8_t *P = NameStrings.bytes_begin();
438+
const uint8_t *EndP = NameStrings.bytes_end();
440439
while (P < EndP) {
441440
uint32_t N;
442441
uint64_t UncompressedSize = decodeULEB128(P, &N);

‎llvm/tools/llvm-objdump/MachODump.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7275,8 +7275,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
72757275

72767276
StringRef BytesStr;
72777277
Sections[SectIdx].getContents(BytesStr);
7278-
ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(BytesStr.data()),
7279-
BytesStr.size());
7278+
ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
72807279
uint64_t SectAddress = Sections[SectIdx].getAddress();
72817280

72827281
bool symbolTableWorked = false;

‎llvm/tools/llvm-objdump/llvm-objdump.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,8 +1084,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
10841084

10851085
StringRef BytesStr;
10861086
error(Section.getContents(BytesStr));
1087-
ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(BytesStr.data()),
1088-
BytesStr.size());
1087+
ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
10891088

10901089
uint64_t VMAAdjustment = 0;
10911090
if (shouldAdjustVA(Section))

‎llvm/tools/llvm-readobj/COFFDumper.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,9 +1862,8 @@ void COFFDumper::printStackMap() const {
18621862

18631863
StringRef StackMapContents;
18641864
StackMapSection.getContents(StackMapContents);
1865-
ArrayRef<uint8_t> StackMapContentsArray(
1866-
reinterpret_cast<const uint8_t*>(StackMapContents.data()),
1867-
StackMapContents.size());
1865+
ArrayRef<uint8_t> StackMapContentsArray =
1866+
arrayRefFromStringRef(StackMapContents);
18681867

18691868
if (Obj->isLittleEndian())
18701869
prettyPrintStackMap(
@@ -1890,13 +1889,12 @@ void COFFDumper::printAddrsig() {
18901889

18911890
StringRef AddrsigContents;
18921891
AddrsigSection.getContents(AddrsigContents);
1893-
ArrayRef<uint8_t> AddrsigContentsArray(
1894-
reinterpret_cast<const uint8_t*>(AddrsigContents.data()),
1895-
AddrsigContents.size());
1892+
ArrayRef<uint8_t> AddrsigContentsArray(AddrsigContents.bytes_begin(),
1893+
AddrsigContents.size());
18961894

18971895
ListScope L(W, "Addrsig");
1898-
auto *Cur = reinterpret_cast<const uint8_t *>(AddrsigContents.begin());
1899-
auto *End = reinterpret_cast<const uint8_t *>(AddrsigContents.end());
1896+
const uint8_t *Cur = AddrsigContents.bytes_begin();
1897+
const uint8_t *End = AddrsigContents.bytes_end();
19001898
while (Cur != End) {
19011899
unsigned Size;
19021900
const char *Err;

‎llvm/tools/llvm-readobj/MachODumper.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,8 @@ void MachODumper::printStackMap() const {
661661

662662
StringRef StackMapContents;
663663
StackMapSection.getContents(StackMapContents);
664-
ArrayRef<uint8_t> StackMapContentsArray(
665-
reinterpret_cast<const uint8_t*>(StackMapContents.data()),
666-
StackMapContents.size());
664+
ArrayRef<uint8_t> StackMapContentsArray =
665+
arrayRefFromStringRef(StackMapContents);
667666

668667
if (Obj->isLittleEndian())
669668
prettyPrintStackMap(

‎llvm/tools/sancov/sancov.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -843,8 +843,7 @@ static void getObjectCoveragePoints(const object::ObjectFile &O,
843843

844844
StringRef BytesStr;
845845
failIfError(Section.getContents(BytesStr));
846-
ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(BytesStr.data()),
847-
BytesStr.size());
846+
ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
848847

849848
for (uint64_t Index = 0, Size = 0; Index < Section.getSize();
850849
Index += Size) {

‎llvm/unittests/MC/DwarfLineTables.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ void verifyEncoding(MCDwarfLineTableParams Params, int LineDelta, int AddrDelta,
5757
raw_svector_ostream EncodingOS(Buffer);
5858
MCDwarfLineAddr::Encode(getContext(), Params, LineDelta, AddrDelta,
5959
EncodingOS);
60-
ArrayRef<uint8_t> Encoding(reinterpret_cast<uint8_t *>(Buffer.data()),
61-
Buffer.size());
62-
EXPECT_EQ(ExpectedEncoding, Encoding);
60+
EXPECT_EQ(ExpectedEncoding, arrayRefFromStringRef(Buffer));
6361
}
6462

6563
TEST(DwarfLineTables, TestDefaultParams) {

0 commit comments

Comments
 (0)