From 4c61bbe673c58c4a973542cf7e911ec81ecaebb7 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Fri, 23 Jan 2015 22:38:01 +0000 Subject: [PATCH] llvm-cov: clang-format the GCOV files (NFC) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226952 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/GCOV.h | 125 ++++++++++----------- lib/IR/GCOV.cpp | 218 ++++++++++++++++++++++-------------- 2 files changed, 195 insertions(+), 148 deletions(-) diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h index e378602c7bb..e51b9865d79 100644 --- a/include/llvm/Support/GCOV.h +++ b/include/llvm/Support/GCOV.h @@ -29,10 +29,7 @@ class GCOVBlock; class FileInfo; namespace GCOV { - enum GCOVVersion { - V402, - V404 - }; +enum GCOVVersion { V402, V404 }; } // end GCOV namespace /// GCOVOptions - A struct for passing gcov options between functions. @@ -56,7 +53,7 @@ struct GCOVOptions { class GCOVBuffer { public: GCOVBuffer(MemoryBuffer *B) : Buffer(B), Cursor(0) {} - + /// readGCNOFormat - Check GCNO signature is valid at the beginning of buffer. bool readGCNOFormat() { StringRef File = Buffer->getBuffer().slice(0, 4); @@ -81,7 +78,7 @@ public: /// readGCOVVersion - Read GCOV 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") { Cursor += 4; Version = GCOV::V402; @@ -99,10 +96,9 @@ public: /// readFunctionTag - If cursor points to a function tag then increment the /// cursor and return true otherwise return false. bool readFunctionTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\0' || Tag[3] != '\1') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' || + Tag[3] != '\1') { return false; } Cursor += 4; @@ -112,10 +108,9 @@ public: /// readBlockTag - If cursor points to a block tag then increment the /// cursor and return true otherwise return false. bool readBlockTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\x41' || Tag[3] != '\x01') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x41' || + Tag[3] != '\x01') { return false; } Cursor += 4; @@ -125,10 +120,9 @@ public: /// readEdgeTag - If cursor points to an edge tag then increment the /// cursor and return true otherwise return false. bool readEdgeTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\x43' || Tag[3] != '\x01') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x43' || + Tag[3] != '\x01') { return false; } Cursor += 4; @@ -138,10 +132,9 @@ public: /// readLineTag - If cursor points to a line tag then increment the /// cursor and return true otherwise return false. bool readLineTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\x45' || Tag[3] != '\x01') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\x45' || + Tag[3] != '\x01') { return false; } Cursor += 4; @@ -151,10 +144,9 @@ public: /// readArcTag - If cursor points to an gcda arc tag then increment the /// cursor and return true otherwise return false. bool readArcTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\xa1' || Tag[3] != '\1') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\xa1' || + Tag[3] != '\1') { return false; } Cursor += 4; @@ -164,10 +156,9 @@ public: /// readObjectTag - If cursor points to an object summary tag then increment /// the cursor and return true otherwise return false. bool readObjectTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\0' || Tag[3] != '\xa1') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' || + Tag[3] != '\xa1') { return false; } Cursor += 4; @@ -177,10 +168,9 @@ public: /// readProgramTag - If cursor points to a program summary tag then increment /// the cursor and return true otherwise return false. bool readProgramTag() { - StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor+4); - if (Tag.empty() || - Tag[0] != '\0' || Tag[1] != '\0' || - Tag[2] != '\0' || Tag[3] != '\xa3') { + StringRef Tag = Buffer->getBuffer().slice(Cursor, Cursor + 4); + if (Tag.empty() || Tag[0] != '\0' || Tag[1] != '\0' || Tag[2] != '\0' || + Tag[3] != '\xa3') { return false; } Cursor += 4; @@ -188,11 +178,11 @@ public: } bool readInt(uint32_t &Val) { - if (Buffer->getBuffer().size() < Cursor+4) { - errs() << "Unexpected end of memory buffer: " << Cursor+4 << ".\n"; + if (Buffer->getBuffer().size() < Cursor + 4) { + errs() << "Unexpected end of memory buffer: " << Cursor + 4 << ".\n"; return false; } - StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+4); + StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor + 4); Cursor += 4; Val = *(const uint32_t *)(Str.data()); return true; @@ -200,7 +190,8 @@ public: bool readInt64(uint64_t &Val) { uint32_t Lo, Hi; - if (!readInt(Lo) || !readInt(Hi)) return false; + if (!readInt(Lo) || !readInt(Hi)) + return false; Val = ((uint64_t)Hi << 32) | Lo; return true; } @@ -210,19 +201,21 @@ public: // Keep reading until we find a non-zero length. This emulates gcov's // behaviour, which appears to do the same. while (Len == 0) - if (!readInt(Len)) return false; + if (!readInt(Len)) + return false; Len *= 4; - if (Buffer->getBuffer().size() < Cursor+Len) { - errs() << "Unexpected end of memory buffer: " << Cursor+Len << ".\n"; + 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; + Str = Buffer->getBuffer().slice(Cursor, Cursor + Len).split('\0').first; Cursor += Len; return true; } uint64_t getCursor() const { return Cursor; } - void advanceCursor(uint32_t n) { Cursor += n*4; } + void advanceCursor(uint32_t n) { Cursor += n * 4; } + private: MemoryBuffer *Buffer; uint64_t Cursor; @@ -232,13 +225,15 @@ private: /// (.gcno and .gcda). class GCOVFile { public: - GCOVFile() : GCNOInitialized(false), Checksum(0), Functions(), RunCount(0), - ProgramCount(0) {} + GCOVFile() + : GCNOInitialized(false), Checksum(0), Functions(), RunCount(0), + ProgramCount(0) {} bool readGCNO(GCOVBuffer &Buffer); bool readGCDA(GCOVBuffer &Buffer); uint32_t getChecksum() const { return Checksum; } void dump() const; void collectLineCounts(FileInfo &FI); + private: bool GCNOInitialized; GCOV::GCOVVersion Version; @@ -261,7 +256,7 @@ struct GCOVEdge { class GCOVFunction { public: typedef SmallVectorImpl>::const_iterator - BlockIterator; + BlockIterator; GCOVFunction(GCOVFile &P) : Parent(P), Ident(0), LineNumber(0) {} bool readGCNO(GCOVBuffer &Buffer, GCOV::GCOVVersion Version); @@ -277,6 +272,7 @@ public: void dump() const; void collectLineCounts(FileInfo &FI); + private: GCOVFile &Parent; uint32_t Ident; @@ -291,7 +287,7 @@ private: /// GCOVBlock - Collects block information. class GCOVBlock { struct EdgeWeight { - EdgeWeight(GCOVBlock *D): Dst(D), Count(0) {} + EdgeWeight(GCOVBlock *D) : Dst(D), Count(0) {} GCOVBlock *Dst; uint64_t Count; @@ -302,11 +298,13 @@ class GCOVBlock { return E1->Dst.Number < E2->Dst.Number; } }; + public: typedef SmallVectorImpl::const_iterator EdgeIterator; - GCOVBlock(GCOVFunction &P, uint32_t N) : Parent(P), Number(N), Counter(0), - DstEdgesAreSorted(true), SrcEdges(), DstEdges(), Lines() {} + GCOVBlock(GCOVFunction &P, uint32_t N) + : Parent(P), Number(N), Counter(0), DstEdgesAreSorted(true), SrcEdges(), + DstEdges(), Lines() {} ~GCOVBlock(); const GCOVFunction &getParent() const { return Parent; } void addLine(uint32_t N) { Lines.push_back(N); } @@ -336,6 +334,7 @@ public: void dump() const; void collectLineCounts(FileInfo &FI); + private: GCOVFunction &Parent; uint32_t Number; @@ -347,8 +346,10 @@ private: }; class FileInfo { - // It is unlikely--but possible--for multiple functions to be on the same line. - // Therefore this typedef allows LineData.Functions to store multiple functions + // It is unlikely--but possible--for multiple functions to be on the same + // line. + // Therefore this typedef allows LineData.Functions to store multiple + // functions // per instance. This is rare, however, so optimize for the common case. typedef SmallVector FunctionVector; typedef DenseMap FunctionLines; @@ -363,9 +364,9 @@ class FileInfo { }; struct GCOVCoverage { - GCOVCoverage(StringRef Name) : - Name(Name), LogicalLines(0), LinesExec(0), Branches(0), BranchesExec(0), - BranchesTaken(0) {} + GCOVCoverage(StringRef Name) + : Name(Name), LogicalLines(0), LinesExec(0), Branches(0), + BranchesExec(0), BranchesTaken(0) {} StringRef Name; @@ -376,20 +377,21 @@ class FileInfo { uint32_t BranchesExec; uint32_t BranchesTaken; }; + public: - FileInfo(const GCOVOptions &Options) : - Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {} + FileInfo(const GCOVOptions &Options) + : Options(Options), LineInfo(), RunCount(0), ProgramCount(0) {} void addBlockLine(StringRef Filename, uint32_t Line, const GCOVBlock *Block) { if (Line > LineInfo[Filename].LastLine) 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, const GCOVFunction *Function) { if (Line > LineInfo[Filename].LastLine) 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 setProgramCount(uint32_t Programs) { ProgramCount = Programs; } @@ -398,8 +400,7 @@ public: private: std::string getCoveragePath(StringRef Filename, StringRef MainFilename); std::unique_ptr openCoveragePath(StringRef CoveragePath); - void printFunctionSummary(raw_ostream &OS, - const FunctionVector &Funcs) const; + void printFunctionSummary(raw_ostream &OS, const FunctionVector &Funcs) const; void printBlockInfo(raw_ostream &OS, const GCOVBlock &Block, uint32_t LineIndex, uint32_t &BlockNo) const; void printBranchInfo(raw_ostream &OS, const GCOVBlock &Block, @@ -416,14 +417,12 @@ private: uint32_t RunCount; uint32_t ProgramCount; - typedef SmallVector, 4> - FileCoverageList; + typedef SmallVector, 4> FileCoverageList; typedef MapVector FuncCoverageMap; FileCoverageList FileCoverages; FuncCoverageMap FuncCoverages; }; - } #endif diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index 245c500cf62..3c04716333e 100644 --- a/lib/IR/GCOV.cpp +++ b/lib/IR/GCOV.cpp @@ -28,12 +28,16 @@ using namespace llvm; /// readGCNO - Read GCNO buffer. bool GCOVFile::readGCNO(GCOVBuffer &Buffer) { - if (!Buffer.readGCNOFormat()) return false; - if (!Buffer.readGCOVVersion(Version)) return false; + if (!Buffer.readGCNOFormat()) + return false; + if (!Buffer.readGCOVVersion(Version)) + return false; - if (!Buffer.readInt(Checksum)) return false; + if (!Buffer.readInt(Checksum)) + return false; while (true) { - if (!Buffer.readFunctionTag()) break; + if (!Buffer.readFunctionTag()) + break; auto GFun = make_unique(*this); if (!GFun->readGCNO(Buffer, Version)) return false; @@ -48,19 +52,22 @@ bool GCOVFile::readGCNO(GCOVBuffer &Buffer) { /// called after readGCNO(). bool GCOVFile::readGCDA(GCOVBuffer &Buffer) { assert(GCNOInitialized && "readGCDA() can only be called after readGCNO()"); - if (!Buffer.readGCDAFormat()) return false; + if (!Buffer.readGCDAFormat()) + return false; GCOV::GCOVVersion GCDAVersion; - if (!Buffer.readGCOVVersion(GCDAVersion)) return false; + if (!Buffer.readGCOVVersion(GCDAVersion)) + return false; if (Version != GCDAVersion) { errs() << "GCOV versions do not match.\n"; return false; } uint32_t GCDAChecksum; - if (!Buffer.readInt(GCDAChecksum)) return false; + if (!Buffer.readInt(GCDAChecksum)) + return false; if (Checksum != GCDAChecksum) { - errs() << "File checksums do not match: " << Checksum << " != " - << GCDAChecksum << ".\n"; + errs() << "File checksums do not match: " << Checksum + << " != " << GCDAChecksum << ".\n"; return false; } for (size_t i = 0, e = Functions.size(); i < e; ++i) { @@ -74,15 +81,20 @@ bool GCOVFile::readGCDA(GCOVBuffer &Buffer) { if (Buffer.readObjectTag()) { uint32_t Length; uint32_t Dummy; - if (!Buffer.readInt(Length)) return false; - if (!Buffer.readInt(Dummy)) return false; // checksum - if (!Buffer.readInt(Dummy)) return false; // num - if (!Buffer.readInt(RunCount)) return false; - Buffer.advanceCursor(Length-3); + if (!Buffer.readInt(Length)) + return false; + if (!Buffer.readInt(Dummy)) + return false; // checksum + if (!Buffer.readInt(Dummy)) + return false; // num + if (!Buffer.readInt(RunCount)) + return false; + Buffer.advanceCursor(Length - 3); } while (Buffer.readProgramTag()) { uint32_t Length; - if (!Buffer.readInt(Length)) return false; + if (!Buffer.readInt(Length)) + return false; Buffer.advanceCursor(Length); ++ProgramCount; } @@ -112,21 +124,28 @@ void GCOVFile::collectLineCounts(FileInfo &FI) { /// occurs. bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { uint32_t Dummy; - if (!Buff.readInt(Dummy)) return false; // Function header length - if (!Buff.readInt(Ident)) return false; - if (!Buff.readInt(Checksum)) return false; + if (!Buff.readInt(Dummy)) + return false; // Function header length + if (!Buff.readInt(Ident)) + return false; + if (!Buff.readInt(Checksum)) + return false; if (Version != GCOV::V402) { uint32_t CfgChecksum; - if (!Buff.readInt(CfgChecksum)) return false; + if (!Buff.readInt(CfgChecksum)) + return false; if (Parent.getChecksum() != CfgChecksum) { errs() << "File checksums do not match: " << Parent.getChecksum() << " != " << CfgChecksum << " in (" << Name << ").\n"; return false; } } - if (!Buff.readString(Name)) return false; - if (!Buff.readString(Filename)) return false; - if (!Buff.readInt(LineNumber)) return false; + if (!Buff.readString(Name)) + return false; + if (!Buff.readString(Filename)) + return false; + if (!Buff.readInt(LineNumber)) + return false; // read blocks. if (!Buff.readBlockTag()) { @@ -134,19 +153,23 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { return false; } 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) { - if (!Buff.readInt(Dummy)) return false; // Block flags; + if (!Buff.readInt(Dummy)) + return false; // Block flags; Blocks.push_back(make_unique(*this, i)); } // read edges. while (Buff.readEdgeTag()) { uint32_t EdgeCount; - if (!Buff.readInt(EdgeCount)) return false; + if (!Buff.readInt(EdgeCount)) + return false; EdgeCount = (EdgeCount - 1) / 2; uint32_t BlockNo; - if (!Buff.readInt(BlockNo)) return false; + if (!Buff.readInt(BlockNo)) + return false; if (BlockNo >= BlockCount) { errs() << "Unexpected block number: " << BlockNo << " (in " << Name << ").\n"; @@ -154,12 +177,14 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { } for (uint32_t i = 0, e = EdgeCount; i != e; ++i) { uint32_t Dst; - if (!Buff.readInt(Dst)) return false; + if (!Buff.readInt(Dst)) + return false; Edges.push_back(make_unique(*Blocks[BlockNo], *Blocks[Dst])); GCOVEdge *Edge = Edges.back().get(); Blocks[BlockNo]->addDstEdge(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()) { uint32_t LineTableLength; // Read the length of this line table. - if (!Buff.readInt(LineTableLength)) return false; - uint32_t EndPos = Buff.getCursor() + LineTableLength*4; + if (!Buff.readInt(LineTableLength)) + return false; + uint32_t EndPos = Buff.getCursor() + LineTableLength * 4; uint32_t BlockNo; // Read the block number this table is associated with. - if (!Buff.readInt(BlockNo)) return false; + if (!Buff.readInt(BlockNo)) + return false; if (BlockNo >= BlockCount) { errs() << "Unexpected block number: " << BlockNo << " (in " << Name << ").\n"; @@ -180,13 +207,15 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { GCOVBlock &Block = *Blocks[BlockNo]; // 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. - if (!Buff.readInt(Dummy)) return false; + if (!Buff.readInt(Dummy)) + return false; // Line information starts here and continues up until the last word. if (Buff.getCursor() != (EndPos - sizeof(uint32_t))) { StringRef F; // Read the source file name. - if (!Buff.readString(F)) return false; + if (!Buff.readString(F)) + return false; if (Filename != F) { errs() << "Multiple sources for a single basic block: " << Filename << " != " << 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. while (Buff.getCursor() < (EndPos - 2 * sizeof(uint32_t))) { 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. - if (!Line) continue; + if (!Line) + continue; Block.addLine(Line); } // 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 // over it. - if (!Buff.readInt(Dummy)) return false; + if (!Buff.readInt(Dummy)) + return false; } return true; } @@ -214,27 +247,31 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { /// occurs. bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { uint32_t Dummy; - if (!Buff.readInt(Dummy)) return false; // Function header length + if (!Buff.readInt(Dummy)) + return false; // Function header length uint32_t GCDAIdent; - if (!Buff.readInt(GCDAIdent)) return false; + if (!Buff.readInt(GCDAIdent)) + return false; if (Ident != GCDAIdent) { - errs() << "Function identifiers do not match: " << Ident << " != " - << GCDAIdent << " (in " << Name << ").\n"; + errs() << "Function identifiers do not match: " << Ident + << " != " << GCDAIdent << " (in " << Name << ").\n"; return false; } uint32_t GCDAChecksum; - if (!Buff.readInt(GCDAChecksum)) return false; + if (!Buff.readInt(GCDAChecksum)) + return false; if (Checksum != GCDAChecksum) { - errs() << "Function checksums do not match: " << Checksum << " != " - << GCDAChecksum << " (in " << Name << ").\n"; + errs() << "Function checksums do not match: " << Checksum + << " != " << GCDAChecksum << " (in " << Name << ").\n"; return false; } uint32_t CfgChecksum; if (Version != GCOV::V402) { - if (!Buff.readInt(CfgChecksum)) return false; + if (!Buff.readInt(CfgChecksum)) + return false; if (Parent.getChecksum() != CfgChecksum) { errs() << "File checksums do not match: " << Parent.getChecksum() << " != " << CfgChecksum << " (in " << Name << ").\n"; @@ -243,7 +280,8 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { } StringRef GCDAName; - if (!Buff.readString(GCDAName)) return false; + if (!Buff.readString(GCDAName)) + return false; if (Name != GCDAName) { errs() << "Function names do not match: " << Name << " != " << GCDAName << ".\n"; @@ -256,26 +294,28 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { } uint32_t Count; - if (!Buff.readInt(Count)) return false; + if (!Buff.readInt(Count)) + return false; Count /= 2; // 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. for (uint32_t BlockNo = 0; Count > 0; ++BlockNo) { // 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"; return false; } GCOVBlock &Block = *Blocks[BlockNo]; for (size_t EdgeNo = 0, End = Block.getNumDstEdges(); EdgeNo < End; - ++EdgeNo) { + ++EdgeNo) { if (Count == 0) { errs() << "Unexpected number of edges (in " << Name << ").\n"; return false; } uint64_t ArcCount; - if (!Buff.readInt64(ArcCount)) return false; + if (!Buff.readInt64(ArcCount)) + return false; Block.addCount(EdgeNo, ArcCount); --Count; } @@ -349,8 +389,7 @@ void GCOVBlock::sortDstEdges() { /// collectLineCounts - Collect line counts. This must be used after /// reading .gcno and .gcda files. void GCOVBlock::collectLineCounts(FileInfo &FI) { - for (SmallVectorImpl::iterator I = Lines.begin(), - E = Lines.end(); I != E; ++I) + for (auto I = Lines.begin(), E = Lines.end(); I != E; ++I) FI.addBlockLine(Parent.getFilename(), *I, this); } @@ -376,7 +415,8 @@ void GCOVBlock::dump() const { if (!Lines.empty()) { dbgs() << "\tLines : "; for (SmallVectorImpl::const_iterator I = Lines.begin(), - E = Lines.end(); I != E; ++I) + E = Lines.end(); + I != E; ++I) dbgs() << (*I) << ","; dbgs() << "\n"; } @@ -389,7 +429,7 @@ void GCOVBlock::dump() const { static uint32_t safeDiv(uint64_t Numerator, uint64_t Divisor) { if (!Numerator) return 0; - return Numerator/Divisor; + return Numerator / Divisor; } // 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) return 100; - uint8_t Res = (Numerator*100+Divisor/2) / Divisor; + uint8_t Res = (Numerator * 100 + Divisor / 2) / Divisor; if (Res == 0) return 1; if (Res == 100) @@ -410,9 +450,8 @@ static uint32_t branchDiv(uint64_t Numerator, uint64_t Divisor) { } struct formatBranchInfo { - formatBranchInfo(const GCOVOptions &Options, uint64_t Count, - uint64_t Total) : - Options(Options), Count(Count), Total(Total) {} + formatBranchInfo(const GCOVOptions &Options, uint64_t Count, uint64_t Total) + : Options(Options), Count(Count), Total(Total) {} void print(raw_ostream &OS) const { if (!Total) @@ -437,6 +476,7 @@ namespace { class LineConsumer { std::unique_ptr Buffer; StringRef Remaining; + public: LineConsumer(StringRef Filename) { ErrorOr> BufferOrErr = @@ -508,8 +548,7 @@ std::string FileInfo::getCoveragePath(StringRef Filename, if (Options.LongFileNames && !Filename.equals(MainFilename)) CoveragePath = mangleCoveragePath(MainFilename, Options.PreservePaths) + "##"; - CoveragePath += - mangleCoveragePath(Filename, Options.PreservePaths) + ".gcov"; + CoveragePath += mangleCoveragePath(Filename, Options.PreservePaths) + ".gcov"; return CoveragePath; } @@ -532,7 +571,8 @@ FileInfo::openCoveragePath(StringRef CoveragePath) { void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, StringRef GCDAFile) { for (StringMap::const_iterator I = LineInfo.begin(), - E = LineInfo.end(); I != E; ++I) { + E = LineInfo.end(); + I != E; ++I) { StringRef Filename = I->first(); auto AllLines = LineConsumer(Filename); @@ -548,8 +588,8 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, const LineData &Line = I->second; GCOVCoverage FileCoverage(Filename); - for (uint32_t LineIndex = 0; - LineIndex < Line.LastLine || !AllLines.empty(); ++LineIndex) { + for (uint32_t LineIndex = 0; LineIndex < Line.LastLine || !AllLines.empty(); + ++LineIndex) { if (Options.BranchInfo) { FunctionLines::const_iterator FuncsIt = Line.Functions.find(LineIndex); if (FuncsIt != Line.Functions.end()) @@ -568,7 +608,7 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, DenseMap LineExecs; uint64_t LineCount = 0; for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end(); - I != E; ++I) { + I != E; ++I) { const GCOVBlock *Block = *I; if (Options.AllBlocks) { // 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. const GCOVFunction *Function = &Block->getParent(); if (FuncCoverages.find(Function) == FuncCoverages.end()) { - std::pair - KeyValue(Function, GCOVCoverage(Function->getName())); + std::pair KeyValue( + Function, GCOVCoverage(Function->getName())); FuncCoverages.insert(KeyValue); } GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second; @@ -627,11 +667,11 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, uint32_t BlockNo = 0; uint32_t EdgeNo = 0; for (BlockVector::const_iterator I = Blocks.begin(), E = Blocks.end(); - I != E; ++I) { + I != E; ++I) { const GCOVBlock *Block = *I; // Only print block and branch information at the end of the block. - if (Block->getLastLine() != LineIndex+1) + if (Block->getLastLine() != LineIndex + 1) continue; if (Options.AllBlocks) printBlockInfo(OS, *Block, LineIndex, BlockNo); @@ -659,21 +699,22 @@ void FileInfo::print(StringRef MainFilename, StringRef GCNOFile, void FileInfo::printFunctionSummary(raw_ostream &OS, const FunctionVector &Funcs) const { for (FunctionVector::const_iterator I = Funcs.begin(), E = Funcs.end(); - I != E; ++I) { + I != E; ++I) { const GCOVFunction *Func = *I; uint64_t EntryCount = Func->getEntryCount(); uint32_t BlocksExec = 0; 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; if (Block.getNumDstEdges() && Block.getCount()) - ++BlocksExec; + ++BlocksExec; } OS << "function " << Func->getName() << " called " << EntryCount - << " returned " << safeDiv(Func->getExitCount()*100, EntryCount) + << " returned " << safeDiv(Func->getExitCount() * 100, EntryCount) << "% 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 << " $$$$$:"; else 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. @@ -693,25 +734,30 @@ void FileInfo::printBranchInfo(raw_ostream &OS, const GCOVBlock &Block, SmallVector BranchCounts; uint64_t TotalCounts = 0; for (GCOVBlock::EdgeIterator I = Block.dst_begin(), E = Block.dst_end(); - I != E; ++I) { + I != E; ++I) { const GCOVEdge *Edge = *I; BranchCounts.push_back(Edge->Count); TotalCounts += Edge->Count; - if (Block.getCount()) ++Coverage.BranchesExec; - if (Edge->Count) ++Coverage.BranchesTaken; + if (Block.getCount()) + ++Coverage.BranchesExec; + if (Edge->Count) + ++Coverage.BranchesTaken; ++Coverage.Branches; if (Options.FuncCoverage) { const GCOVFunction *Function = &Block.getParent(); GCOVCoverage &FuncCoverage = FuncCoverages.find(Function)->second; - if (Block.getCount()) ++FuncCoverage.BranchesExec; - if (Edge->Count) ++FuncCoverage.BranchesTaken; + if (Block.getCount()) + ++FuncCoverage.BranchesExec; + if (Edge->Count) + ++FuncCoverage.BranchesTaken; ++FuncCoverage.Branches; } } for (SmallVectorImpl::const_iterator I = BranchCounts.begin(), - E = BranchCounts.end(); I != E; ++I) { + E = BranchCounts.end(); + I != E; ++I) { OS << format("branch %2u ", EdgeNo++) << formatBranchInfo(Options, *I, TotalCounts) << "\n"; } @@ -728,15 +774,15 @@ void FileInfo::printUncondBranchInfo(raw_ostream &OS, uint32_t &EdgeNo, // and printFileCoverage. void FileInfo::printCoverage(const GCOVCoverage &Coverage) const { outs() << format("Lines executed:%.2f%% of %u\n", - double(Coverage.LinesExec)*100/Coverage.LogicalLines, + double(Coverage.LinesExec) * 100 / Coverage.LogicalLines, Coverage.LogicalLines); if (Options.BranchInfo) { if (Coverage.Branches) { outs() << format("Branches executed:%.2f%% of %u\n", - double(Coverage.BranchesExec)*100/Coverage.Branches, + double(Coverage.BranchesExec) * 100 / Coverage.Branches, Coverage.Branches); outs() << format("Taken at least once:%.2f%% of %u\n", - double(Coverage.BranchesTaken)*100/Coverage.Branches, + double(Coverage.BranchesTaken) * 100 / Coverage.Branches, Coverage.Branches); } else { outs() << "No branches\n"; @@ -748,7 +794,8 @@ void FileInfo::printCoverage(const GCOVCoverage &Coverage) const { // printFuncCoverage - Print per-function coverage info. void FileInfo::printFuncCoverage() const { for (FuncCoverageMap::const_iterator I = FuncCoverages.begin(), - E = FuncCoverages.end(); I != E; ++I) { + E = FuncCoverages.end(); + I != E; ++I) { const GCOVCoverage &Coverage = I->second; outs() << "Function '" << Coverage.Name << "'\n"; printCoverage(Coverage); @@ -759,7 +806,8 @@ void FileInfo::printFuncCoverage() const { // printFileCoverage - Print per-file coverage info. void FileInfo::printFileCoverage() const { 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 GCOVCoverage &Coverage = I->second; outs() << "File '" << Coverage.Name << "'\n"; -- 2.34.1