re PR gcov-profile/64634 (gcov reports catch(...) as not executed)

	PR gcov-profile/64634
	* tree-eh.c (frob_into_branch_around): Fix up typos
	in function comment.
	(lower_catch): Put eh_seq resulting from EH lowering of
	the cleanup sequence after the cleanup rather than before
	it.

	* g++.dg/gcov/gcov-15.C: New test.

From-SVN: r220801

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4919a5f2ddb32ad656cef304f2e9ccc8d063eb57..07cadb36aede3a775022c2551bef8472c5a11a9a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-18  Jakub Jelinek  <jakub@redhat.com>
+
+       PR gcov-profile/64634
+       * tree-eh.c (frob_into_branch_around): Fix up typos
+       in function comment.
+       (lower_catch): Put eh_seq resulting from EH lowering of
+       the cleanup sequence after the cleanup rather than before
+       it.
+
 2015-02-18  Tom de Vries  <tom@codesourcery.com>
 
        * common.opt (fstdarg-opt): New option.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ff3697e8e02b713b88ec7e1eb257cee70f78f682..1ca711d93b71662f9e54f0cea1b4ce09aa7fc960 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-18  Jakub Jelinek  <jakub@redhat.com>
+
+       PR gcov-profile/64634
+       * g++.dg/gcov/gcov-15.C: New test.
+
 2015-02-18  Tom de Vries  <tom@codesourcery.com>
 
        * gfortran.dg/coarray_35a.f90: Add missing cleanup-modules.

diff --git a/gcc/testsuite/g++.dg/gcov/gcov-15.C b/gcc/testsuite/g++.dg/gcov/gcov-15.C
new file mode 100644 (file)
index 0000000..fcd16b0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gcov/gcov-15.C
@@ -0,0 +1,26 @@
+// PR gcov-profile/64634
+// { dg-options "-fprofile-arcs -ftest-coverage" }
+// { dg-do run { target native } }
+
+void catchEx ()                // count(1)
+{
+  __builtin_exit (0);  // count(1)
+  try
+  {}
+  catch (int)
+  {}
+}
+
+int main ()            // count(1)
+{
+  try
+  {
+    throw 5;           // count(1)
+  }
+  catch (...)          // count(1)
+  {
+    catchEx ();                // count(1)
+  }
+}
+
+// { dg-final { run-gcov gcov-15.C } }

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 3c45f37efbff2d3dd19f1d37bc987024380618a7..a111e9d93ae654a153ede69ac58d3a11838ef753 100644 (file)
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -884,10 +884,10 @@ eh_region_may_contain_throw (eh_region r)
 /* We want to transform
        try { body; } catch { stuff; }
    to
-       normal_seqence:
+       normal_sequence:
          body;
          over:
-       eh_seqence:
+       eh_sequence:
          landing_pad:
          stuff;
          goto over;
@@ -1813,6 +1813,12 @@ lower_catch (struct leh_state *state, gtry *tp)
   this_state.cur_region = state->cur_region;
   this_state.ehp_region = try_region;
 
+  /* Add eh_seq from lowering EH in the cleanup sequence after the cleanup
+     itself, so that e.g. for coverage purposes the nested cleanups don't
+     appear before the cleanup body.  See PR64634 for details.  */
+  gimple_seq old_eh_seq = eh_seq;
+  eh_seq = NULL;
+
   out_label = NULL;
   cleanup = gimple_try_cleanup (tp);
   for (gsi = gsi_start (cleanup);
@@ -1849,7 +1855,11 @@ lower_catch (struct leh_state *state, gtry *tp)
 
   gimple_try_set_cleanup (tp, new_seq);
 
-  return frob_into_branch_around (tp, try_region, out_label);
+  gimple_seq new_eh_seq = eh_seq;
+  eh_seq = old_eh_seq;
+  gimple_seq ret_seq = frob_into_branch_around (tp, try_region, out_label);
+  gimple_seq_add_seq (&eh_seq, new_eh_seq);
+  return ret_seq;
 }
 
 /* A subroutine of lower_eh_constructs_1.  Lower a GIMPLE_TRY with a