diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-inline-transform.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/pr71633.C | 28 |
4 files changed, 44 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f05d2b1..03dac33 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-07-13 Ilya Enkovich <ilya.enkovich@intel.com> + + PR ipa/71633 + * ipa-inline-transform.c (inline_call): Support + instrumented thunks. + 2016-07-13 Thomas Preud'homme <thomas.preudhomme@arm.com> * config/arm/arm.h (TARGET_HAVE_CBZ): Define. diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c index 9ac1efc..98c7f96 100644 --- a/gcc/ipa-inline-transform.c +++ b/gcc/ipa-inline-transform.c @@ -319,10 +319,14 @@ inline_call (struct cgraph_edge *e, bool update_original, to = to->global.inlined_to; if (to->thunk.thunk_p) { + struct cgraph_node *target = to->callees->callee; if (in_lto_p) to->get_untransformed_body (); to->expand_thunk (false, true); - e = to->callees; + /* When thunk is instrumented we may have multiple callees. */ + for (e = to->callees; e && e->callee != target; e = e->next_callee) + ; + gcc_assert (e); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 239d55e..c21469b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-07-13 Ilya Enkovich <ilya.enkovich@intel.com> + + PR ipa/71633 + * g++.dg/pr71633.C: New test. + 2016-07-13 Thomas Preud'homme <thomas.preudhomme@arm.com> * lib/target-supports.exp (check_effective_target_arm_thumb1_cbz_ok): diff --git a/gcc/testsuite/g++.dg/pr71633.C b/gcc/testsuite/g++.dg/pr71633.C new file mode 100644 index 0000000..bb69bbb --- /dev/null +++ b/gcc/testsuite/g++.dg/pr71633.C @@ -0,0 +1,28 @@ +/* PR71633 */ +// { dg-do compile { target i?86-*-* x86_64-*-* } } +/* { dg-options "-fcheck-pointer-bounds -mmpx -O2" } */ + +class c1 +{ + virtual void fn1 (); +}; + +class c2 +{ + virtual int *fn2 () const; +}; + +class c3 : c1, c2 +{ + int *fn2 () const; + int *fn3 (int) const; +}; + +int *c3::fn2 () const +{ +} + +int *c3::fn3 (int p) const +{ + return fn3 (p); +} |