diff options
author | Daniel Jasper <djasper@google.com> | 2013-12-04 08:57:17 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2013-12-04 08:57:17 +0000 |
commit | bfbf8d3ad8990f89353c930e3223e010eed43833 (patch) | |
tree | 58c7393973bab26158646e1bb383b1a682deb7dd /lib/Transforms | |
parent | b835a4403adf0d808c73be0521d572c82799beee (diff) | |
download | llvm-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/Transforms')
-rw-r--r-- | lib/Transforms/Instrumentation/GCOVProfiling.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp index fb5bee2ede..e7ef80199b 100644 --- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -314,12 +314,18 @@ namespace { this->os = os; Function *F = SP.getFunction(); - DEBUG(dbgs() << "Function: " << F->getName() << "\n"); + DEBUG(dbgs() << "Function: " << getFunctionName(SP) << "\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() { @@ -347,6 +353,10 @@ namespace { return EdgeDestinations; } + uint32_t getFuncChecksum() { + return FuncChecksum; + } + void setCfgChecksum(uint32_t Checksum) { CfgChecksum = Checksum; } @@ -359,7 +369,7 @@ namespace { ++BlockLen; write(BlockLen); write(Ident); - write(0); // lineno checksum + write(FuncChecksum); if (UseCfgChecksum) write(CfgChecksum); writeGCOVString(getFunctionName(SP)); @@ -401,6 +411,7 @@ namespace { private: DISubprogram SP; uint32_t Ident; + uint32_t FuncChecksum; bool UseCfgChecksum; uint32_t CfgChecksum; DenseMap<BasicBlock *, GCOVBlock *> Blocks; @@ -731,6 +742,7 @@ 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 }; @@ -813,11 +825,13 @@ Function *GCOVProfiler::insertCounterWriteout( Builder.getInt32(CfgChecksum)); for (unsigned j = 0, e = CountersBySP.size(); j != e; ++j) { DISubprogram SP(CountersBySP[j].second); - Builder.CreateCall4( + uint32_t FuncChecksum = Funcs.size() ? Funcs[j]->getFuncChecksum() : 0; + Builder.CreateCall5( EmitFunction, Builder.getInt32(j), Options.FunctionNamesInData ? Builder.CreateGlobalStringPtr(getFunctionName(SP)) : Constant::getNullValue(Builder.getInt8PtrTy()), + Builder.getInt32(FuncChecksum), Builder.getInt8(Options.UseCfgChecksum), Builder.getInt32(CfgChecksum)); |