diff options
| author | Martin Liska <mliska@suse.cz> | 2018-01-03 15:15:58 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2018-01-03 14:15:58 +0000 |
| commit | ca04a532f3fcf91939ec03da628aa94207eaa067 (patch) | |
| tree | e2d804c92403923aeb2c6b4ae3ed06f36eb2797c /gcc | |
| parent | e164534f16c838373ab888e0b36ab5e103d32e25 (diff) | |
| download | gcc-ca04a532f3fcf91939ec03da628aa94207eaa067.zip gcc-ca04a532f3fcf91939ec03da628aa94207eaa067.tar.gz gcc-ca04a532f3fcf91939ec03da628aa94207eaa067.tar.bz2 | |
Do not inline variadic thunks (PR ipa/83549).
2018-01-03 Martin Liska <mliska@suse.cz>
PR ipa/83549
* cif-code.def (VARIADIC_THUNK): New enum value.
* ipa-fnsummary.c (compute_fn_summary): Do not inline variadic
thunks.
2018-01-03 Martin Liska <mliska@suse.cz>
PR ipa/83549
* g++.dg/ipa/pr83549.C: New test.
From-SVN: r256177
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cif-code.def | 4 | ||||
| -rw-r--r-- | gcc/ipa-fnsummary.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ipa/pr83549.C | 8 |
5 files changed, 29 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d9c4c6a..ad327b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-01-03 Martin Liska <mliska@suse.cz> + + PR ipa/83549 + * cif-code.def (VARIADIC_THUNK): New enum value. + * ipa-fnsummary.c (compute_fn_summary): Do not inline variadic + thunks. + 2018-01-03 Jan Beulich <jbeulich@suse.com> * sse.md (mov<mode>_internal): Tighten condition for when to use diff --git a/gcc/cif-code.def b/gcc/cif-code.def index 6d7e2b4..19a7621 100644 --- a/gcc/cif-code.def +++ b/gcc/cif-code.def @@ -95,6 +95,10 @@ DEFCIFCODE(MISMATCHED_ARGUMENTS, CIF_FINAL_ERROR, DEFCIFCODE(LTO_MISMATCHED_DECLARATIONS, CIF_FINAL_ERROR, N_("mismatched declarations during linktime optimization")) +/* Caller is variadic thunk. */ +DEFCIFCODE(VARIADIC_THUNK, CIF_FINAL_ERROR, + N_("variadic thunk call")) + /* Call was originally indirect. */ DEFCIFCODE(ORIGINALLY_INDIRECT_CALL, CIF_FINAL_NORMAL, N_("originally indirect function call not considered for inlining")) diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c index fc18518..e9f76d5 100644 --- a/gcc/ipa-fnsummary.c +++ b/gcc/ipa-fnsummary.c @@ -2422,6 +2422,11 @@ compute_fn_summary (struct cgraph_node *node, bool early) info->inlinable = false; node->callees->inline_failed = CIF_CHKP; } + else if (stdarg_p (TREE_TYPE (node->decl))) + { + info->inlinable = false; + node->callees->inline_failed = CIF_VARIADIC_THUNK; + } else info->inlinable = true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d4d3804..969ce39 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-03 Martin Liska <mliska@suse.cz> + + PR ipa/83549 + * g++.dg/ipa/pr83549.C: New test. + 2018-01-03 Marek Polacek <polacek@redhat.com> PR c++/83592 diff --git a/gcc/testsuite/g++.dg/ipa/pr83549.C b/gcc/testsuite/g++.dg/ipa/pr83549.C new file mode 100644 index 0000000..90cf8fe --- /dev/null +++ b/gcc/testsuite/g++.dg/ipa/pr83549.C @@ -0,0 +1,8 @@ +// PR ipa/83549 +// { dg-do compile } +// { dg-options "-O2" } + +struct A { virtual ~A (); }; +struct B { virtual void foo (...); }; +struct C : A, B { void foo (...) {} }; +C c; |