summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/llvm/Support/GCOV.h4
-rw-r--r--lib/IR/GCOV.cpp16
-rw-r--r--tools/llvm-cov/llvm-cov.cpp2
3 files changed, 12 insertions, 10 deletions
diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h
index f1040f545c..67d637021a 100644
--- a/include/llvm/Support/GCOV.h
+++ b/include/llvm/Support/GCOV.h
@@ -145,7 +145,7 @@ public:
uint32_t Len = readInt() * 4;
StringRef Str = Buffer->getBuffer().slice(Cursor, Cursor+Len);
Cursor += Len;
- return Str;
+ return Str.split('\0').first;
}
uint64_t getCursor() const { return Cursor; }
@@ -216,7 +216,7 @@ typedef SmallVector<uint32_t, 16> LineCounts;
class FileInfo {
public:
void addLineCount(StringRef Filename, uint32_t Line, uint32_t Count);
- void print();
+ void print(StringRef gcnoFile, StringRef gcdaFile);
private:
StringMap<LineCounts> LineInfo;
};
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index b8907d01b4..36c5390bbd 100644
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -15,6 +15,7 @@
#include "llvm/Support/GCOV.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Format.h"
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/system_error.h"
using namespace llvm;
@@ -243,7 +244,7 @@ void FileInfo::addLineCount(StringRef Filename, uint32_t Line, uint32_t Count) {
return;
}
StringRef AllLines = Buff.take()->getBuffer();
- LineCounts L(AllLines.count('\n')+2);
+ LineCounts L(AllLines.count('\n'));
L[Line-1] = Count;
LineInfo[Filename] = L;
return;
@@ -253,11 +254,13 @@ void FileInfo::addLineCount(StringRef Filename, uint32_t Line, uint32_t Count) {
}
/// print - Print source files with collected line count information.
-void FileInfo::print() {
+void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) {
for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end();
I != E; ++I) {
StringRef Filename = I->first();
- outs() << Filename << "\n";
+ outs() << " -: 0:Source:" << Filename << "\n";
+ outs() << " -: 0:Graph:" << gcnoFile << "\n";
+ outs() << " -: 0:Data:" << gcdaFile << "\n";
LineCounts &L = LineInfo[Filename];
OwningPtr<MemoryBuffer> Buff;
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
@@ -267,16 +270,15 @@ void FileInfo::print() {
StringRef AllLines = Buff.take()->getBuffer();
for (unsigned i = 0, e = L.size(); i != e; ++i) {
if (L[i])
- outs() << L[i] << ":\t";
+ outs() << format("%9lu:", L[i]);
else
- outs() << " :\t";
+ outs() << " -:";
std::pair<StringRef, StringRef> P = AllLines.split('\n');
if (AllLines != P.first)
- outs() << P.first;
+ outs() << format("%5u:", i+1) << P.first;
outs() << "\n";
AllLines = P.second;
}
}
}
-
diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp
index 7404679145..26aec4632b 100644
--- a/tools/llvm-cov/llvm-cov.cpp
+++ b/tools/llvm-cov/llvm-cov.cpp
@@ -74,6 +74,6 @@ int main(int argc, char **argv) {
FileInfo FI;
GF.collectLineCounts(FI);
- FI.print();
+ FI.print(InputGCNO, InputGCDA);
return 0;
}