summaryrefslogtreecommitdiff
path: root/lib/IR/GCOV.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-12-04 08:57:17 +0000
committerDaniel Jasper <djasper@google.com>2013-12-04 08:57:17 +0000
commitbfbf8d3ad8990f89353c930e3223e010eed43833 (patch)
tree58c7393973bab26158646e1bb383b1a682deb7dd /lib/IR/GCOV.cpp
parentb835a4403adf0d808c73be0521d572c82799beee (diff)
downloadllvm-bfbf8d3ad8990f89353c930e3223e010eed43833.tar.gz
llvm-bfbf8d3ad8990f89353c930e3223e010eed43833.tar.bz2
llvm-bfbf8d3ad8990f89353c930e3223e010eed43833.tar.xz
Un-revert r196358: "llvm-cov: Added support for function checksums."
And add the proper fix. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196367 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR/GCOV.cpp')
-rw-r--r--lib/IR/GCOV.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index 64d53e4251..14eb71f030 100644
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -125,7 +125,7 @@ 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(Dummy)) return false; // Checksum #1
+ if (!Buff.readInt(Checksum)) return false;
if (Version != GCOV::V402) {
uint32_t CfgChecksum;
if (!Buff.readInt(CfgChecksum)) return false;
@@ -212,6 +212,7 @@ bool GCOVFunction::readGCNO(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
uint32_t Dummy;
if (!Buff.readInt(Dummy)) return false; // Function header length
+
uint32_t GCDAIdent;
if (!Buff.readInt(GCDAIdent)) return false;
if (Ident != GCDAIdent) {
@@ -220,8 +221,13 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
return false;
}
- if (!Buff.readInt(Dummy)) return false; // Checksum #1
-
+ uint32_t GCDAChecksum;
+ if (!Buff.readInt(GCDAChecksum)) return false;
+ if (Checksum != GCDAChecksum) {
+ errs() << "Function checksums do not match: " << Checksum << " != "
+ << GCDAChecksum << " (in " << Name << ").\n";
+ return false;
+ }
uint32_t CfgChecksum;
if (Version != GCOV::V402) {