Skip to content

Commit eb33e46

Browse files
[memprof] Clean up IndexedMemProfReader (NFC) (#94710)
Parameter "Version" is confusing in deserializeV012 and deserializeV3 because we also have member variable "Version". Fortunately, parameter "Version" and member variable "Version" always have the same value because IndexedMemProfReader::deserialize initializes the member variable and passes it to deserializeV012 and deserializeV3. This patch removes the parameter.
1 parent 3b16630 commit eb33e46

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

llvm/include/llvm/ProfileData/InstrProfReader.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,8 @@ class IndexedMemProfReader {
665665
const unsigned char *CallStackBase = nullptr;
666666

667667
Error deserializeV012(const unsigned char *Start, const unsigned char *Ptr,
668-
uint64_t FirstWord, memprof::IndexedVersion Version);
669-
Error deserializeV3(const unsigned char *Start, const unsigned char *Ptr,
670-
memprof::IndexedVersion Version);
668+
uint64_t FirstWord);
669+
Error deserializeV3(const unsigned char *Start, const unsigned char *Ptr);
671670

672671
public:
673672
IndexedMemProfReader() = default;

llvm/lib/ProfileData/InstrProfReader.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,7 @@ IndexedInstrProfReader::readSummary(IndexedInstrProf::ProfVersion Version,
12041204

12051205
Error IndexedMemProfReader::deserializeV012(const unsigned char *Start,
12061206
const unsigned char *Ptr,
1207-
uint64_t FirstWord,
1208-
memprof::IndexedVersion Version) {
1207+
uint64_t FirstWord) {
12091208
// The value returned from RecordTableGenerator.Emit.
12101209
const uint64_t RecordTableOffset =
12111210
Version == memprof::Version0
@@ -1259,8 +1258,7 @@ Error IndexedMemProfReader::deserializeV012(const unsigned char *Start,
12591258
}
12601259

12611260
Error IndexedMemProfReader::deserializeV3(const unsigned char *Start,
1262-
const unsigned char *Ptr,
1263-
memprof::IndexedVersion Version) {
1261+
const unsigned char *Ptr) {
12641262
// The offset in the stream right before invoking
12651263
// CallStackTableGenerator.Emit.
12661264
const uint64_t CallStackPayloadOffset =
@@ -1285,7 +1283,7 @@ Error IndexedMemProfReader::deserializeV3(const unsigned char *Start,
12851283
MemProfRecordTable.reset(MemProfRecordHashTable::Create(
12861284
/*Buckets=*/Start + RecordTableOffset,
12871285
/*Payload=*/Start + RecordPayloadOffset,
1288-
/*Base=*/Start, memprof::RecordLookupTrait(Version, Schema)));
1286+
/*Base=*/Start, memprof::RecordLookupTrait(memprof::Version3, Schema)));
12891287

12901288
return Error::success();
12911289
}
@@ -1323,11 +1321,11 @@ Error IndexedMemProfReader::deserialize(const unsigned char *Start,
13231321
case memprof::Version0:
13241322
case memprof::Version1:
13251323
case memprof::Version2:
1326-
if (Error E = deserializeV012(Start, Ptr, FirstWord, Version))
1324+
if (Error E = deserializeV012(Start, Ptr, FirstWord))
13271325
return E;
13281326
break;
13291327
case memprof::Version3:
1330-
if (Error E = deserializeV3(Start, Ptr, Version))
1328+
if (Error E = deserializeV3(Start, Ptr))
13311329
return E;
13321330
break;
13331331
}

0 commit comments

Comments
 (0)