diff options
author | Daniel Jasper <djasper@google.com> | 2013-12-04 08:23:33 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2013-12-04 08:23:33 +0000 |
commit | b835a4403adf0d808c73be0521d572c82799beee (patch) | |
tree | c9c0e2d383d8d28c5bb2eec068688de53b322ce8 /lib | |
parent | dd302615b1c823036394060d3f45fb9ec2043e50 (diff) | |
download | llvm-b835a4403adf0d808c73be0521d572c82799beee.tar.gz llvm-b835a4403adf0d808c73be0521d572c82799beee.tar.bz2 llvm-b835a4403adf0d808c73be0521d572c82799beee.tar.xz |
Revert r196358: "llvm-cov: Added support for function checksums."
This currently breaks clang/test/CodeGen/code-coverage.c. The root cause
is that the newly introduced access to Funcs[j] is out of bounds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196365 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/IR/GCOV.cpp | 12 | ||||
-rw-r--r-- | lib/Transforms/Instrumentation/GCOVProfiling.cpp | 19 |
2 files changed, 6 insertions, 25 deletions
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)); |