diff options
| author | Martin Jambor <mjambor@suse.cz> | 2018-05-11 17:55:15 +0200 |
|---|---|---|
| committer | Martin Jambor <jamborm@gcc.gnu.org> | 2018-05-11 17:55:15 +0200 |
| commit | 063c5529592955ddb1eee4535e3527215f68bc67 (patch) | |
| tree | be0a0f5b8c22e5a0816f37fb8fd7b57ffd2af3e1 | |
| parent | b901c875c96ede54470887bc40d21ba128257951 (diff) | |
| download | gcc-063c5529592955ddb1eee4535e3527215f68bc67.zip gcc-063c5529592955ddb1eee4535e3527215f68bc67.tar.gz gcc-063c5529592955ddb1eee4535e3527215f68bc67.tar.bz2 | |
Check is_single_const in intersect_with_plats
2018-05-11 Martin Jambor <mjambor@suse.cz>
PR ipa/85655
* ipa-cp.c (intersect_with_plats): Check that the lattice contains
single const.
testsuite/
* g++.dg/lto/pr85655_0.C: New test.
From-SVN: r260165
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-cp.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lto/pr85655_0.C | 42 |
4 files changed, 56 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae61506..e1a1d75 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-05-11 Martin Jambor <mjambor@suse.cz> + + PR ipa/85655 + * ipa-cp.c (intersect_with_plats): Check that the lattice contains + single const. + 2018-05-11 Richard Earnshaw <rearnsha@arm.com> PR target/85733 diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index 4f28a55..e868b9c 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -4127,7 +4127,9 @@ intersect_with_plats (struct ipcp_param_lattices *plats, if (aglat->offset - offset == item->offset) { gcc_checking_assert (item->value); - if (values_equal_for_ipcp_p (item->value, aglat->values->value)) + if (aglat->is_single_const () + && values_equal_for_ipcp_p (item->value, + aglat->values->value)) found = true; break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bc36719..90bda6e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-05-11 Martin Jambor <mjambor@suse.cz> + + PR ipa/85655 + * g++.dg/lto/pr85655_0.C: New test. + 2018-05-11 Sebastian Peryt <sebastian.peryt@intel.com> * gcc.target/i386/tpause-1.c: New test. diff --git a/gcc/testsuite/g++.dg/lto/pr85655_0.C b/gcc/testsuite/g++.dg/lto/pr85655_0.C new file mode 100644 index 0000000..d3bbd8f --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr85655_0.C @@ -0,0 +1,42 @@ +// { dg-lto-do link } +// { dg-require-effective-target shared } +// { dg-require-effective-target fpic } +// { dg-lto-options {{-O2 -fPIC -shared -flto}} } + +int a; +void b(...); +void c(int); +enum { d, e, f, g, h, i, j, k }; +class l { +public: + int ac; + bool m; + l(char *); + int n(); +}; +struct o { + int ad; + o(int p = 0) : ad(p) {} +}; +class C : public l { +public: + char q; + C(o) : l(&q) { m |= ac & a ?: 9; } +}; +class r : C { +public: + char s; + r(o p, char) : C(p) { + if (n()) { + b(a, s, ""); + c(5); + } + } +}; +class t : C { +public: + t(int) : C(d) {} +}; +r ag('b', 0), ah(o(), 0), ai(e, 0), aj(f, 0), ak(g, 0), al(h, 0), am(k, 0), + an(i, 0), ao(j, 0); +t ap(0); |