maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-cov: Warn instead of error if a .gcda has arcs from an exit block 

Patch by Vanderson M. Rosario. Thanks!

llvm-svn: 232443
This commit is contained in:
Justin Bogner 2015-03-17 00:18:51 +00:00
parent 79f8d11d5a
commit d0a6243529
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/IR/GCOV.cpp
View File

@ -302,10 +302,12 @@ bool GCOVFunction::readGCDA(GCOVBuffer &Buff, GCOV::GCOVVersion Version) {
// required to combine the edge counts that are contained in the GCDA file.
for (uint32_t BlockNo = 0; Count > 0; ++BlockNo) {
// The last block is always reserved for exit block
if (BlockNo >= Blocks.size() - 1) {
if (BlockNo >= Blocks.size()) {
errs() << "Unexpected number of edges (in " << Name << ").\n";
return false;
}
if (BlockNo == Blocks.size() - 1)
errs() << "(" << Name << ") has arcs from exit block.\n";
GCOVBlock &Block = *Blocks[BlockNo];
for (size_t EdgeNo = 0, End = Block.getNumDstEdges(); EdgeNo < End;
++EdgeNo) {

BIN
llvm/test/tools/llvm-cov/Inputs/test_exit_block_arcs.gcda Normal file
View File

Binary file not shown.

BIN
llvm/test/tools/llvm-cov/Inputs/test_exit_block_arcs.gcno Normal file
View File

Binary file not shown.

4
llvm/test/tools/llvm-cov/llvm-cov.test
View File

@ -111,4 +111,8 @@ RUN: llvm-cov test.c -gcda=test_file_checksum_fail.gcda
# Bad function checksum on gcda
RUN: llvm-cov test.c -gcda=test_func_checksum_fail.gcda
# Has arcs from exit blocks
RUN: llvm-cov test_exit_block_arcs.c 2>&1 | FileCheck %s -check-prefix=EXIT_BLOCK_ARCS
EXIT_BLOCK_ARCS: (main) has arcs from exit block.
XFAIL: powerpc64-, s390x, mips-, mips64-, sparc