diff options
author | Martin Liska <mliska@suse.cz> | 2020-09-21 16:26:10 +0200 |
---|---|---|
committer | Martin Liska <mliska@suse.cz> | 2020-09-23 10:04:46 +0200 |
commit | 6b4e8bf88f1172ce8561f57b12fb81063b21a78f (patch) | |
tree | 8839297e05deb0903851942329bc9cbb3e76cb02 | |
parent | ca52f937fff52c494ef2951490c1654750ef8157 (diff) | |
download | gcc-6b4e8bf88f1172ce8561f57b12fb81063b21a78f.tar.gz |
gcov: fix streaming corruption
gcc/ChangeLog:
PR gcov-profile/97069
* profile.c (branch_prob): Line number must be at least 1.
gcc/testsuite/ChangeLog:
PR gcov-profile/97069
* g++.dg/gcov/pr97069.C: New test.
-rw-r--r-- | gcc/profile.c | 6 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/gcov/pr97069.C | 20 |
2 files changed, 23 insertions, 3 deletions
diff --git a/gcc/profile.c b/gcc/profile.c index fe8963cc9e9..45409591629 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -1375,7 +1375,7 @@ branch_prob (bool thunk) seen_locations.add (loc); expanded_location curr_location = expand_location (loc); output_location (&streamed_locations, curr_location.file, - curr_location.line, &offset, bb); + MAX (1, curr_location.line), &offset, bb); } for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) @@ -1386,7 +1386,7 @@ branch_prob (bool thunk) { seen_locations.add (loc); output_location (&streamed_locations, gimple_filename (stmt), - gimple_lineno (stmt), &offset, bb); + MAX (1, gimple_lineno (stmt)), &offset, bb); } } @@ -1401,7 +1401,7 @@ branch_prob (bool thunk) { expanded_location curr_location = expand_location (loc); output_location (&streamed_locations, curr_location.file, - curr_location.line, &offset, bb); + MAX (1, curr_location.line), &offset, bb); } if (offset) diff --git a/gcc/testsuite/g++.dg/gcov/pr97069.C b/gcc/testsuite/g++.dg/gcov/pr97069.C new file mode 100644 index 00000000000..040e336662a --- /dev/null +++ b/gcc/testsuite/g++.dg/gcov/pr97069.C @@ -0,0 +1,20 @@ +// PR gcov-profile/97069 +// { dg-options "--coverage" } +// { dg-do run { target native } } + +# 0 "pr97069.C" +# 0 "<built-in>" +# 0 "<command-line>" +# 1 "/usr/include/stdc-predef.h" 1 3 4 +# 0 "<command-line>" 2 +# 1 "pr97069.C" +int main() +{ + return 0; +} +# 0 "pr97069.C" +void zero_line_directive() +{ +} + +// { dg-final { run-gcov pr97069.C } } |