6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

llvm-cov: clang-format the GCOV files (NFC)

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226952 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner
2015-01-23 22:38:01 +00:00
parent d09c631f07
commit 4c61bbe673
2 changed files with 195 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,7 @@ class GCOVBlock;
class FileInfo; class FileInfo;
namespace GCOV { namespace GCOV {
enum GCOVVersion { enum GCOVVersion { V402, V404 };
V402,
V404
};
} // end GCOV namespace } // end GCOV namespace
/// GCOVOptions - A struct for passing gcov options between functions. /// GCOVOptions - A struct for passing gcov options between functions.
@@ -56,7 +53,7 @@ struct GCOVOptions {
class GCOVBuffer { class GCOVBuffer {
public: public:
GCOVBuffer(MemoryBuffer *B) : Buffer(B), Cursor(0) {} GCOVBuffer(MemoryBuffer *B) : Buffer(B), Cursor(0) {}
/// readGCNOFormat - Check GCNO signature is valid at the beginning of buffer. /// readGCNOFormat - Check GCNO signature is valid at the beginning of buffer.
bool readGCNOFormat() { bool readGCNOFormat() {
StringRef File = Buffer->getBuffer().slice(0, 4); StringRef File = Buffer->getBuffer().slice(0, 4);
@@ -81,7 +78,7 @@ public:
/// readGCOVVersion - Read GCOV version. /// readGCOVVersion - Read GCOV version.
bool readGCOVVersion(GCOV::GCOVVersion &Version) { bool readGCOVVersion(GCOV::GCOVVersion &Version) {
StringRef VersionStr = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef VersionStr = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (VersionStr == "*204") { if (VersionStr == "*204") {
Cursor += 4; Cursor += 4;
Version = GCOV::V402; Version = GCOV::V402;
@@ -99,10 +96,9 @@ public:
/// readFunctionTag - If cursor points to a function tag then increment the /// readFunctionTag - If cursor points to a function tag then increment the
/// cursor and return true otherwise return false. /// cursor and return true otherwise return false.
bool readFunctionTag() { bool readFunctionTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\1') {
Tag[2] != '\0' || Tag[3] != '\1') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -112,10 +108,9 @@ public:
/// readBlockTag - If cursor points to a block tag then increment the /// readBlockTag - If cursor points to a block tag then increment the
/// cursor and return true otherwise return false. /// cursor and return true otherwise return false.
bool readBlockTag() { bool readBlockTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x41' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\x01') {
Tag[2] != '\x41' || Tag[3] != '\x01') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -125,10 +120,9 @@ public:
/// readEdgeTag - If cursor points to an edge tag then increment the /// readEdgeTag - If cursor points to an edge tag then increment the
/// cursor and return true otherwise return false. /// cursor and return true otherwise return false.
bool readEdgeTag() { bool readEdgeTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x43' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\x01') {
Tag[2] != '\x43' || Tag[3] != '\x01') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -138,10 +132,9 @@ public:
/// readLineTag - If cursor points to a line tag then increment the /// readLineTag - If cursor points to a line tag then increment the
/// cursor and return true otherwise return false. /// cursor and return true otherwise return false.
bool readLineTag() { bool readLineTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x45' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\x01') {
Tag[2] != '\x45' || Tag[3] != '\x01') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -151,10 +144,9 @@ public:
/// readArcTag - If cursor points to an gcda arc tag then increment the /// readArcTag - If cursor points to an gcda arc tag then increment the
/// cursor and return true otherwise return false. /// cursor and return true otherwise return false.
bool readArcTag() { bool readArcTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\xa1' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\1') {
Tag[2] != '\xa1' || Tag[3] != '\1') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -164,10 +156,9 @@ public:
/// readObjectTag - If cursor points to an object summary tag then increment /// readObjectTag - If cursor points to an object summary tag then increment
/// the cursor and return true otherwise return false. /// the cursor and return true otherwise return false.
bool readObjectTag() { bool readObjectTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\xa1') {
Tag[2] != '\0' || Tag[3] != '\xa1') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -177,10 +168,9 @@ public:
/// readProgramTag - If cursor points to a program summary tag then increment /// readProgramTag - If cursor points to a program summary tag then increment
/// the cursor and return true otherwise return false. /// the cursor and return true otherwise return false.
bool readProgramTag() { bool readProgramTag() {
StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4);
if (Tag.empty() || if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' ||
Tag[0] != '\0' || Tag[1] != '\0' || Tag[3] != '\xa3') {
Tag[2] != '\0' || Tag[3] != '\xa3') {
return false; return false;
} }
Cursor += 4; Cursor += 4;
@@ -188,11 +178,11 @@ public:
} }
bool readInt(uint32_t &Val) { bool readInt(uint32_t &Val) {
if (Buffer->getBuffer().size() < Cursor+4) { if (Buffer->getBuffer().size() < Cursor + 4) {
errs() << "Unexpected end of memory buffer: " << Cursor+4 << ".\n"; errs() << "Unexpected end of memory buffer: " << Cursor + 4 << ".\n";
return false; return false;
} }
StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+4); StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor + 4);
Cursor += 4; Cursor += 4;
Val = *(const uint32_t *)(Str.data()); Val = *(const uint32_t *)(Str.data());
return true; return true;
@@ -200,7 +190,8 @@ public:
bool readInt64(uint64_t &Val) { bool readInt64(uint64_t &Val) {
uint32_t Lo, Hi; uint32_t Lo, Hi;
if (!readInt(Lo) || !readInt(Hi)) return false; if (!readInt(Lo) || !readInt(Hi))
return false;
Val = ((uint64_t)Hi << 32) | Lo; Val = ((uint64_t)Hi << 32) | Lo;
return true; return true;
} }
@@ -210,19 +201,21 @@ public:
// Keep reading until we find a non-zero length. This emulates gcov's // Keep reading until we find a non-zero length. This emulates gcov's
// behaviour, which appears to do the same. // behaviour, which appears to do the same.
while (Len == 0) while (Len == 0)
if (!readInt(Len)) return false; if (!readInt(Len))
return false;
Len *= 4; Len *= 4;
if (Buffer->getBuffer().size() < Cursor+Len) { if (Buffer->getBuffer().size() < Cursor + Len) {
errs() << "Unexpected end of memory buffer: " << Cursor+Len << ".\n"; errs() << "Unexpected end of memory buffer: " << Cursor + Len << ".\n";
return false; return false;
} }
Str = Buffer->getBuffer().slice(Cursor, Cursor+Len).split('\0').first; Str = Buffer->getBuffer().slice(Cursor, Cursor + Len).split('\0').first;
Cursor += Len; Cursor += Len;
return true; return true;
} }
uint64_t getCursor() const { return Cursor; } uint64_t getCursor() const { return Cursor; }
void advanceCursor(uint32_t n) { Cursor += n*4; } void advanceCursor(uint32_t n) { Cursor += n * 4; }
private: private:
MemoryBuffer *Buffer; MemoryBuffer *Buffer;
uint64_t Cursor; uint64_t Cursor;
@@ -232,13 +225,15 @@ private:
/// (.gcno and .gcda). /// (.gcno and .gcda).
class GCOVFile { class GCOVFile {
public: public:
GCOVFile() : GCNOInitialized(false), Checksum(0), Functions(), RunCount(0), GCOVFile()
ProgramCount(0) {} : GCNOInitialized(false), Checksum(0), Functions(), RunCount(0),
ProgramCount(0) {}
bool readGCNO(GCOVBuffer &Buffer); bool readGCNO(GCOVBuffer &Buffer);
bool readGCDA(GCOVBuffer &Buffer); bool readGCDA(GCOVBuffer &Buffer);
uint32_t getChecksum() const { return Checksum; } uint32_t getChecksum() const { return Checksum; }
void dump() const; void dump() const;
void collectLineCounts(FileInfo &FI); void collectLineCounts(FileInfo &FI);
private: private:
bool GCNOInitialized; bool GCNOInitialized;
GCOV::GCOVVersion Version; GCOV::GCOVVersion Version;
@@ -261,7 +256,7 @@ struct GCOVEdge {
class GCOVFunction { class GCOVFunction {
public: public:
typedef SmallVectorImpl<std::unique_ptr<GCOVBlock>>::const_iterator typedef SmallVectorImpl<std::unique_ptr<GCOVBlock>>::const_iterator
BlockIterator; BlockIterator;
GCOVFunction(GCOVFile &P) : Parent(P), Ident(0), LineNumber(0) {} GCOVFunction(GCOVFile &P) : Parent(P), Ident(0), LineNumber(0) {}
bool readGCNO(GCOVBuffer &Buffer, GCOV::GCOVVersion Version); bool readGCNO(GCOVBuffer &Buffer, GCOV::GCOVVersion Version);
@@ -277,6 +272,7 @@ public:
void dump() const; void dump() const;
void collectLineCounts(FileInfo &FI); void collectLineCounts(FileInfo &FI);
private: private:
GCOVFile &Parent; GCOVFile &Parent;
uint32_t Ident; uint32_t Ident;
@@ -291,7 +287,7 @@ private:
/// GCOVBlock - Collects block information. /// GCOVBlock - Collects block information.
class GCOVBlock { class GCOVBlock {
struct EdgeWeight { struct EdgeWeight {
EdgeWeight(GCOVBlock *D): Dst(D), Count(0) {} EdgeWeight(GCOVBlock *D) : Dst(D), Count(0) {}
GCOVBlock *Dst; GCOVBlock *Dst;
uint64_t Count; uint64_t Count;
@@ -302,11 +298,13 @@ class GCOVBlock {
return E1->Dst.Number < E2->Dst.Number; return E1->Dst.Number < E2->Dst.Number;
} }
}; };
public: public:
typedef SmallVectorImpl<GCOVEdge *>::const_iterator EdgeIterator; typedef SmallVectorImpl<GCOVEdge *>::const_iterator EdgeIterator;
GCOVBlock(GCOVFunction &P, uint32_t N) : Parent(P), Number(N), Counter(0), GCOVBlock(GCOVFunction &P, uint32_t N)
DstEdgesAreSorted(true), SrcEdges(), DstEdges(), Lines() {} : Parent(P), Number(N), Counter(0), DstEdgesAreSorted(true), SrcEdges(),
DstEdges(), Lines() {}
~GCOVBlock(); ~GCOVBlock();
const GCOVFunction &getParent() const { return Parent; } const GCOVFunction &getParent() const { return Parent; }
void addLine(uint32_t N) { Lines.push_back(N); } void addLine(uint32_t N) { Lines.push_back(N); }
@@ -336,6 +334,7 @@ public:
void dump() const; void dump() const;
void collectLineCounts(FileInfo &FI); void collectLineCounts(FileInfo &FI);
private: private:
GCOVFunction &Parent; GCOVFunction &Parent;
uint32_t Number; uint32_t Number;
@@ -347,8 +346,10 @@ private:
}; };
class FileInfo { class FileInfo {
// It is unlikely--but possible--for multiple functions to be on the same line. // It is unlikely--but possible--for multiple functions to be on the same
// Therefore this typedef allows LineData.Functions to store multiple functions // line.
// Therefore this typedef allows LineData.Functions to store multiple
// functions
// per instance. This is rare, however, so optimize for the common case. // per instance. This is rare, however, so optimize for the common case.
typedef SmallVector<const GCOVFunction *, 1> FunctionVector; typedef SmallVector<const GCOVFunction *, 1> FunctionVector;
typedef DenseMap<uint32_t, FunctionVector> FunctionLines; typedef DenseMap<uint32_t, FunctionVector> FunctionLines;
@@ -363,9 +364,9 @@ class FileInfo {
}; };
struct GCOVCoverage { struct GCOVCoverage {
GCOVCoverage(StringRef Name) : GCOVCoverage(StringRef Name)
Name(Name), LogicalLines(0), LinesExec(0), Branches(0), BranchesExec(0), : Name(Name), LogicalLines(0), LinesExec(0), Branches(0),
BranchesTaken(0) {} BranchesExec(0), BranchesTaken(0) {}
StringRef Name; StringRef Name;
@@ -376,20 +377,21 @@ class FileInfo {
uint32_t BranchesExec; uint32_t BranchesExec;
uint32_t BranchesTaken; uint32_t BranchesTaken;
}; };
public: public:
FileInfo(const GCOVOptions &Options) : FileInfo(const GCOVOptions &Options)
Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {} : Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {}
void addBlockLine(StringRef Filename, uint32_t Line, const GCOVBlock *Block) { void addBlockLine(StringRef Filename, uint32_t Line, const GCOVBlock *Block) {
if (Line > LineInfo[Filename].LastLine) if (Line > LineInfo[Filename].LastLine)
LineInfo[Filename].LastLine = Line; LineInfo[Filename].LastLine = Line;
LineInfo[Filename].Blocks[Line-1].push_back(Block); LineInfo[Filename].Blocks[Line - 1].push_back(Block);
} }
void addFunctionLine(StringRef Filename, uint32_t Line, void addFunctionLine(StringRef Filename, uint32_t Line,
const GCOVFunction *Function) { const GCOVFunction *Function) {
if (Line > LineInfo[Filename].LastLine) if (Line > LineInfo[Filename].LastLine)
LineInfo[Filename].LastLine = Line; LineInfo[Filename].LastLine = Line;
LineInfo[Filename].Functions[Line-1].push_back(Function); LineInfo[Filename].Functions[Line - 1].push_back(Function);
} }
void setRunCount(uint32_t Runs) { RunCount = Runs; } void setRunCount(uint32_t Runs) { RunCount = Runs; }
void setProgramCount(uint32_t Programs) { ProgramCount = Programs; } void setProgramCount(uint32_t Programs) { ProgramCount = Programs; }
@@ -398,8 +400,7 @@ public:
private: private:
std::string getCoveragePath(StringRef Filename, StringRef MainFilename); std::string getCoveragePath(StringRef Filename, StringRef MainFilename);
std::unique_ptr<raw_ostream> openCoveragePath(StringRef CoveragePath); std::unique_ptr<raw_ostream> openCoveragePath(StringRef CoveragePath);
void printFunctionSummary(raw_ostream &OS, void printFunctionSummary(raw_ostream &OS, const FunctionVector &Funcs) const;
const FunctionVector &Funcs) const;
void printBlockInfo(raw_ostream &OS, const GCOVBlock &Block, void printBlockInfo(raw_ostream &OS, const GCOVBlock &Block,
uint32_t LineIndex, uint32_t &BlockNo) const; uint32_t LineIndex, uint32_t &BlockNo) const;
void printBranchInfo(raw_ostream &OS, const GCOVBlock &Block, void printBranchInfo(raw_ostream &OS, const GCOVBlock &Block,
@@ -416,14 +417,12 @@ private:
uint32_t RunCount; uint32_t RunCount;
uint32_t ProgramCount; uint32_t ProgramCount;
typedef SmallVector<std::pair<std::string, GCOVCoverage>, 4> typedef SmallVector<std::pair<std::string, GCOVCoverage>, 4> FileCoverageList;
FileCoverageList;
typedef MapVector<const GCOVFunction *, GCOVCoverage> FuncCoverageMap; typedef MapVector<const GCOVFunction *, GCOVCoverage> FuncCoverageMap;
FileCoverageList FileCoverages; FileCoverageList FileCoverages;
FuncCoverageMap FuncCoverages; FuncCoverageMap FuncCoverages;
}; };
} }
#endif #endif

218
lib/IR/GCOV.cpp
View File

@@ -28,12 +28,16 @@ using namespace llvm;
/// readGCNO - Read GCNO buffer. /// readGCNO - Read GCNO buffer.
bool GCOVFile::readGCNO(GCOVBuffer &Buffer) { bool GCOVFile::readGCNO(GCOVBuffer &Buffer) {
if (!Buffer.readGCNOFormat()) return false; if (!Buffer.readGCNOFormat())
if (!Buffer.readGCOVVersion(Version)) return false; return false;
if (!Buffer.readGCOVVersion(Version))
return false;
if (!Buffer.readInt(Checksum)) return false; if (!Buffer.readInt(Checksum))
return false;
while (true) { while (true) {
if (!Buffer.readFunctionTag()) break; if (!Buffer.readFunctionTag())
break;
auto GFun = make_unique<GCOVFunction>(*this); auto GFun = make_unique<GCOVFunction>(*this);
if (!GFun->readGCNO(Buffer, Version)) if (!GFun->readGCNO(Buffer, Version))
return false; return false;
@@ -48,19 +52,22 @@ bool GCOVFile::readGCNO(GCOVBuffer &Buffer) {
/// called after readGCNO(). /// called after readGCNO().
bool GCOVFile::readGCDA(GCOVBuffer &Buffer) { bool GCOVFile::readGCDA(GCOVBuffer &Buffer) {
assert(GCNOInitialized && "readGCDA() can only be called after readGCNO()"); assert(GCNOInitialized && "readGCDA() can only be called after readGCNO()");
if (!Buffer.readGCDAFormat()) return false; if (!Buffer.readGCDAFormat())
return false;
GCOV::GCOVVersion GCDAVersion; GCOV::GCOVVersion GCDAVersion;
if (!Buffer.readGCOVVersion(GCDAVersion)) return false; if (!Buffer.readGCOVVersion(GCDAVersion))
return false;
if (Version != GCDAVersion) { if (Version != GCDAVersion) {
errs() << "GCOV versions do not match.\n"; errs() << "GCOV versions do not match.\n";
return false; return false;
} }
uint32_t GCDAChecksum; uint32_t GCDAChecksum;
if (!Buffer.readInt(GCDAChecksum)) return false; if (!Buffer.readInt(GCDAChecksum))
return false;
if (Checksum != GCDAChecksum) { if (Checksum != GCDAChecksum) {
errs() << "File checksums do not match: " << Checksum << " != " errs() << "File checksums do not match: " << Checksum
<< GCDAChecksum << ".\n"; << " != " << GCDAChecksum << ".\n";
return false; return false;
} }
for (size_t i = 0, e = Functions.size(); i < e; ++i) { for (size_t i = 0, e = Functions.size(); i < e; ++i) {
@@ -74,15 +81,20 @@ bool GCOVFile::readGCDA(GCOVBuffer &Buffer) {
if (Buffer.readObjectTag()) { if (Buffer.readObjectTag()) {
uint32_t Length; uint32_t Length;
uint32_t Dummy; uint32_t Dummy;
if (!Buffer.readInt(Length)) return false; if (!Buffer.readInt(Length))
if (!Buffer.readInt(Dummy)) return false; // checksum return false;
if (!Buffer.readInt(Dummy)) return false; // num if (!Buffer.readInt(Dummy))
if (!Buffer.readInt(RunCount)) return false; return false; // checksum
Buffer.advanceCursor(Length-3); if (!Buffer.readInt(Dummy))
return false; // num
if (!Buffer.readInt(RunCount))
return false;
Buffer.advanceCursor(Length - 3);
} }
while (Buffer.readProgramTag()) { while (Buffer.readProgramTag()) {
uint32_t Length; uint32_t Length;
if (!Buffer.readInt(Length)) return false; if (!Buffer.readInt(Length))
return false;
Buffer.advanceCursor(Length); Buffer.advanceCursor(Length);
++ProgramCount; ++ProgramCount;
} }
@@ -112,21 +124,28 @@ void GCOVFile::collectLineCounts(FileInfo &FI) {
/// occurs. /// occurs.
bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
uint32_t Dummy; uint32_t Dummy;
if (!Buff.readInt(Dummy)) return false; // Function header length if (!Buff.readInt(Dummy))
if (!Buff.readInt(Ident)) return false; return false; // Function header length
if (!Buff.readInt(Checksum)) return false; if (!Buff.readInt(Ident))
return false;
if (!Buff.readInt(Checksum))
return false;
if (Version != GCOV::V402) { if (Version != GCOV::V402) {
uint32_t CfgChecksum; uint32_t CfgChecksum;
if (!Buff.readInt(CfgChecksum)) return false; if (!Buff.readInt(CfgChecksum))
return false;
if (Parent.getChecksum() != CfgChecksum) { if (Parent.getChecksum() != CfgChecksum) {
errs() << "File checksums do not match: " << Parent.getChecksum() errs() << "File checksums do not match: " << Parent.getChecksum()
<< " != " << CfgChecksum << " in (" << Name << ").\n"; << " != " << CfgChecksum << " in (" << Name << ").\n";
return false; return false;
} }
} }
if (!Buff.readString(Name)) return false; if (!Buff.readString(Name))
if (!Buff.readString(Filename)) return false; return false;
if (!Buff.readInt(LineNumber)) return false; if (!Buff.readString(Filename))
return false;
if (!Buff.readInt(LineNumber))
return false;
// read blocks. // read blocks.
if (!Buff.readBlockTag()) { if (!Buff.readBlockTag()) {
@@ -134,19 +153,23 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
return false; return false;
} }
uint32_t BlockCount; uint32_t BlockCount;
if (!Buff.readInt(BlockCount)) return false; 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) {
if (!Buff.readInt(Dummy)) return false; // Block flags; if (!Buff.readInt(Dummy))
return false; // Block flags;
Blocks.push_back(make_unique<GCOVBlock>(*this, i)); Blocks.push_back(make_unique<GCOVBlock>(*this, i));
} }
// read edges. // read edges.
while (Buff.readEdgeTag()) { while (Buff.readEdgeTag()) {
uint32_t EdgeCount; uint32_t EdgeCount;
if (!Buff.readInt(EdgeCount)) return false; if (!Buff.readInt(EdgeCount))
return false;
EdgeCount = (EdgeCount - 1) / 2; EdgeCount = (EdgeCount - 1) / 2;
uint32_t BlockNo; uint32_t BlockNo;
if (!Buff.readInt(BlockNo)) return false; if (!Buff.readInt(BlockNo))
return false;
if (BlockNo >= BlockCount) { if (BlockNo >= BlockCount) {
errs() << "Unexpected block number: " << BlockNo << " (in " << Name errs() << "Unexpected block number: " << BlockNo << " (in " << Name
<< ").\n"; << ").\n";
@@ -154,12 +177,14 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
} }
for (uint32_t i = 0, e = EdgeCount; i != e; ++i) { for (uint32_t i = 0, e = EdgeCount; i != e; ++i) {
uint32_t Dst; uint32_t Dst;
if (!Buff.readInt(Dst)) return false; if (!Buff.readInt(Dst))
return false;
Edges.push_back(make_unique<GCOVEdge>(*Blocks[BlockNo], *Blocks[Dst])); Edges.push_back(make_unique<GCOVEdge>(*Blocks[BlockNo], *Blocks[Dst]));
GCOVEdge *Edge = Edges.back().get(); GCOVEdge *Edge = Edges.back().get();
Blocks[BlockNo]->addDstEdge(Edge); Blocks[BlockNo]->addDstEdge(Edge);
Blocks[Dst]->addSrcEdge(Edge); Blocks[Dst]->addSrcEdge(Edge);
if (!Buff.readInt(Dummy)) return false; // Edge flag if (!Buff.readInt(Dummy))
return false; // Edge flag
} }
} }
@@ -167,11 +192,13 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
while (Buff.readLineTag()) { while (Buff.readLineTag()) {
uint32_t LineTableLength; uint32_t LineTableLength;
// Read the length of this line table. // Read the length of this line table.
if (!Buff.readInt(LineTableLength)) return false; if (!Buff.readInt(LineTableLength))
uint32_t EndPos = Buff.getCursor() + LineTableLength*4; return false;
uint32_t EndPos = Buff.getCursor() + LineTableLength * 4;
uint32_t BlockNo; uint32_t BlockNo;
// Read the block number this table is associated with. // Read the block number this table is associated with.
if (!Buff.readInt(BlockNo)) return false; if (!Buff.readInt(BlockNo))
return false;
if (BlockNo >= BlockCount) { if (BlockNo >= BlockCount) {
errs() << "Unexpected block number: " << BlockNo << " (in " << Name errs() << "Unexpected block number: " << BlockNo << " (in " << Name
<< ").\n"; << ").\n";
@@ -180,13 +207,15 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
GCOVBlock &Block = *Blocks[BlockNo]; GCOVBlock &Block = *Blocks[BlockNo];
// Read the word that pads the beginning of the line table. This may be a // Read the word that pads the beginning of the line table. This may be a
// flag of some sort, but seems to always be zero. // flag of some sort, but seems to always be zero.
if (!Buff.readInt(Dummy)) return false; if (!Buff.readInt(Dummy))
return false;
// Line information starts here and continues up until the last word. // Line information starts here and continues up until the last word.
if (Buff.getCursor() != (EndPos - sizeof(uint32_t))) { if (Buff.getCursor() != (EndPos - sizeof(uint32_t))) {
StringRef F; StringRef F;
// Read the source file name. // Read the source file name.
if (!Buff.readString(F)) return false; if (!Buff.readString(F))
return false;
if (Filename != F) { if (Filename != F) {
errs() << "Multiple sources for a single basic block: " << Filename errs() << "Multiple sources for a single basic block: " << Filename
<< " != " << F << " (in " << Name << ").\n"; << " != " << F << " (in " << Name << ").\n";
@@ -195,17 +224,21 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
// Read lines up to, but not including, the null terminator. // Read lines up to, but not including, the null terminator.
while (Buff.getCursor() < (EndPos - 2 * sizeof(uint32_t))) { while (Buff.getCursor() < (EndPos - 2 * sizeof(uint32_t))) {
uint32_t Line; uint32_t Line;
if (!Buff.readInt(Line)) return false; if (!Buff.readInt(Line))
return false;
// Line 0 means this instruction was injected by the compiler. Skip it. // Line 0 means this instruction was injected by the compiler. Skip it.
if (!Line) continue; if (!Line)
continue;
Block.addLine(Line); Block.addLine(Line);
} }
// Read the null terminator. // Read the null terminator.
if (!Buff.readInt(Dummy)) return false; if (!Buff.readInt(Dummy))
return false;
} }
// The last word is either a flag or padding, it isn't clear which. Skip // The last word is either a flag or padding, it isn't clear which. Skip
// over it. // over it.
if (!Buff.readInt(Dummy)) return false; if (!Buff.readInt(Dummy))
return false;
} }
return true; return true;
} }
@@ -214,27 +247,31 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
/// occurs. /// occurs.
bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
uint32_t Dummy; uint32_t Dummy;
if (!Buff.readInt(Dummy)) return false; // Function header length if (!Buff.readInt(Dummy))
return false; // Function header length
uint32_t GCDAIdent; uint32_t GCDAIdent;
if (!Buff.readInt(GCDAIdent)) return false; if (!Buff.readInt(GCDAIdent))
return false;
if (Ident != GCDAIdent) { if (Ident != GCDAIdent) {
errs() << "Function identifiers do not match: " << Ident << " != " errs() << "Function identifiers do not match: " << Ident
<< GCDAIdent << " (in " << Name << ").\n"; << " != " << GCDAIdent << " (in " << Name << ").\n";
return false; return false;
} }
uint32_t GCDAChecksum; uint32_t GCDAChecksum;
if (!Buff.readInt(GCDAChecksum)) return false; if (!Buff.readInt(GCDAChecksum))
return false;
if (Checksum != GCDAChecksum) { if (Checksum != GCDAChecksum) {
errs() << "Function checksums do not match: " << Checksum << " != " errs() << "Function checksums do not match: " << Checksum
<< GCDAChecksum << " (in " << Name << ").\n"; << " != " << GCDAChecksum << " (in " << Name << ").\n";
return false; return false;
} }
uint32_t CfgChecksum; uint32_t CfgChecksum;
if (Version != GCOV::V402) { if (Version != GCOV::V402) {
if (!Buff.readInt(CfgChecksum)) return false; if (!Buff.readInt(CfgChecksum))
return false;
if (Parent.getChecksum() != CfgChecksum) { if (Parent.getChecksum() != CfgChecksum) {
errs() << "File checksums do not match: " << Parent.getChecksum() errs() << "File checksums do not match: " << Parent.getChecksum()
<< " != " << CfgChecksum << " (in " << Name << ").\n"; << " != " << CfgChecksum << " (in " << Name << ").\n";
@@ -243,7 +280,8 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
} }
StringRef GCDAName; StringRef GCDAName;
if (!Buff.readString(GCDAName)) return false; if (!Buff.readString(GCDAName))
return false;
if (Name != GCDAName) { if (Name != GCDAName) {
errs() << "Function names do not match: " << Name << " != " << GCDAName errs() << "Function names do not match: " << Name << " != " << GCDAName
<< ".\n"; << ".\n";
@@ -256,26 +294,28 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
} }
uint32_t Count; uint32_t Count;
if (!Buff.readInt(Count)) return false; if (!Buff.readInt(Count))
return false;
Count /= 2; 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 BlockNo = 0; Count > 0; ++BlockNo) { for (uint32_t BlockNo = 0; Count > 0; ++BlockNo) {
// The last block is always reserved for exit block // The last block is always reserved for exit block
if (BlockNo >= Blocks.size()-1) { if (BlockNo >= Blocks.size() - 1) {
errs() << "Unexpected number of edges (in " << Name << ").\n"; errs() << "Unexpected number of edges (in " << Name << ").\n";
return false; return false;
} }
GCOVBlock &Block = *Blocks[BlockNo]; GCOVBlock &Block = *Blocks[BlockNo];
for (size_t EdgeNo = 0, End = Block.getNumDstEdges(); EdgeNo < End; for (size_t EdgeNo = 0, End = Block.getNumDstEdges(); EdgeNo < End;
++EdgeNo) { ++EdgeNo) {
if (Count == 0) { if (Count == 0) {
errs() << "Unexpected number of edges (in " << Name << ").\n"; errs() << "Unexpected number of edges (in " << Name << ").\n";
return false; return false;
} }
uint64_t ArcCount; uint64_t ArcCount;
if (!Buff.readInt64(ArcCount)) return false; if (!Buff.readInt64(ArcCount))
return false;
Block.addCount(EdgeNo, ArcCount); Block.addCount(EdgeNo, ArcCount);
--Count; --Count;
} }
@@ -349,8 +389,7 @@ void GCOVBlock::sortDstEdges() {
/// collectLineCounts - Collect line counts. This must be used after /// collectLineCounts - Collect line counts. This must be used after
/// reading .gcno and .gcda files. /// reading .gcno and .gcda files.
void GCOVBlock::collectLineCounts(FileInfo &FI) { void GCOVBlock::collectLineCounts(FileInfo &FI) {
for (SmallVectorImpl<uint32_t>::iterator I = Lines.begin(), for (auto I = Lines.begin(), E = Lines.end(); I != E; ++I)
E = Lines.end(); I != E; ++I)
FI.addBlockLine(Parent.getFilename(), *I, this); FI.addBlockLine(Parent.getFilename(), *I, this);
} }
@@ -376,7 +415,8 @@ void GCOVBlock::dump() const {
if (!Lines.empty()) { if (!Lines.empty()) {
dbgs() << "\tLines : "; dbgs() << "\tLines : ";
for (SmallVectorImpl<uint32_t>::const_iterator I = Lines.begin(), for (SmallVectorImpl<uint32_t>::const_iterator I = Lines.begin(),
E = Lines.end(); I != E; ++I) E = Lines.end();
I != E; ++I)
dbgs() << (*I) << ","; dbgs() << (*I) << ",";
dbgs() << "\n"; dbgs() << "\n";
} }
@@ -389,7 +429,7 @@ void GCOVBlock::dump() const {
static uint32_t safeDiv(uint64_t Numerator, uint64_t Divisor) { static uint32_t safeDiv(uint64_t Numerator, uint64_t Divisor) {
if (!Numerator) if (!Numerator)
return 0; return 0;
return Numerator/Divisor; return Numerator / Divisor;
} }
// This custom division function mimics gcov's branch ouputs: // This custom division function mimics gcov's branch ouputs:
@@ -401,7 +441,7 @@ static uint32_t branchDiv(uint64_t Numerator, uint64_t Divisor) {
if (Numerator == Divisor) if (Numerator == Divisor)
return 100; return 100;
uint8_t Res = (Numerator*100+Divisor/2) / Divisor; uint8_t Res = (Numerator * 100 + Divisor / 2) / Divisor;
if (Res == 0) if (Res == 0)
return 1; return 1;
if (Res == 100) if (Res == 100)
@@ -410,9 +450,8 @@ static uint32_t branchDiv(uint64_t Numerator, uint64_t Divisor) {
} }
struct formatBranchInfo { struct formatBranchInfo {
formatBranchInfo(const GCOVOptions &Options, uint64_t Count, formatBranchInfo(const GCOVOptions &Options, uint64_t Count, uint64_t Total)
uint64_t Total) : : Options(Options), Count(Count), Total(Total) {}
Options(Options), Count(Count), Total(Total) {}
void print(raw_ostream &OS) const { void print(raw_ostream &OS) const {
if (!Total) if (!Total)
@@ -437,6 +476,7 @@ namespace {
class LineConsumer { class LineConsumer {
std::unique_ptr<MemoryBuffer> Buffer; std::unique_ptr<MemoryBuffer> Buffer;
StringRef Remaining; StringRef Remaining;
public: public:
LineConsumer(StringRef Filename) { LineConsumer(StringRef Filename) {
ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr = ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
@@ -508,8 +548,7 @@ std::string FileInfo::getCoveragePath(StringRef Filename,
if (Options.LongFileNames && !Filename.equals(MainFilename)) if (Options.LongFileNames && !Filename.equals(MainFilename))
CoveragePath = CoveragePath =
mangleCoveragePath(MainFilename, Options.PreservePaths) + "##"; mangleCoveragePath(MainFilename, Options.PreservePaths) + "##";
CoveragePath += CoveragePath += mangleCoveragePath(Filename, Options.PreservePaths) + ".gcov";
mangleCoveragePath(Filename, Options.PreservePaths) + ".gcov";
return CoveragePath; return CoveragePath;
} }
@@ -532,7 +571,8 @@ FileInfo::openCoveragePath(StringRef CoveragePath) {
void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
StringRef GCDAFile) { StringRef GCDAFile) {
for (StringMap<LineData>::const_iterator I = LineInfo.begin(), for (StringMap<LineData>::const_iterator I = LineInfo.begin(),
E = LineInfo.end(); I != E; ++I) { E = LineInfo.end();
I != E; ++I) {
StringRef Filename = I->first(); StringRef Filename = I->first();
auto AllLines = LineConsumer(Filename); auto AllLines = LineConsumer(Filename);
@@ -548,8 +588,8 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
const LineData &Line = I->second; const LineData &Line = I->second;
GCOVCoverage FileCoverage(Filename); GCOVCoverage FileCoverage(Filename);
for (uint32_t LineIndex = 0; for (uint32_t LineIndex = 0; LineIndex < Line.LastLine || !AllLines.empty();
LineIndex < Line.LastLine || !AllLines.empty(); ++LineIndex) { ++LineIndex) {
if (Options.BranchInfo) { if (Options.BranchInfo) {
FunctionLines::const_iterator FuncsIt = Line.Functions.find(LineIndex); FunctionLines::const_iterator FuncsIt = Line.Functions.find(LineIndex);
if (FuncsIt != Line.Functions.end()) if (FuncsIt != Line.Functions.end())
@@ -568,7 +608,7 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
DenseMap<const GCOVFunction *, bool> LineExecs; DenseMap<const GCOVFunction *, bool> LineExecs;
uint64_t LineCount = 0; uint64_t LineCount = 0;
for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end(); for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end();
I != E; ++I) { I != E; ++I) {
const GCOVBlock *Block = *I; const GCOVBlock *Block = *I;
if (Options.AllBlocks) { if (Options.AllBlocks) {
// Only take the highest block count for that line. // Only take the highest block count for that line.
@@ -593,8 +633,8 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
// one of the blocks are executed. // one of the blocks are executed.
const GCOVFunction *Function = &Block->getParent(); const GCOVFunction *Function = &Block->getParent();
if (FuncCoverages.find(Function) == FuncCoverages.end()) { if (FuncCoverages.find(Function) == FuncCoverages.end()) {
std::pair<const GCOVFunction *, GCOVCoverage> std::pair<const GCOVFunction *, GCOVCoverage> KeyValue(
KeyValue(Function, GCOVCoverage(Function->getName())); Function, GCOVCoverage(Function->getName()));
FuncCoverages.insert(KeyValue); FuncCoverages.insert(KeyValue);
} }
GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second; GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second;
@@ -627,11 +667,11 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
uint32_t BlockNo = 0; uint32_t BlockNo = 0;
uint32_t EdgeNo = 0; uint32_t EdgeNo = 0;
for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end(); for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end();
I != E; ++I) { I != E; ++I) {
const GCOVBlock *Block = *I; const GCOVBlock *Block = *I;
// Only print block and branch information at the end of the block. // Only print block and branch information at the end of the block.
if (Block->getLastLine() != LineIndex+1) if (Block->getLastLine() != LineIndex + 1)
continue; continue;
if (Options.AllBlocks) if (Options.AllBlocks)
printBlockInfo(OS, *Block, LineIndex, BlockNo); printBlockInfo(OS, *Block, LineIndex, BlockNo);
@@ -659,21 +699,22 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile,
void FileInfo::printFunctionSummary(raw_ostream &OS, void FileInfo::printFunctionSummary(raw_ostream &OS,
const FunctionVector &Funcs) const { const FunctionVector &Funcs) const {
for (FunctionVector::const_iterator I = Funcs.begin(), E = Funcs.end(); for (FunctionVector::const_iterator I = Funcs.begin(), E = Funcs.end();
I != E; ++I) { I != E; ++I) {
const GCOVFunction *Func = *I; const GCOVFunction *Func = *I;
uint64_t EntryCount = Func->getEntryCount(); uint64_t EntryCount = Func->getEntryCount();
uint32_t BlocksExec = 0; uint32_t BlocksExec = 0;
for (GCOVFunction::BlockIterator I = Func->block_begin(), for (GCOVFunction::BlockIterator I = Func->block_begin(),
E = Func->block_end(); I != E; ++I) { E = Func->block_end();
I != E; ++I) {
const GCOVBlock &Block = **I; const GCOVBlock &Block = **I;
if (Block.getNumDstEdges() && Block.getCount()) if (Block.getNumDstEdges() && Block.getCount())
++BlocksExec; ++BlocksExec;
} }
OS << "function " << Func->getName() << " called " << EntryCount OS << "function " << Func->getName() << " called " << EntryCount
<< " returned " << safeDiv(Func->getExitCount()*100, EntryCount) << " returned " << safeDiv(Func->getExitCount() * 100, EntryCount)
<< "% blocks executed " << "% blocks executed "
<< safeDiv(BlocksExec*100, Func->getNumBlocks()-1) << "%\n"; << safeDiv(BlocksExec * 100, Func->getNumBlocks() - 1) << "%\n";
} }
} }
@@ -684,7 +725,7 @@ void FileInfo::printBlockInfo(raw_ostream &OS, const GCOVBlock &Block,
OS << " $$$$$:"; OS << " $$$$$:";
else else
OS << format("%9" PRIu64 ":", Block.getCount()); OS << format("%9" PRIu64 ":", Block.getCount());
OS << format("%5u-block %2u\n", LineIndex+1, BlockNo++); OS << format("%5u-block %2u\n", LineIndex + 1, BlockNo++);
} }
/// printBranchInfo - Print conditional branch probabilities. /// printBranchInfo - Print conditional branch probabilities.
@@ -693,25 +734,30 @@ void FileInfo::printBranchInfo(raw_ostream &OS, const GCOVBlock &Block,
SmallVector<uint64_t, 16> BranchCounts; SmallVector<uint64_t, 16> BranchCounts;
uint64_t TotalCounts = 0; uint64_t TotalCounts = 0;
for (GCOVBlock::EdgeIterator I = Block.dst_begin(), E = Block.dst_end(); for (GCOVBlock::EdgeIterator I = Block.dst_begin(), E = Block.dst_end();
I != E; ++I) { I != E; ++I) {
const GCOVEdge *Edge = *I; const GCOVEdge *Edge = *I;
BranchCounts.push_back(Edge->Count); BranchCounts.push_back(Edge->Count);
TotalCounts += Edge->Count; TotalCounts += Edge->Count;
if (Block.getCount()) ++Coverage.BranchesExec; if (Block.getCount())
if (Edge->Count) ++Coverage.BranchesTaken; ++Coverage.BranchesExec;
if (Edge->Count)
++Coverage.BranchesTaken;
++Coverage.Branches; ++Coverage.Branches;
if (Options.FuncCoverage) { if (Options.FuncCoverage) {
const GCOVFunction *Function = &Block.getParent(); const GCOVFunction *Function = &Block.getParent();
GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second; GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second;
if (Block.getCount()) ++FuncCoverage.BranchesExec; if (Block.getCount())
if (Edge->Count) ++FuncCoverage.BranchesTaken; ++FuncCoverage.BranchesExec;
if (Edge->Count)
++FuncCoverage.BranchesTaken;
++FuncCoverage.Branches; ++FuncCoverage.Branches;
} }
} }
for (SmallVectorImpl<uint64_t>::const_iterator I = BranchCounts.begin(), for (SmallVectorImpl<uint64_t>::const_iterator I = BranchCounts.begin(),
E = BranchCounts.end(); I != E; ++I) { E = BranchCounts.end();
I != E; ++I) {
OS << format("branch %2u ", EdgeNo++) OS << format("branch %2u ", EdgeNo++)
<< formatBranchInfo(Options, *I, TotalCounts) << "\n"; << formatBranchInfo(Options, *I, TotalCounts) << "\n";
} }
@@ -728,15 +774,15 @@ void FileInfo::printUncondBranchInfo(raw_ostream &OS, uint32_t &EdgeNo,
// and printFileCoverage. // and printFileCoverage.
void FileInfo::printCoverage(const GCOVCoverage &Coverage) const { void FileInfo::printCoverage(const GCOVCoverage &Coverage) const {
outs() << format("Lines executed:%.2f%% of %u\n", outs() << format("Lines executed:%.2f%% of %u\n",
double(Coverage.LinesExec)*100/Coverage.LogicalLines, double(Coverage.LinesExec) * 100 / Coverage.LogicalLines,
Coverage.LogicalLines); Coverage.LogicalLines);
if (Options.BranchInfo) { if (Options.BranchInfo) {
if (Coverage.Branches) { if (Coverage.Branches) {
outs() << format("Branches executed:%.2f%% of %u\n", outs() << format("Branches executed:%.2f%% of %u\n",
double(Coverage.BranchesExec)*100/Coverage.Branches, double(Coverage.BranchesExec) * 100 / Coverage.Branches,
Coverage.Branches); Coverage.Branches);
outs() << format("Taken at least once:%.2f%% of %u\n", outs() << format("Taken at least once:%.2f%% of %u\n",
double(Coverage.BranchesTaken)*100/Coverage.Branches, double(Coverage.BranchesTaken) * 100 / Coverage.Branches,
Coverage.Branches); Coverage.Branches);
} else { } else {
outs() << "No branches\n"; outs() << "No branches\n";
@@ -748,7 +794,8 @@ void FileInfo::printCoverage(const GCOVCoverage &Coverage) const {
// printFuncCoverage - Print per-function coverage info. // printFuncCoverage - Print per-function coverage info.
void FileInfo::printFuncCoverage() const { void FileInfo::printFuncCoverage() const {
for (FuncCoverageMap::const_iterator I = FuncCoverages.begin(), for (FuncCoverageMap::const_iterator I = FuncCoverages.begin(),
E = FuncCoverages.end(); I != E; ++I) { E = FuncCoverages.end();
I != E; ++I) {
const GCOVCoverage &Coverage = I->second; const GCOVCoverage &Coverage = I->second;
outs() << "Function '" << Coverage.Name << "'\n"; outs() << "Function '" << Coverage.Name << "'\n";
printCoverage(Coverage); printCoverage(Coverage);
@@ -759,7 +806,8 @@ void FileInfo::printFuncCoverage() const {
// printFileCoverage - Print per-file coverage info. // printFileCoverage - Print per-file coverage info.
void FileInfo::printFileCoverage() const { void FileInfo::printFileCoverage() const {
for (FileCoverageList::const_iterator I = FileCoverages.begin(), for (FileCoverageList::const_iterator I = FileCoverages.begin(),
E = FileCoverages.end(); I != E; ++I) { E = FileCoverages.end();
I != E; ++I) {
const std::string &Filename = I->first; const std::string &Filename = I->first;
const GCOVCoverage &Coverage = I->second; const GCOVCoverage &Coverage = I->second;
outs() << "File '" << Coverage.Name << "'\n"; outs() << "File '" << Coverage.Name << "'\n";