From: Markus Trippelsdorf Date: Wed, 29 Jan 2014 18:36:42 +0000 (+0000) Subject: backport: re PR gcov-profile/55650 (Firefox profiledbuild: libxul.so: cannot map... X-Git-Tag: releases/gcc-4.7.4~279 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64a7e4703b7ac2836d476b32b524049b69996220;p=thirdparty%2Fgcc.git backport: re PR gcov-profile/55650 (Firefox profiledbuild: libxul.so: cannot map zero-fill pages: Cannot allocate memory) 2014-01-29 Markus Trippelsdorf Backport from mainline 2012-12-13 Jakub Jelinek 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 c8e08cf9a40b..4cfc1b1d0c80 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-01-29 Markus Trippelsdorf + + Backport from mainline + 2012-12-13 Jakub Jelinek + + PR gcov-profile/55650 + * coverage.c (coverage_obj_init): Return false if no functions + are being emitted. + 2014-01-25 Walter Lee Backport from mainline diff --git a/gcc/coverage.c b/gcc/coverage.c index c64125ad58b0..8a113a50c2e2 100644 --- 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 a0320c6401b8..152554dcfcda 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2014-01-29 Markus Trippelsdorf + + Backport from mainline + 2012-12-13 Jakub Jelinek + + PR gcov-profile/55650 + * g++.dg/other/pr55650.C: New test. + * g++.dg/other/pr55650.cc: New file. + 2014-01-26 Mikael Morin 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 index 000000000000..fc52b19f5d30 --- /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 index 000000000000..70b41462b57e --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr55650.cc @@ -0,0 +1,4 @@ +int +main () +{ +}