backport: re PR gcov-profile/55650 (Firefox profiledbuild: libxul.so: cannot map...

2014-01-29  Markus Trippelsdorf  <markus@trippelsdorf.de>

        Backport from mainline
        2012-12-13  Jakub Jelinek  <jakub@redhat.com>

        PR gcov-profile/55650
        * coverage.c (coverage_obj_init): Return false if no functions
        are being emitted.

        * g++.dg/other/pr55650.C: New test.
        * g++.dg/other/pr55650.cc: New file

From-SVN: r207277

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8e08cf9a40b4f6302677fa7be04acb43e0e531a..4cfc1b1d0c8053cee4bb52039a218a7a7ab714f4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-29  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+       Backport from mainline
+       2012-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+       PR gcov-profile/55650
+       * coverage.c (coverage_obj_init): Return false if no functions
+       are being emitted.
+
 2014-01-25  Walter Lee  <walt@tilera.com>
 
        Backport from mainline

diff --git a/gcc/coverage.c b/gcc/coverage.c
index c64125ad58b0200b3d28c8231c32fc0633a466ef..8a113a50c2e2a55c5ec85bf26157abbf6664cd44 100644 (file)
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -988,6 +988,9 @@ coverage_obj_init (void)
       /* The function is not being emitted, remove from list.  */
       *fn_prev = fn->next;
 
+  if (functions_head == NULL)
+    return false;
+
   for (ix = 0; ix != GCOV_COUNTERS; ix++)
     if ((1u << ix) & prg_ctr_mask)
       n_counters++;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0320c6401b8fe3bc64734335c53abdc03646fa0..152554dcfcdac245abe72355511ec3ceeeccd234 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-29  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+       Backport from mainline
+       2012-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+       PR gcov-profile/55650
+       * g++.dg/other/pr55650.C: New test.
+       * g++.dg/other/pr55650.cc: New file.
+
 2014-01-26  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/58007

diff --git a/gcc/testsuite/g++.dg/other/pr55650.C b/gcc/testsuite/g++.dg/other/pr55650.C
new file mode 100644 (file)
index 0000000..fc52b19
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr55650.C
@@ -0,0 +1,21 @@
+// PR gcov-profile/55650
+// { dg-do link }
+// { dg-options "-O2 -fprofile-generate" }
+// { dg-additional-sources "pr55650.cc" }
+
+struct A
+{
+  virtual void foo ();
+};
+
+struct B : public A
+{
+  B ();
+  void foo () {}
+};
+
+inline A *
+bar ()
+{
+  return new B;
+}

diff --git a/gcc/testsuite/g++.dg/other/pr55650.cc b/gcc/testsuite/g++.dg/other/pr55650.cc
new file mode 100644 (file)
index 0000000..70b4146
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr55650.cc
@@ -0,0 +1,4 @@
+int
+main ()
+{
+}