yann@1
|
1 |
Date: 18 May 2005 22:47:59 -0000
|
yann@1
|
2 |
Message-ID: <20050518224759.7352.qmail@sourceware.org>
|
yann@1
|
3 |
From: "hubicka at ucw dot cz" <gcc-bugzilla@gcc.gnu.org>
|
yann@1
|
4 |
To: dank@kegel.com
|
yann@1
|
5 |
References: <20050407215701.20815.dank@kegel.com>
|
yann@1
|
6 |
Reply-To: gcc-bugzilla@gcc.gnu.org
|
yann@1
|
7 |
Subject: [Bug gcov/profile/20815] -fprofile-use barfs with "coverage mismatch for function '...' while reading counter 'arcs'."
|
yann@1
|
8 |
|
yann@1
|
9 |
|
yann@1
|
10 |
------- Additional Comments From hubicka at ucw dot cz 2005-05-18 22:47 -------
|
yann@1
|
11 |
Subject: Re: [Bug gcov/profile/20815] -fprofile-use barfs with "coverage mismatch for function '...' while reading counter 'arcs'."
|
yann@1
|
12 |
|
yann@1
|
13 |
>
|
yann@1
|
14 |
> ------- Additional Comments From hubicka at ucw dot cz 2005-05-18 22:22 -------
|
yann@1
|
15 |
> Subject: Re: [Bug gcov/profile/20815] -fprofile-use barfs with "coverage mismatch for function '...' while reading counter 'arcs'."
|
yann@1
|
16 |
>
|
yann@1
|
17 |
> coverage_checksum_string already knows a bit about ignoring random seed
|
yann@1
|
18 |
> produced mess. It looks like this needs to be extended somehow to
|
yann@1
|
19 |
> handle namespaces too...
|
yann@1
|
20 |
|
yann@1
|
21 |
This seems to solve the missmatch. Would it be possible to test it on
|
yann@1
|
22 |
bigger testcase and if it works distile a testcase that don't use
|
yann@1
|
23 |
file IO so it is more suitable for gcc regtesting?
|
yann@1
|
24 |
|
yann@1
|
25 |
Index: coverage.c
|
yann@1
|
26 |
===================================================================
|
yann@1
|
27 |
RCS file: /cvs/gcc/gcc/gcc/coverage.c,v
|
yann@1
|
28 |
retrieving revision 1.6.2.12.2.12
|
yann@1
|
29 |
diff -c -3 -p -r1.6.2.12.2.12 coverage.c
|
yann@1
|
30 |
*** gcc-old/gcc/coverage.c 18 May 2005 07:37:31 -0000 1.6.2.12.2.12
|
yann@1
|
31 |
--- gcc/gcc/coverage.c 18 May 2005 22:45:36 -0000
|
yann@1
|
32 |
*************** coverage_checksum_string (unsigned chksu
|
yann@1
|
33 |
*** 471,505 ****
|
yann@1
|
34 |
as the checksums are used only for sanity checking. */
|
yann@1
|
35 |
for (i = 0; string[i]; i++)
|
yann@1
|
36 |
{
|
yann@1
|
37 |
if (!strncmp (string + i, "_GLOBAL__", 9))
|
yann@1
|
38 |
! for (i = i + 9; string[i]; i++)
|
yann@1
|
39 |
! if (string[i]=='_')
|
yann@1
|
40 |
! {
|
yann@1
|
41 |
! int y;
|
yann@1
|
42 |
! unsigned seed;
|
yann@1
|
43 |
! int scan;
|
yann@1
|
44 |
!
|
yann@1
|
45 |
! for (y = 1; y < 9; y++)
|
yann@1
|
46 |
! if (!(string[i + y] >= '0' && string[i + y] <= '9')
|
yann@1
|
47 |
! && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
|
yann@1
|
48 |
! break;
|
yann@1
|
49 |
! if (y != 9 || string[i + 9] != '_')
|
yann@1
|
50 |
! continue;
|
yann@1
|
51 |
! for (y = 10; y < 18; y++)
|
yann@1
|
52 |
! if (!(string[i + y] >= '0' && string[i + y] <= '9')
|
yann@1
|
53 |
! && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
|
yann@1
|
54 |
! break;
|
yann@1
|
55 |
! if (y != 18)
|
yann@1
|
56 |
! continue;
|
yann@1
|
57 |
! scan = sscanf (string + i + 10, "%X", &seed);
|
yann@1
|
58 |
! gcc_assert (scan);
|
yann@1
|
59 |
! if (seed != crc32_string (0, flag_random_seed))
|
yann@1
|
60 |
! continue;
|
yann@1
|
61 |
! string = dup = xstrdup (string);
|
yann@1
|
62 |
! for (y = 10; y < 18; y++)
|
yann@1
|
63 |
! dup[i + y] = '0';
|
yann@1
|
64 |
! break;
|
yann@1
|
65 |
! }
|
yann@1
|
66 |
break;
|
yann@1
|
67 |
}
|
yann@1
|
68 |
|
yann@1
|
69 |
--- 471,511 ----
|
yann@1
|
70 |
as the checksums are used only for sanity checking. */
|
yann@1
|
71 |
for (i = 0; string[i]; i++)
|
yann@1
|
72 |
{
|
yann@1
|
73 |
+ int offset = 0;
|
yann@1
|
74 |
+ if (!strncmp (string + i, "_GLOBAL__N_", 11))
|
yann@1
|
75 |
+ offset = 11;
|
yann@1
|
76 |
if (!strncmp (string + i, "_GLOBAL__", 9))
|
yann@1
|
77 |
! offset = 9;
|
yann@1
|
78 |
!
|
yann@1
|
79 |
! /* C++ namespaces do have scheme:
|
yann@1
|
80 |
! _GLOBAL__N_<filename>_<wrongmagicnumber>_<magicnumber>functionname
|
yann@1
|
81 |
! since filename might contain extra underscores there seems
|
yann@1
|
82 |
! to be no better chance then walk all possible offsets looking
|
yann@1
|
83 |
! for magicnuber. */
|
yann@1
|
84 |
! if (offset)
|
yann@1
|
85 |
! for (;string[offset]; offset++)
|
yann@1
|
86 |
! for (i = i + offset; string[i]; i++)
|
yann@1
|
87 |
! if (string[i]=='_')
|
yann@1
|
88 |
! {
|
yann@1
|
89 |
! int y;
|
yann@1
|
90 |
!
|
yann@1
|
91 |
! for (y = 1; y < 9; y++)
|
yann@1
|
92 |
! if (!(string[i + y] >= '0' && string[i + y] <= '9')
|
yann@1
|
93 |
! && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
|
yann@1
|
94 |
! break;
|
yann@1
|
95 |
! if (y != 9 || string[i + 9] != '_')
|
yann@1
|
96 |
! continue;
|
yann@1
|
97 |
! for (y = 10; y < 18; y++)
|
yann@1
|
98 |
! if (!(string[i + y] >= '0' && string[i + y] <= '9')
|
yann@1
|
99 |
! && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
|
yann@1
|
100 |
! break;
|
yann@1
|
101 |
! if (y != 18)
|
yann@1
|
102 |
! continue;
|
yann@1
|
103 |
! if (!dup)
|
yann@1
|
104 |
! string = dup = xstrdup (string);
|
yann@1
|
105 |
! for (y = 10; y < 18; y++)
|
yann@1
|
106 |
! dup[i + y] = '0';
|
yann@1
|
107 |
! }
|
yann@1
|
108 |
break;
|
yann@1
|
109 |
}
|
yann@1
|
110 |
|
yann@1
|
111 |
|
yann@1
|
112 |
|
yann@1
|
113 |
--
|
yann@1
|
114 |
|
yann@1
|
115 |
|
yann@1
|
116 |
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20815
|
yann@1
|
117 |
|
yann@1
|
118 |
------- You are receiving this mail because: -------
|
yann@1
|
119 |
You reported the bug, or are watching the reporter.
|
yann@1
|
120 |
|
yann@1
|
121 |
|