RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-04 17:21:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

llvm-cov: Replaced asserts with proper error handling.

Browse Source 
Unified the interface for read functions. They all return a boolean
indicating if the read from file succeeded. Functions that previously
returned the read value now store it into a variable that is passed in
by reference instead. Callers will need to check the return value to
detect if an error occurred.

Also added a new test which ensures that no assertions occur when file
contains invalid data. llvm-cov should return with error code 1 upon
failure.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194635 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Yuchen Wu 2013-11-14 00:07:15 +00:00
parent 006806267a
commit dbb51ff01f
3 changed files with 109 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/llvm/Support/GCOV.h
View File

@ -152,27 +152,35 @@ public:
return true; return true;
} }
uint32_t readInt() { bool readInt(uint32_t &Val) {
uint32_t Result;
StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+4);
assert (Str.empty() == false && "Unexpected memory buffer end!"); if (Str.empty()) {
errs() << "Unexpected end of memory buffer: " << Cursor+4 << ".\n";
return false;
}
Cursor += 4; Cursor += 4;
Result = *(const uint32_t *)(Str.data()); Val = *(const uint32_t *)(Str.data());
return Result; return true;
} }
uint64_t readInt64() { bool readInt64(uint64_t &Val) {
uint64_t Lo = readInt(); uint32_t Lo, Hi;
uint64_t Hi = readInt(); if (!readInt(Lo) || !readInt(Hi)) return false;
uint64_t Result = Lo | (Hi << 32); Val = ((uint64_t)Hi << 32) | Lo;
return Result; return true;
} }
StringRef readString() { bool readString(StringRef &Str) {
uint32_t Len = readInt() * 4; uint32_t Len;
StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+Len); if (!readInt(Len)) return false;
Len *= 4;
if (Buffer->getBuffer().size() < Cursor+Len) {
errs() << "Unexpected end of memory buffer: " << Cursor+Len << ".\n";
return false;
}
Str = Buffer->getBuffer().slice(Cursor, Cursor+Len).split('\0').first;
Cursor += Len; Cursor += Len;
return Str.split('\0').first; return true;
} }
uint64_t getCursor() const { return Cursor; } uint64_t getCursor() const { return Cursor; }

129
lib/IR/GCOV.cpp
View File

@ -47,27 +47,34 @@ bool GCOVFile::read(GCOVBuffer &Buffer) {
if (isGCNOFile(Format)) { if (isGCNOFile(Format)) {
while (true) { while (true) {
if (!Buffer.readFunctionTag()) break;
GCOVFunction *GFun = new GCOVFunction(); GCOVFunction *GFun = new GCOVFunction();
if (!GFun->read(Buffer, Format)) if (!GFun->read(Buffer, Format))
break; return false;
Functions.push_back(GFun); Functions.push_back(GFun);
} }
} }
else if (isGCDAFile(Format)) { else if (isGCDAFile(Format)) {
for (size_t i = 0, e = Functions.size(); i < e; ++i) { for (size_t i = 0, e = Functions.size(); i < e; ++i) {
bool ReadGCDA = Functions[i]->read(Buffer, Format); if (!Buffer.readFunctionTag()) {
(void)ReadGCDA; errs() << "Unexpected number of functions.\n";
assert(ReadGCDA && ".gcda data does not match .gcno data"); return false;
}
if (!Functions[i]->read(Buffer, Format))
return false;
} }
if (Buffer.readObjectTag()) { if (Buffer.readObjectTag()) {
uint32_t Length = Buffer.readInt(); uint32_t Length;
Buffer.readInt(); // checksum uint32_t Dummy;
Buffer.readInt(); // num if (!Buffer.readInt(Length)) return false;
RunCount = Buffer.readInt(); if (!Buffer.readInt(Dummy)) return false; // checksum
if (!Buffer.readInt(Dummy)) return false; // num
if (!Buffer.readInt(RunCount)) return false;;
Buffer.advanceCursor(Length-3); Buffer.advanceCursor(Length-3);
} }
while (Buffer.readProgramTag()) { while (Buffer.readProgramTag()) {
uint32_t Length = Buffer.readInt(); uint32_t Length;
if (!Buffer.readInt(Length)) return false;
Buffer.advanceCursor(Length); Buffer.advanceCursor(Length);
++ProgramCount; ++ProgramCount;
} }
@ -104,75 +111,103 @@ GCOVFunction::~GCOVFunction() {
/// read - Read a function from the buffer. Return false if buffer cursor /// read - Read a function from the buffer. Return false if buffer cursor
/// does not point to a function tag. /// does not point to a function tag.
bool GCOVFunction::read(GCOVBuffer &Buff, GCOV::GCOVFormat Format) { bool GCOVFunction::read(GCOVBuffer &Buff, GCOV::GCOVFormat Format) {
if (!Buff.readFunctionTag()) uint32_t Dummy;
return false; if (!Buff.readInt(Dummy)) return false; // Function header length
if (!Buff.readInt(Ident)) return false;
Buff.readInt(); // Function header length if (!Buff.readInt(Dummy)) return false; // Checksum #1
Ident = Buff.readInt();
Buff.readInt(); // Checksum #1
if (Format != GCOV::GCNO_402 && Format != GCOV::GCDA_402) if (Format != GCOV::GCNO_402 && Format != GCOV::GCDA_402)
Buff.readInt(); // Checksum #2 if (!Buff.readInt(Dummy)) return false; // Checksum #2
if (!Buff.readString(Name)) return false;
Name = Buff.readString();
if (Format == GCOV::GCNO_402 || Format == GCOV::GCNO_404) if (Format == GCOV::GCNO_402 || Format == GCOV::GCNO_404)
Filename = Buff.readString(); if (!Buff.readString(Filename)) return false;
if (Format == GCOV::GCDA_402 || Format == GCOV::GCDA_404) { if (Format == GCOV::GCDA_402 || Format == GCOV::GCDA_404) {
Buff.readArcTag(); if (!Buff.readArcTag()) {
uint32_t i = 0; errs() << "Arc tag not found.\n";
uint32_t Count = Buff.readInt() / 2; return false;
}
uint32_t Count;
if (!Buff.readInt(Count)) return false;
Count /= 2;
// This for loop adds the counts for each block. A second nested loop is // This for loop adds the counts for each block. A second nested loop is
// required to combine the edge counts that are contained in the GCDA file. // required to combine the edge counts that are contained in the GCDA file.
for (uint32_t Line = 0; i < Count; ++Line) { for (uint32_t Line = 0; Count > 0; ++Line) {
GCOVBlock &Block = *Blocks[Line]; GCOVBlock &Block = *Blocks[Line];
for (size_t Edge = 0, End = Block.getNumEdges(); Edge < End; ++Edge) { for (size_t Edge = 0, End = Block.getNumEdges(); Edge < End; ++Edge) {
assert(i < Count && "Unexpected number of Edges!"); if (Count == 0) {
Block.addCount(Buff.readInt64()); errs() << "Unexpected number of edges.\n";
++i; return false;
}
uint64_t ArcCount;
if (!Buff.readInt64(ArcCount)) return false;
Block.addCount(ArcCount);
--Count;
} }
} }
return true; return true;
} }
LineNumber = Buff.readInt(); if (!Buff.readInt(LineNumber)) return false;
// read blocks. // read blocks.
bool BlockTagFound = Buff.readBlockTag(); if (!Buff.readBlockTag()) {
(void)BlockTagFound; errs() << "Block tag not found.\n";
assert(BlockTagFound && "Block Tag not found!"); return false;
uint32_t BlockCount = Buff.readInt(); }
uint32_t BlockCount;
if (!Buff.readInt(BlockCount)) return false;
for (uint32_t i = 0, e = BlockCount; i != e; ++i) { for (uint32_t i = 0, e = BlockCount; i != e; ++i) {
Buff.readInt(); // Block flags; if (!Buff.readInt(Dummy)) return false; // Block flags;
Blocks.push_back(new GCOVBlock(i)); Blocks.push_back(new GCOVBlock(i));
} }
// read edges. // read edges.
while (Buff.readEdgeTag()) { while (Buff.readEdgeTag()) {
uint32_t EdgeCount = (Buff.readInt() - 1) / 2; uint32_t EdgeCount;
uint32_t BlockNo = Buff.readInt(); if (!Buff.readInt(EdgeCount)) return false;
assert(BlockNo < BlockCount && "Unexpected Block number!"); EdgeCount = (EdgeCount - 1) / 2;
uint32_t BlockNo;
if (!Buff.readInt(BlockNo)) return false;
if (BlockNo >= BlockCount) {
errs() << "Unexpected block number.\n";
return false;
}
for (uint32_t i = 0, e = EdgeCount; i != e; ++i) { for (uint32_t i = 0, e = EdgeCount; i != e; ++i) {
Blocks[BlockNo]->addEdge(Buff.readInt()); uint32_t Dst;
Buff.readInt(); // Edge flag if (!Buff.readInt(Dst)) return false;
Blocks[BlockNo]->addEdge(Dst);
if (!Buff.readInt(Dummy)) return false; // Edge flag
} }
} }
// read line table. // read line table.
while (Buff.readLineTag()) { while (Buff.readLineTag()) {
uint32_t LineTableLength = Buff.readInt(); uint32_t LineTableLength;
if (!Buff.readInt(LineTableLength)) return false;
uint32_t EndPos = Buff.getCursor() + LineTableLength*4; uint32_t EndPos = Buff.getCursor() + LineTableLength*4;
uint32_t BlockNo = Buff.readInt(); uint32_t BlockNo;
assert(BlockNo < BlockCount && "Unexpected Block number!"); if (!Buff.readInt(BlockNo)) return false;
GCOVBlock *Block = Blocks[BlockNo]; if (BlockNo >= BlockCount) {
Buff.readInt(); // flag errs() << "Unexpected block number.\n";
while (Buff.getCursor() != (EndPos - 4)) { return false;
StringRef Filename = Buff.readString();
if (Buff.getCursor() == (EndPos - 4)) break;
while (uint32_t L = Buff.readInt())
Block->addLine(Filename, L);
} }
Buff.readInt(); // flag GCOVBlock *Block = Blocks[BlockNo];
if (!Buff.readInt(Dummy)) return false; // flag
while (Buff.getCursor() != (EndPos - 4)) {
StringRef Filename;
if (!Buff.readString(Filename)) return false;
if (Buff.getCursor() == (EndPos - 4)) break;
while (true) {
uint32_t Line;
if (!Buff.readInt(Line)) return false;
if (!Line) break;
Block->addLine(Filename, Line);
}
}
if (!Buff.readInt(Dummy)) return false; // flag
} }
return true; return true;
} }

6
test/tools/llvm-cov/llvm-cov.test
View File

@ -1,4 +1,8 @@
RUN: cd %p/Inputs && llvm-cov -gcno=test.gcno -gcda=test.gcda \ RUN: cd %p/Inputs
RUN: llvm-cov -gcno=test.gcno -gcda=test.gcda \
RUN: | diff test.cpp.gcov - RUN: | diff test.cpp.gcov -
RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda
XFAIL: powerpc64, s390x, arm XFAIL: powerpc64, s390x, arm