diff options
| -rw-r--r-- | include/llvm/Support/GCOV.h | 1 | ||||
| -rw-r--r-- | lib/IR/GCOV.cpp | 12 | ||||
| -rw-r--r-- | lib/Transforms/Instrumentation/GCOVProfiling.cpp | 19 | ||||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test.gcda | bin | 824 -> 824 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test.gcno | bin | 3112 -> 3112 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda | bin | 0 -> 825 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda | bin | 825 -> 0 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda | bin | 825 -> 0 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/Inputs/test_read_fail.gcno | bin | 71 -> 72 bytes | |||
| -rw-r--r-- | test/tools/llvm-cov/llvm-cov.test | 4 |
10 files changed, 7 insertions, 29 deletions
diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h index 188c4126f1..6111d3aebe 100644 --- a/include/llvm/Support/GCOV.h +++ b/include/llvm/Support/GCOV.h @@ -250,7 +250,6 @@ public: private: GCOVFile &Parent; uint32_t Ident; - uint32_t Checksum; uint32_t LineNumber; StringRef Name; StringRef Filename; diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index 14eb71f030..64d53e4251 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(Checksum)) return false; + if (!Buff.readInt(Dummy)) return false; // Checksum #1 if (Version != GCOV::V402) { uint32_t CfgChecksum; if (!Buff.readInt(CfgChecksum)) return false; @@ -212,7 +212,6 @@ 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) { @@ -221,13 +220,8 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) { return false; } - 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; - } + if (!Buff.readInt(Dummy)) return false; // Checksum #1 + uint32_t CfgChecksum; if (Version != GCOV::V402) { diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp index 488f451944..fb5bee2ede 100644 --- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -314,18 +314,12 @@ namespace { this->os = os; Function *F = SP.getFunction(); - DEBUG(dbgs() << "Function: " << getFunctionName(SP) << "\n"); + DEBUG(dbgs() << "Function: " << F->getName() << "\n"); uint32_t i = 0; for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { Blocks[BB] = new GCOVBlock(i++, os); } ReturnBlock = new GCOVBlock(i++, os); - - std::string FunctionNameAndLine; - raw_string_ostream FNLOS(FunctionNameAndLine); - FNLOS << getFunctionName(SP) << SP.getLineNumber(); - FNLOS.flush(); - FuncChecksum = hash_value(FunctionNameAndLine); } ~GCOVFunction() { @@ -353,10 +347,6 @@ namespace { return EdgeDestinations; } - uint32_t getFuncChecksum() { - return FuncChecksum; - } - void setCfgChecksum(uint32_t Checksum) { CfgChecksum = Checksum; } @@ -369,7 +359,7 @@ namespace { ++BlockLen; write(BlockLen); write(Ident); - write(FuncChecksum); + write(0); // lineno checksum if (UseCfgChecksum) write(CfgChecksum); writeGCOVString(getFunctionName(SP)); @@ -411,7 +401,6 @@ namespace { private: DISubprogram SP; uint32_t Ident; - uint32_t FuncChecksum; bool UseCfgChecksum; uint32_t CfgChecksum; DenseMap<BasicBlock *, GCOVBlock *> Blocks; @@ -742,7 +731,6 @@ Constant *GCOVProfiler::getEmitFunctionFunc() { Type *Args[] = { Type::getInt32Ty(*Ctx), // uint32_t ident Type::getInt8PtrTy(*Ctx), // const char *function_name - Type::getInt32Ty(*Ctx), // uint32_t func_checksum Type::getInt8Ty(*Ctx), // uint8_t use_extra_checksum Type::getInt32Ty(*Ctx), // uint32_t cfg_checksum }; @@ -825,12 +813,11 @@ Function *GCOVProfiler::insertCounterWriteout( Builder.getInt32(CfgChecksum)); for (unsigned j = 0, e = CountersBySP.size(); j != e; ++j) { DISubprogram SP(CountersBySP[j].second); - Builder.CreateCall5( + Builder.CreateCall4( EmitFunction, Builder.getInt32(j), Options.FunctionNamesInData ? Builder.CreateGlobalStringPtr(getFunctionName(SP)) : Constant::getNullValue(Builder.getInt8PtrTy()), - Builder.getInt32(Funcs[j]->getFuncChecksum()), Builder.getInt8(Options.UseCfgChecksum), Builder.getInt32(CfgChecksum)); diff --git a/test/tools/llvm-cov/Inputs/test.gcda b/test/tools/llvm-cov/Inputs/test.gcda Binary files differindex c0c8329afb..a62c069c9a 100644 --- a/test/tools/llvm-cov/Inputs/test.gcda +++ b/test/tools/llvm-cov/Inputs/test.gcda diff --git a/test/tools/llvm-cov/Inputs/test.gcno b/test/tools/llvm-cov/Inputs/test.gcno Binary files differindex 97b67bb692..218398548e 100644 --- a/test/tools/llvm-cov/Inputs/test.gcno +++ b/test/tools/llvm-cov/Inputs/test.gcno diff --git a/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda b/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda Binary files differnew file mode 100644 index 0000000000..2fcf33dd21 --- /dev/null +++ b/test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda diff --git a/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda b/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda Binary files differdeleted file mode 100644 index 8bfd82c7b2..0000000000 --- a/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda +++ /dev/null diff --git a/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda b/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda Binary files differdeleted file mode 100644 index 4c729a850d..0000000000 --- a/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda +++ /dev/null diff --git a/test/tools/llvm-cov/Inputs/test_read_fail.gcno b/test/tools/llvm-cov/Inputs/test_read_fail.gcno Binary files differindex 88073f15da..bcc20a65ee 100644 --- a/test/tools/llvm-cov/Inputs/test_read_fail.gcno +++ b/test/tools/llvm-cov/Inputs/test_read_fail.gcno diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test index b08b514a9f..e2a21e1889 100644 --- a/test/tools/llvm-cov/llvm-cov.test +++ b/test/tools/llvm-cov/llvm-cov.test @@ -11,8 +11,6 @@ RUN: rm test.cpp.llcov RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda -RUN: not llvm-cov -gcno=test.gcno -gcda=test_file_checksum_fail.gcda - -RUN: not llvm-cov -gcno=test.gcno -gcda=test_func_checksum_fail.gcda +RUN: not llvm-cov -gcno=test.gcno -gcda=test_checksum_mismatch.gcda XFAIL: powerpc64, s390x, mips |