From b835a4403adf0d808c73be0521d572c82799beee Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 4 Dec 2013 08:23:33 +0000 Subject: [PATCH] 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 --- include/llvm/Support/GCOV.h | 1 - lib/IR/GCOV.cpp | 12 +++-------- .../Instrumentation/GCOVProfiling.cpp | 19 +++--------------- test/tools/llvm-cov/Inputs/test.gcda | Bin 824 -> 824 bytes test/tools/llvm-cov/Inputs/test.gcno | Bin 3112 -> 3112 bytes .../Inputs/test_checksum_mismatch.gcda | Bin 0 -> 825 bytes .../Inputs/test_file_checksum_fail.gcda | Bin 825 -> 0 bytes .../Inputs/test_func_checksum_fail.gcda | Bin 825 -> 0 bytes .../tools/llvm-cov/Inputs/test_read_fail.gcno | Bin 71 -> 72 bytes test/tools/llvm-cov/llvm-cov.test | 4 +--- 10 files changed, 7 insertions(+), 29 deletions(-) create mode 100644 test/tools/llvm-cov/Inputs/test_checksum_mismatch.gcda delete mode 100644 test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda delete mode 100644 test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h index 188c4126f1f..6111d3aebec 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 14eb71f0300..64d53e4251a 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 488f451944b..fb5bee2ede2 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 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 index c0c8329afb6cc5acbf1cbdfffca5dc10efa32dd6..a62c069c9a7b5d2c1536b09812bb7b4357d93ad8 100644 GIT binary patch delta 91 zcmdnNwu5bg1PcQYOq9`q&^}PQ#stFOq5+{FK$mkFd delta 91 zcmV-h0Hpu82Dk>07zA8?lKYVyECfNVlcbSMECg&4^3aidGz9Nq*IbdbCu|i^k1PcQYOq6MW&MFhy)=3wC=M+1H1wZv`%SH0ssI2ZDDC{k#H2VAO-{l1f_i&y^|;l NfCNj@uCJ4<3w*_?wC!WykgqW0jF&@6OJS zH*w7Rt-Y>hH%~9CRZ$e`R2E_)fv%s+yYl|=)02C36pL~9dKI~#zx{B{ws8&}qdrR1 zxdik$kyzJdwd;pQCtZj7poKqxeqGNueLtQ-Pbn#AkL3ZP_SFodHdOrT=Z78$^Dm8a zw(YDHCd`kSBh*v^ek1HM|H5|m-I}faYIHl;b@)`$dnI+wmCge%=Jd|cDuP2yaMiKM;YbE`aQMKCq77Xe5b_452mLw+W-In literal 0 HcmV?d00001 diff --git a/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda b/test/tools/llvm-cov/Inputs/test_file_checksum_fail.gcda deleted file mode 100644 index 8bfd82c7b2482ab1b941cf821793b8ec7b42b4bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmYdHNlw=?GBEKC^YLL|U|?he5+D#$H|aMskdBY?Gjud`axDXkE@Wf^(+mty8myiX zDCW3!@)C%8^U~tfoYdlCkPd`;s5V9pAOoZ~N9fZ9Rv;Z8WoVR}Uz8e;qzjuqkXn%W z?-Q@bfb_>l8K>pvBkX{=3n;}1Qp*CwmFkMF_P(DHs5|AEchwxicH$ezU~l z;>`5C%uJvt#Qh*QLjfZvkO2xKMTRZ!Ks3<(rkQz}C7FpinN_Lr=|!0-ke~wU6$8q{ z+y!zE2%z&}X2axRd>9QAhtV+oK%>C^WCt>~_+|Qo#B&of^MDi(EMznQl1OU7qPX}X zU|EEEbi1L_aPwek1l>(AahQIXxiA{peh?d-53&bM92`F&^On|1?}evFXG4_qh-3~} gJt&U6FRfdTP;Z1w{X&ph7(g-yCWK5cM&@t<0In%V1ONa4 diff --git a/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda b/test/tools/llvm-cov/Inputs/test_func_checksum_fail.gcda deleted file mode 100644 index 4c729a850d8644564bffb25164228d42fd669926..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmYdHNlw=?GBBByedPrM0|O%)kN|<0x=Fv8fpmP7pP{3nlWQ4RbRi=Xm}X#r(qQ$B zKrzR)lb1l$o0k@+=A;%EgLEL&L$xt-02v^?zF|H-tUx+G%Frk`zbG{xNf$PKAhjU# z-zQ#=0qKvAGEU3SN7w;#7f^~3q?QGUE87!YplXv6ix6soQZN8^KS({Vb7wZh{bq^9 z#hK}OnVCRQi2Ffqh5|-TAOjReiVR!cfoP!nO*8W{OEMF4GOJSK(~B}wAVCGxD+ZK@ zxeMeT5J2a{%!bLs_%IqK4x?fEfkuJ-$qr;}@yqlFiRUI}<^d@nSjcDqB$3pDMRD;( zz_JMS=ypS;;pV~82)dhK;xPR%b73^H{UA0vA7l@jI5>Vl<}Iz2-V0BU&W0%I5y>2| gdQcpBUs|^wq236W`h_61Fo0wZObD4?jLhKz0K3CSg#Z8m diff --git a/test/tools/llvm-cov/Inputs/test_read_fail.gcno b/test/tools/llvm-cov/Inputs/test_read_fail.gcno index 88073f15dac6010298d92fee6e4523072588b522..bcc20a65eee483a161ac140ee0aa6e4dec99dc6d 100644 GIT binary patch delta 15 UcmZ?wm>|Kz00a|dw3ryU02OWm9{>OV delta 14 VcmeZppCG{!Q#a}NL>VncE&wEC1cd+q diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test index b08b514a9f2..e2a21e1889e 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 -- 2.34.1