* gcov.c (accumulate_line_counts): Fix span tree merge bug.

From-SVN: r65245
This commit is contained in:
Nathan Sidwell 2003-04-04 15:48:19 +00:00 committed by Nathan Sidwell
parent 941747b558
commit 1a48288100
2 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,7 @@
2003-04-04 Nathan Sidwell <nathan@codesourcery.com>
* gcov.c (accumulate_line_counts): Fix span tree merge bug.
Fri Apr 4 15:58:52 2003 J"orn Rennecke <joern.rennecke@superh.com>
* sh.h (ACTUAL_NORMAL_MODE): New macro, broken out of

View File

@ -1699,21 +1699,24 @@ accumulate_line_counts (src)
{
block_t *root = block->u.span.root;
block_t *dst_root = dst->u.span.root;
/* Join spanning trees */
if (root->u.span.siblings && !dst_root->u.span.root)
if (root->u.span.siblings
&& !dst_root->u.span.siblings)
{
root = dst->u.span.root;
dst_root = block->u.span.root;
}
dst->u.span.root = root;
root->u.span.siblings += 1 + dst->u.span.siblings;
if (dst->u.span.siblings)
dst_root->u.span.root = root;
root->u.span.siblings
+= 1 + dst_root->u.span.siblings;
if (dst_root->u.span.siblings)
{
block_t *dst_sib;
dst->u.span.siblings = 0;
dst_root->u.span.siblings = 0;
for (dst_sib = line->u.blocks; dst_sib;
dst_sib = dst_sib->chain)
if (dst_sib->u.span.root == dst_root)