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

	Backported from mainline
	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.

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

From-SVN: r224084

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a5def97e439304194ae15540f70a18d040adfb3..6021c3d0f02ff21d4ec4e04ef05a349ff1b6b111 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2015-06-03  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       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-06-03  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 057b418cf2398bbdb3261006b2ee07225a3709cf..688cac6249d30d02384d9619853dc9b69b6b5d53 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-03  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2015-02-18  Jakub Jelinek  <jakub@redhat.com>
+
+       PR gcov-profile/64634
+       * g++.dg/gcov/gcov-15.C: New test.
+
 2015-06-03  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

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 14ed52a007a3d4cb02bf7a2434a9698703c70536..d4392ab87c8309fded411a32b0abd9d219a2267b 100644 (file)
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -859,10 +859,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;
@@ -1783,6 +1783,12 @@ lower_catch (struct leh_state *state, gimple 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);
@@ -1819,7 +1825,11 @@ lower_catch (struct leh_state *state, gimple 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