Skip to content

Commit 26ec66d

Browse files
[llvm] Use a new constructor of ArrayRef (NFC) (llvm#146008)
ArrayRef now has a new constructor that takes a parameter whose type has data() and size(). This patch migrates: ArrayRef<T>(X.data(), X.size() to: ArrayRef<T>(X)
1 parent 8f71650 commit 26ec66d

File tree

10 files changed

+13
-16
lines changed

10 files changed

+13
-16
lines changed

llvm/include/llvm/Object/ELF.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ Expected<typename ELFT::ShdrRange> ELFFile<ELFT>::sections() const {
931931
const uintX_t SectionTableOffset = getHeader().e_shoff;
932932
if (SectionTableOffset == 0) {
933933
if (!FakeSections.empty())
934-
return ArrayRef(FakeSections.data(), FakeSections.size());
934+
return ArrayRef(FakeSections);
935935
return ArrayRef<Elf_Shdr>();
936936
}
937937

llvm/lib/ExecutionEngine/JITLink/XCOFFLinkGraphBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Error XCOFFLinkGraphBuilder::processCsectsAndSymbols() {
296296
if (!CsectSymbolAddr)
297297
return CsectSymbolAddr.takeError();
298298

299-
ArrayRef<char> SectionBuffer{Data->data(), Data->size()};
299+
ArrayRef<char> SectionBuffer{*Data};
300300
auto Offset = *CsectSymbolAddr - SectionRef.getAddress();
301301

302302
LLVM_DEBUG(dbgs() << " symbol entry: offset = " << Offset

llvm/lib/ExecutionEngine/Orc/SectCreate.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ void SectCreateMaterializationUnit::materialize(
2323
SubtargetFeatures(), getGenericEdgeKindName);
2424

2525
auto &Sect = G->createSection(SectName, MP);
26-
auto Content = G->allocateContent(
27-
ArrayRef<char>(Data->getBuffer().data(), Data->getBuffer().size()));
26+
auto Content = G->allocateContent(ArrayRef<char>(Data->getBuffer()));
2827
auto &B = G->createContentBlock(Sect, Content, ExecutorAddr(), Alignment, 0);
2928

3029
for (auto &[Name, Info] : ExtraSymbols) {

llvm/lib/Object/OffloadBundle.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,7 @@ CompressedOffloadBundle::decompress(llvm::MemoryBufferRef &Input,
339339
HashRecalcTimer.startTimer();
340340
llvm::MD5 Hash;
341341
llvm::MD5::MD5Result Result;
342-
Hash.update(llvm::ArrayRef<uint8_t>(DecompressedData.data(),
343-
DecompressedData.size()));
342+
Hash.update(llvm::ArrayRef<uint8_t>(DecompressedData));
344343
Hash.final(Result);
345344
uint64_t RecalculatedHash = Result.low();
346345
HashRecalcTimer.stopTimer();

llvm/lib/XRay/FDRTraceWriter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Error FDRTraceWriter::visit(CustomEventRecord &R) {
9696
if (auto E = writeMetadata<5u>(OS, R.size(), R.tsc(), R.cpu()))
9797
return E;
9898
auto D = R.data();
99-
ArrayRef<char> Bytes(D.data(), D.size());
99+
ArrayRef<char> Bytes(D);
100100
OS.write(Bytes);
101101
return Error::success();
102102
}
@@ -105,7 +105,7 @@ Error FDRTraceWriter::visit(CustomEventRecordV5 &R) {
105105
if (auto E = writeMetadata<5u>(OS, R.size(), R.delta()))
106106
return E;
107107
auto D = R.data();
108-
ArrayRef<char> Bytes(D.data(), D.size());
108+
ArrayRef<char> Bytes(D);
109109
OS.write(Bytes);
110110
return Error::success();
111111
}
@@ -114,7 +114,7 @@ Error FDRTraceWriter::visit(TypedEventRecord &R) {
114114
if (auto E = writeMetadata<8u>(OS, R.size(), R.delta(), R.eventType()))
115115
return E;
116116
auto D = R.data();
117-
ArrayRef<char> Bytes(D.data(), D.size());
117+
ArrayRef<char> Bytes(D);
118118
OS.write(Bytes);
119119
return Error::success();
120120
}

llvm/tools/llvm-mc/Disassembler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef std::pair<std::vector<unsigned char>, std::vector<const char *>>
3535
static bool PrintInsts(const MCDisassembler &DisAsm, const ByteArrayTy &Bytes,
3636
SourceMgr &SM, MCStreamer &Streamer, bool InAtomicBlock,
3737
const MCSubtargetInfo &STI) {
38-
ArrayRef<uint8_t> Data(Bytes.first.data(), Bytes.first.size());
38+
ArrayRef<uint8_t> Data(Bytes.first);
3939

4040
// Disassemble it to strings.
4141
uint64_t Size;

llvm/tools/llvm-ml/Disassembler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ typedef std::pair<std::vector<unsigned char>, std::vector<const char *>>
3333
static bool PrintInsts(const MCDisassembler &DisAsm, const ByteArrayTy &Bytes,
3434
SourceMgr &SM, raw_ostream &Out, MCStreamer &Streamer,
3535
bool InAtomicBlock, const MCSubtargetInfo &STI) {
36-
ArrayRef<uint8_t> Data(Bytes.first.data(), Bytes.first.size());
36+
ArrayRef<uint8_t> Data(Bytes.first);
3737

3838
// Disassemble it to strings.
3939
uint64_t Size;

llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ static int linkAndVerify() {
921921
RuntimeDyldChecker::MemoryRegionInfo SecInfo;
922922
SecInfo.setTargetAddress(Dyld.getSectionLoadAddress(*SectionID));
923923
StringRef SecContent = Dyld.getSectionContent(*SectionID);
924-
SecInfo.setContent(ArrayRef<char>(SecContent.data(), SecContent.size()));
924+
SecInfo.setContent(ArrayRef<char>(SecContent));
925925
return SecInfo;
926926
};
927927

@@ -945,8 +945,7 @@ static int linkAndVerify() {
945945
SI.Offset);
946946
StringRef SecContent =
947947
Dyld.getSectionContent(SI.SectionID).substr(SI.Offset);
948-
StubMemInfo.setContent(
949-
ArrayRef<char>(SecContent.data(), SecContent.size()));
948+
StubMemInfo.setContent(ArrayRef<char>(SecContent));
950949
return StubMemInfo;
951950
};
952951

llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ TEST(ExecutionSessionWrapperFunctionCalls, RegisterAsyncHandlerAndRun) {
110110
EXPECT_TRUE(SPSArgList<int32_t>::deserialize(IB, Result));
111111
RP.set_value(Result);
112112
},
113-
AddAsyncTagAddr, ArrayRef<char>(ArgBuffer.data(), ArgBuffer.size()));
113+
AddAsyncTagAddr, ArrayRef<char>(ArgBuffer));
114114

115115
EXPECT_EQ(RF.get(), (int32_t)3);
116116

llvm/unittests/Support/Base64Test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void TestBase64Decode(StringRef Input, StringRef Expected,
3131
if (ExpectedErrorMessage.empty()) {
3232
ASSERT_THAT_ERROR(decodeBase64(Input, DecodedBytes), Succeeded());
3333
EXPECT_EQ(llvm::ArrayRef<char>(DecodedBytes),
34-
llvm::ArrayRef<char>(Expected.data(), Expected.size()));
34+
llvm::ArrayRef<char>(Expected));
3535
} else {
3636
ASSERT_THAT_ERROR(decodeBase64(Input, DecodedBytes),
3737
FailedWithMessage(ExpectedErrorMessage));

0 commit comments

Comments
 (0)