@@ -36,6 +36,7 @@ using ::llvm::memprof::Frame;
36
36
using ::llvm::memprof::FrameId;
37
37
using ::llvm::memprof::hashCallStack;
38
38
using ::llvm::memprof::IndexedAllocationInfo;
39
+ using ::llvm::memprof::IndexedMemProfData;
39
40
using ::llvm::memprof::IndexedMemProfRecord;
40
41
using ::llvm::memprof::MemInfoBlock;
41
42
using ::llvm::memprof::MemProfReader;
@@ -500,25 +501,24 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
500
501
// Verify that MemProfRecord can be constructed from IndexedMemProfRecord with
501
502
// CallStackIds only.
502
503
503
- llvm::DenseMap<FrameId, Frame> FrameIdMap ;
504
+ IndexedMemProfData MemProfData ;
504
505
Frame F1 (1 , 0 , 0 , false );
505
506
Frame F2 (2 , 0 , 0 , false );
506
507
Frame F3 (3 , 0 , 0 , false );
507
508
Frame F4 (4 , 0 , 0 , false );
508
- FrameIdMap. insert ({F1. hash (), F1} );
509
- FrameIdMap. insert ({F2. hash (), F2} );
510
- FrameIdMap. insert ({F3. hash (), F3} );
511
- FrameIdMap. insert ({F4. hash (), F4} );
509
+ MemProfData. addFrame (F1 );
510
+ MemProfData. addFrame (F2 );
511
+ MemProfData. addFrame (F3 );
512
+ MemProfData. addFrame (F4 );
512
513
513
- llvm::DenseMap<CallStackId, llvm::SmallVector<FrameId>> CallStackIdMap;
514
514
llvm::SmallVector<FrameId> CS1 = {F1.hash (), F2.hash ()};
515
515
llvm::SmallVector<FrameId> CS2 = {F1.hash (), F3.hash ()};
516
516
llvm::SmallVector<FrameId> CS3 = {F2.hash (), F3.hash ()};
517
517
llvm::SmallVector<FrameId> CS4 = {F2.hash (), F4.hash ()};
518
- CallStackIdMap. insert ({ hashCallStack ( CS1), CS1} );
519
- CallStackIdMap. insert ({ hashCallStack ( CS2), CS2} );
520
- CallStackIdMap. insert ({ hashCallStack ( CS3), CS3} );
521
- CallStackIdMap. insert ({ hashCallStack ( CS4), CS4} );
518
+ MemProfData. addCallStack ( CS1);
519
+ MemProfData. addCallStack ( CS2);
520
+ MemProfData. addCallStack ( CS3);
521
+ MemProfData. addCallStack ( CS4);
522
522
523
523
IndexedMemProfRecord IndexedRecord;
524
524
IndexedAllocationInfo AI;
@@ -529,9 +529,10 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
529
529
IndexedRecord.CallSiteIds .push_back (hashCallStack (CS3));
530
530
IndexedRecord.CallSiteIds .push_back (hashCallStack (CS4));
531
531
532
- llvm::memprof::FrameIdConverter<decltype (FrameIdMap)> FrameIdConv (FrameIdMap);
533
- llvm::memprof::CallStackIdConverter<decltype (CallStackIdMap)> CSIdConv (
534
- CallStackIdMap, FrameIdConv);
532
+ llvm::memprof::FrameIdConverter<decltype (MemProfData.Frames )> FrameIdConv (
533
+ MemProfData.Frames );
534
+ llvm::memprof::CallStackIdConverter<decltype (MemProfData.CallStacks )>
535
+ CSIdConv (MemProfData.CallStacks , FrameIdConv);
535
536
536
537
MemProfRecord Record = IndexedRecord.toMemProfRecord (CSIdConv);
537
538
0 commit comments