From: Jakub Jelinek Date: Tue, 30 May 2017 07:51:12 +0000 (+0200) Subject: backport: re PR ipa/77905 (ICE at -Os and above in both 32-bit and 64-bit modes on... X-Git-Tag: releases/gcc-5.5.0~278 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701d112e2eb4aedafbc7084664b7d017f06cd3f0;p=thirdparty%2Fgcc.git backport: re PR ipa/77905 (ICE at -Os and above in both 32-bit and 64-bit modes on x86_64-linux-gnu (internal compiler error: in ipa_comdats, at ipa-comdats.c:352)) Backported from mainline 2016-12-13 Jakub Jelinek PR ipa/77905 * ipa-pure-const.c (cdtor_p): Return true for DECL_STATIC_{CON,DE}STRUCTOR even when it is DECL_LOOPING_CONST_OR_PURE_P. * g++.dg/ipa/pr77905.C: New test. From-SVN: r248634 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1a43a0e96d22..29623a10457a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,13 @@ 2017-05-30 Jakub Jelinek Backported from mainline + 2016-12-13 Jakub Jelinek + + PR ipa/77905 + * ipa-pure-const.c (cdtor_p): Return true for + DECL_STATIC_{CON,DE}STRUCTOR even when it is + DECL_LOOPING_CONST_OR_PURE_P. + 2016-12-14 Wilco Dijkstra Jakub Jelinek diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c index f86d6fbbc407..a8af21ecae35 100644 --- a/gcc/ipa-pure-const.c +++ b/gcc/ipa-pure-const.c @@ -1190,7 +1190,8 @@ static bool cdtor_p (cgraph_node *n, void *) { if (DECL_STATIC_CONSTRUCTOR (n->decl) || DECL_STATIC_DESTRUCTOR (n->decl)) - return !TREE_READONLY (n->decl) && !DECL_PURE_P (n->decl); + return ((!TREE_READONLY (n->decl) && !DECL_PURE_P (n->decl)) + || DECL_LOOPING_CONST_OR_PURE_P (n->decl)); return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4734c07d052a..4969e956b5f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2017-05-30 Jakub Jelinek Backported from mainline + 2016-12-13 Jakub Jelinek + + PR ipa/77905 + * g++.dg/ipa/pr77905.C: New test. + 2016-12-14 Jakub Jelinek PR target/78796 diff --git a/gcc/testsuite/g++.dg/ipa/pr77905.C b/gcc/testsuite/g++.dg/ipa/pr77905.C new file mode 100644 index 000000000000..0f73d50addc2 --- /dev/null +++ b/gcc/testsuite/g++.dg/ipa/pr77905.C @@ -0,0 +1,21 @@ +// PR ipa/77905 +// { dg-do compile } +// { dg-options "-O2" } + +struct A { + A(int); +}; +struct B : A { + B(); +} A; +struct C : virtual A { + C(int); +}; +A::A(int x) { + if (x) + A(0); +} + +B::B() : A(1) {} + +C::C(int) : A(1) {}