diff options
author | Richard Biener <rguenther@suse.de> | 2024-04-11 08:47:19 +0200 |
---|---|---|
committer | Richard Biener <rguenther@suse.de> | 2024-04-11 11:03:56 +0200 |
commit | 52b63100b1eda433120e726d4e8f8dfca6fc94fa (patch) | |
tree | 15b0c65c1916bebe3908e6462a6f9e9e0559d902 | |
parent | cb46aca0a07355abf2f0b04f52087bca8f848524 (diff) | |
download | gcc-52b63100b1eda433120e726d4e8f8dfca6fc94fa.zip gcc-52b63100b1eda433120e726d4e8f8dfca6fc94fa.tar.gz gcc-52b63100b1eda433120e726d4e8f8dfca6fc94fa.tar.bz2 |
middle-end/114681 - condition coverage and inlining
When inlining a gcond it can map to multiple stmts, esp. with
non-call EH. The following makes sure to pick up the remapped
condition when dealing with condition coverage.
PR middle-end/114681
* tree-inline.cc (copy_bb): Key on the remapped stmt
to identify gconds to have condition coverage data remapped.
* gcc.misc-tests/gcov-pr114681.c: New testcase.
-rw-r--r-- | gcc/testsuite/gcc.misc-tests/gcov-pr114681.c | 18 | ||||
-rw-r--r-- | gcc/tree-inline.cc | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-pr114681.c b/gcc/testsuite/gcc.misc-tests/gcov-pr114681.c new file mode 100644 index 0000000..a8dc666 --- /dev/null +++ b/gcc/testsuite/gcc.misc-tests/gcov-pr114681.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fnon-call-exceptions -fno-exceptions -fcondition-coverage" } */ + +float f, g; + +static void +bar () +{ + if (g < f) + for (;;) + ; +} + +void +foo () +{ + bar (); +} diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc index 5f85288..238afb7 100644 --- a/gcc/tree-inline.cc +++ b/gcc/tree-inline.cc @@ -2090,7 +2090,7 @@ copy_bb (copy_body_data *id, basic_block bb, /* If -fcondition-coverage is used, register the inlined conditions in the cond->expression mapping of the caller. The expression tag is shifted conditions from the two bodies are not mixed. */ - if (id->src_cfun->cond_uids && is_a <gcond*> (orig_stmt)) + if (id->src_cfun->cond_uids && is_a <gcond*> (stmt)) { gcond *orig_cond = as_a <gcond*> (orig_stmt); gcond *cond = as_a <gcond*> (stmt); |