Hi.
It's revert of a hunk that causes a new ICE.
Patch can bootstrap on ppc64le-redhat-linux and survives regression tests.
Ready to be installed?
Martin
gcc/ChangeLog:
2018-06-29 Martin Liska <[email protected]>
PR ipa/86323
* ipa-inline.c (early_inliner): Revert wrongly added ::get call.
gcc/testsuite/ChangeLog:
2018-06-29 Martin Liska <[email protected]>
PR ipa/86323
* g++.dg/ipa/pr86323.C: New test.
---
gcc/ipa-inline.c | 13 +++++--------
gcc/testsuite/g++.dg/ipa/pr86323.C | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 8 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ipa/pr86323.C
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index a62c1ffd3b0..a84d1d9ad3e 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -2802,14 +2802,11 @@ early_inliner (function *fun)
for (edge = node->callees; edge; edge = edge->next_callee)
{
/* We have no summary for new bound store calls yet. */
- ipa_call_summary *es = ipa_call_summaries->get (edge);
- if (es != NULL)
- {
- es->call_stmt_size
- = estimate_num_insns (edge->call_stmt, &eni_size_weights);
- es->call_stmt_time
- = estimate_num_insns (edge->call_stmt, &eni_time_weights);
- }
+ ipa_call_summary *es = ipa_call_summaries->get_create (edge);
+ es->call_stmt_size
+ = estimate_num_insns (edge->call_stmt, &eni_size_weights);
+ es->call_stmt_time
+ = estimate_num_insns (edge->call_stmt, &eni_time_weights);
if (edge->callee->decl
&& !gimple_check_call_matching_types (
diff --git a/gcc/testsuite/g++.dg/ipa/pr86323.C b/gcc/testsuite/g++.dg/ipa/pr86323.C
new file mode 100644
index 00000000000..6632f35d86c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr86323.C
@@ -0,0 +1,28 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 --param max-early-inliner-iterations=5" } */
+
+char *s;
+namespace a {
+template <class ae> class af {
+public:
+ af(ae);
+};
+typedef af<char *> b;
+namespace ag {
+class ah {
+public:
+ void ai(b aj) { c(aj); }
+ virtual void c(b);
+};
+class d : public ah {
+ void c(b);
+};
+class e {
+ void f(bool);
+ void ai(b aj) { g.ai(aj); }
+ d g;
+};
+void d::c(b) {}
+void e::f(bool) { ai(s); }
+}
+}