RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-14 07:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ProfileData: Treat missing function counts as malformed

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207172 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2014-04-25 02:45:33 +00:00
parent b33022e1da
commit 38ac7e92d8
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ProfileData/InstrProfReader.cpp
View File

@ -101,6 +101,8 @@ error_code TextInstrProfReader::readNextRecord(InstrProfRecord &Record) {
return error(instrprof_error::truncated);
if ((Line++)->getAsInteger(10, NumCounters))
return error(instrprof_error::malformed);
if (NumCounters == 0)
return error(instrprof_error::malformed);
// Read each counter and fill our internal storage with the values.
Counts.clear();
@ -210,8 +212,10 @@ RawInstrProfReader<IntPtrT>::readNextRecord(InstrProfRecord &Record) {
// Get the raw data.
StringRef RawName(getName(Data->NamePtr), swap(Data->NameSize));
auto RawCounts = makeArrayRef(getCounter(Data->CounterPtr),
swap(Data->NumCounters));
uint32_t NumCounters = swap(Data->NumCounters);
if (NumCounters == 0)
return error(instrprof_error::malformed);
auto RawCounts = makeArrayRef(getCounter(Data->CounterPtr), NumCounters);
// Check bounds.
auto *NamesStartAsCounter = reinterpret_cast<const uint64_t *>(NamesStart);

3
test/tools/llvm-profdata/Inputs/no-counts.profdata Normal file
View File

@ -0,0 +1,3 @@
no_counts
0
0

3
test/tools/llvm-profdata/errors.test
View File

@ -11,3 +11,6 @@ INVALID-COUNT-LATER: error: {{.*}}invalid-count-later.profdata: Malformed profil
RUN: not llvm-profdata show %p/Inputs/bad-hash.profdata 2>&1 | FileCheck %s --check-prefix=BAD-HASH
RUN: not llvm-profdata merge %p/Inputs/bad-hash.profdata %p/Inputs/bad-hash.profdata -o %t.out 2>&1 | FileCheck %s --check-prefix=BAD-HASH
BAD-HASH: error: {{.*}}bad-hash.profdata: Malformed profile data
RUN: not llvm-profdata show %p/Inputs/no-counts.profdata 2>&1 | FileCheck %s --check-prefix=NO-COUNTS
NO-COUNTS: error: {{.*}}no-counts.profdata: Malformed profile data

1
tools/llvm-profdata/llvm-profdata.cpp
View File

@ -111,6 +111,7 @@ int show_main(int argc, const char *argv[]) {
Func.Name.find(ShowFunction) != Func.Name.npos);
++TotalFunctions;
assert(Func.Counts.size() > 0 && "function missing entry counter");
if (Func.Counts[0] > MaxFunctionCount)
MaxFunctionCount = Func.Counts[0];