Skip to content

Commit 8eb5baf

Browse files
[memprof] Use IndexedMemProfData in a unit test (NFC) (#119062)
IndexedMemProfData eliminates the need for the "using" directives. Also, we do not need to declare maps for individual components of the MemProf profile.
1 parent 4cf0bd8 commit 8eb5baf

File tree

1 file changed

+12
-20
lines changed

1 file changed

+12
-20
lines changed

llvm/unittests/ProfileData/MemProfTest.cpp

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,6 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
549549
EXPECT_EQ(Record.CallSites[1][1].hash(), F4.hash());
550550
}
551551

552-
using FrameIdMapTy =
553-
llvm::DenseMap<::llvm::memprof::FrameId, ::llvm::memprof::Frame>;
554-
using CallStackIdMapTy =
555-
llvm::DenseMap<::llvm::memprof::CallStackId,
556-
::llvm::SmallVector<::llvm::memprof::FrameId>>;
557-
558552
// Populate those fields returned by getHotColdSchema.
559553
MemInfoBlock makePartialMIB() {
560554
MemInfoBlock MIB;
@@ -575,12 +569,11 @@ TEST(MemProf, MissingCallStackId) {
575569
IndexedMR.AllocSites.push_back(AI);
576570

577571
// Create empty maps.
578-
const FrameIdMapTy IdToFrameMap;
579-
const CallStackIdMapTy CSIdToCallStackMap;
580-
llvm::memprof::FrameIdConverter<decltype(IdToFrameMap)> FrameIdConv(
581-
IdToFrameMap);
582-
llvm::memprof::CallStackIdConverter<decltype(CSIdToCallStackMap)> CSIdConv(
583-
CSIdToCallStackMap, FrameIdConv);
572+
IndexedMemProfData MemProfData;
573+
llvm::memprof::FrameIdConverter<decltype(MemProfData.Frames)> FrameIdConv(
574+
MemProfData.Frames);
575+
llvm::memprof::CallStackIdConverter<decltype(MemProfData.CallStacks)>
576+
CSIdConv(MemProfData.CallStacks, FrameIdConv);
584577

585578
// We are only interested in errors, not the return value.
586579
(void)IndexedMR.toMemProfRecord(CSIdConv);
@@ -597,15 +590,14 @@ TEST(MemProf, MissingFrameId) {
597590
IndexedMemProfRecord IndexedMR;
598591
IndexedMR.AllocSites.push_back(AI);
599592

600-
// An empty map to trigger a mapping error.
601-
const FrameIdMapTy IdToFrameMap;
602-
CallStackIdMapTy CSIdToCallStackMap;
603-
CSIdToCallStackMap.insert({0x222, {2, 3}});
593+
// An empty Frame map to trigger a mapping error.
594+
IndexedMemProfData MemProfData;
595+
MemProfData.CallStacks.insert({0x222, {2, 3}});
604596

605-
llvm::memprof::FrameIdConverter<decltype(IdToFrameMap)> FrameIdConv(
606-
IdToFrameMap);
607-
llvm::memprof::CallStackIdConverter<decltype(CSIdToCallStackMap)> CSIdConv(
608-
CSIdToCallStackMap, FrameIdConv);
597+
llvm::memprof::FrameIdConverter<decltype(MemProfData.Frames)> FrameIdConv(
598+
MemProfData.Frames);
599+
llvm::memprof::CallStackIdConverter<decltype(MemProfData.CallStacks)>
600+
CSIdConv(MemProfData.CallStacks, FrameIdConv);
609601

610602
// We are only interested in errors, not the return value.
611603
(void)IndexedMR.toMemProfRecord(CSIdConv);

0 commit comments

Comments
 (0)