diff options
| -rw-r--r-- | include/llvm/Support/GCOV.h | 7 | ||||
| -rw-r--r-- | lib/IR/GCOV.cpp | 32 |
2 files changed, 15 insertions, 24 deletions
diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h index aa436fbea9..f1e7998bc4 100644 --- a/include/llvm/Support/GCOV.h +++ b/include/llvm/Support/GCOV.h @@ -15,6 +15,7 @@ #ifndef LLVM_SUPPORT_GCOV_H #define LLVM_SUPPORT_GCOV_H +#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringMap.h" #include "llvm/Support/MemoryBuffer.h" @@ -212,10 +213,12 @@ private: SmallVector<uint32_t, 4> Lines; }; -typedef SmallVector<uint64_t, 16> LineCounts; +typedef DenseMap<uint32_t, uint64_t> LineCounts; class FileInfo { public: - void addLineCount(StringRef Filename, uint32_t Line, uint64_t Count); + void addLineCount(StringRef Filename, uint32_t Line, uint64_t Count) { + LineInfo[Filename][Line-1] = Count; + } void print(StringRef gcnoFile, StringRef gcdaFile); private: StringMap<LineCounts> LineInfo; diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index f810d37775..68b91e6dc9 100644 --- a/lib/IR/GCOV.cpp +++ b/lib/IR/GCOV.cpp @@ -235,24 +235,6 @@ void GCOVLines::dump() { //===----------------------------------------------------------------------===// // FileInfo implementation. -/// addLineCount - Add line count for the given line number in a file. -void FileInfo::addLineCount(StringRef Filename, uint32_t Line, uint64_t Count) { - if (LineInfo.find(Filename) == LineInfo.end()) { - OwningPtr<MemoryBuffer> Buff; - if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) { - errs() << Filename << ": " << ec.message() << "\n"; - return; - } - StringRef AllLines = Buff.take()->getBuffer(); - LineCounts L(AllLines.count('\n')); - L[Line-1] = Count; - LineInfo[Filename] = L; - return; - } - LineCounts &L = LineInfo[Filename]; - L[Line-1] = Count; -} - /// print - Print source files with collected line count information. void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) { for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end(); @@ -268,16 +250,22 @@ void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) { return; } StringRef AllLines = Buff.take()->getBuffer(); - for (unsigned i = 0, e = L.size(); i != e; ++i) { - if (L[i]) - outs() << format("%9lu:", L[i]); - else + uint32_t i = 0; + while (!AllLines.empty()) { + if (L.find(i) != L.end()) { + if (L[i] == 0) + outs() << " #####:"; + else + outs() << format("%9lu:", L[i]); + } else { outs() << " -:"; + } std::pair<StringRef, StringRef> P = AllLines.split('\n'); if (AllLines != P.first) outs() << format("%5u:", i+1) << P.first; outs() << "\n"; AllLines = P.second; + ++i; } } } |