Skip to content

Commit

Permalink
llvm-cov: Added constness property to methods.
Browse files Browse the repository at this point in the history
Added constness to methods that shouldn't modify objects. Replaced
operator[] lookup in maps with find() instead.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195151 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
yuchenericwu committed Nov 19, 2013
1 parent 5903eca commit d6fde40
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
10 changes: 5 additions & 5 deletions include/llvm/Support/GCOV.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class GCOVFile {
GCOVFile() : Functions(), RunCount(0), ProgramCount(0) {}
~GCOVFile();
bool read(GCOVBuffer &Buffer);
void dump();
void dump() const;
void collectLineCounts(FileInfo &FI);
private:
SmallVector<GCOVFunction *, 16> Functions;
Expand All @@ -211,7 +211,7 @@ class GCOVFunction {
~GCOVFunction();
bool read(GCOVBuffer &Buffer, GCOV::GCOVFormat Format);
StringRef getFilename() const { return Filename; }
void dump();
void dump() const;
void collectLineCounts(FileInfo &FI);
private:
uint32_t Ident;
Expand All @@ -230,8 +230,8 @@ class GCOVBlock {
void addEdge(uint32_t N) { Edges.push_back(N); }
void addLine(uint32_t N) { Lines.push_back(N); }
void addCount(uint64_t N) { Counter += N; }
size_t getNumEdges() { return Edges.size(); }
void dump();
size_t getNumEdges() const { return Edges.size(); }
void dump() const;
void collectLineCounts(FileInfo &FI);
private:
GCOVFunction &Parent;
Expand All @@ -249,7 +249,7 @@ class FileInfo {
}
void setRunCount(uint32_t Runs) { RunCount = Runs; }
void setProgramCount(uint32_t Programs) { ProgramCount = Programs; }
void print(raw_fd_ostream &OS, StringRef gcnoFile, StringRef gcdaFile);
void print(raw_fd_ostream &OS, StringRef gcnoFile, StringRef gcdaFile) const;
private:
StringMap<LineCounts> LineInfo;
uint32_t RunCount;
Expand Down
29 changes: 15 additions & 14 deletions lib/IR/GCOV.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ bool GCOVFile::read(GCOVBuffer &Buffer) {
}

/// dump - Dump GCOVFile content to dbgs() for debugging purposes.
void GCOVFile::dump() {
for (SmallVectorImpl<GCOVFunction *>::iterator I = Functions.begin(),
void GCOVFile::dump() const {
for (SmallVectorImpl<GCOVFunction *>::const_iterator I = Functions.begin(),
E = Functions.end(); I != E; ++I)
(*I)->dump();
}
Expand Down Expand Up @@ -221,9 +221,9 @@ bool GCOVFunction::read(GCOVBuffer &Buff, GCOV::GCOVFormat Format) {
}

/// dump - Dump GCOVFunction content to dbgs() for debugging purposes.
void GCOVFunction::dump() {
void GCOVFunction::dump() const {
dbgs() << "===== " << Name << " @ " << Filename << ":" << LineNumber << "\n";
for (SmallVectorImpl<GCOVBlock *>::iterator I = Blocks.begin(),
for (SmallVectorImpl<GCOVBlock *>::const_iterator I = Blocks.begin(),
E = Blocks.end(); I != E; ++I)
(*I)->dump();
}
Expand Down Expand Up @@ -254,18 +254,18 @@ void GCOVBlock::collectLineCounts(FileInfo &FI) {
}

/// dump - Dump GCOVBlock content to dbgs() for debugging purposes.
void GCOVBlock::dump() {
void GCOVBlock::dump() const {
dbgs() << "Block : " << Number << " Counter : " << Counter << "\n";
if (!Edges.empty()) {
dbgs() << "\tEdges : ";
for (SmallVectorImpl<uint32_t>::iterator I = Edges.begin(), E = Edges.end();
for (SmallVectorImpl<uint32_t>::const_iterator I = Edges.begin(), E = Edges.end();
I != E; ++I)
dbgs() << (*I) << ",";
dbgs() << "\n";
}
if (!Lines.empty()) {
dbgs() << "\tLines : ";
for (SmallVectorImpl<uint32_t>::iterator I = Lines.begin(),
for (SmallVectorImpl<uint32_t>::const_iterator I = Lines.begin(),
E = Lines.end(); I != E; ++I)
dbgs() << (*I) << ",";
dbgs() << "\n";
Expand All @@ -277,16 +277,16 @@ void GCOVBlock::dump() {

/// print - Print source files with collected line count information.
void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile,
StringRef gcdaFile) {
for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end();
I != E; ++I) {
StringRef gcdaFile) const {
for (StringMap<LineCounts>::const_iterator I = LineInfo.begin(),
E = LineInfo.end(); I != E; ++I) {
StringRef Filename = I->first();
OS << " -: 0:Source:" << Filename << "\n";
OS << " -: 0:Graph:" << gcnoFile << "\n";
OS << " -: 0:Data:" << gcdaFile << "\n";
OS << " -: 0:Runs:" << RunCount << "\n";
OS << " -: 0:Programs:" << ProgramCount << "\n";
LineCounts &L = LineInfo[Filename];
const LineCounts &L = I->second;
OwningPtr<MemoryBuffer> Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
errs() << Filename << ": " << ec.message() << "\n";
Expand All @@ -295,11 +295,12 @@ void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile,
StringRef AllLines = Buff->getBuffer();
uint32_t i = 0;
while (!AllLines.empty()) {
if (L.find(i) != L.end()) {
if (L[i] == 0)
LineCounts::const_iterator CountIt = L.find(i);
if (CountIt != L.end()) {
if (CountIt->second == 0)
OS << " #####:";
else
OS << format("%9" PRIu64 ":", L[i]);
OS << format("%9" PRIu64 ":", CountIt->second);
} else {
OS << " -:";
}
Expand Down

0 comments on commit d6fde40

Please sign in to comment.