On 2/17/20 3:25 PM, Richard Biener wrote:
On Mon, Feb 17, 2020 at 1:16 PM Martin Liška <mli...@suse.cz> wrote:
Hello.
As mentioned in the PR, we end up with a void function
call that has set MALLOC attribute. That causes problems in RTL
expansion.
I believe a proper fix is to drop the attribute when a callgraph
clone with void type is created.
I would like to see Martin's comment about the hunk in propagate_malloc
which is maybe suboptimal and one can find a better way?
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
It fixes LTO bootstrap on ppc64le.
Is the ipa-pure-const.c hunk really necessary?
Yes.
malloc_candidate_p shouldn't
see any such function as candidate. If so it should be fixed there?
I've got hopefully a proper fix. Which is where we clone funct_state_summary_t
summary for the newly cloned IPA SRA function.
I'm going to test the patch.
Martin
Thanks,
Richard.
Thanks,
Martin
gcc/ChangeLog:
2020-02-17 Martin Liska <mli...@suse.cz>
PR ipa/93583
* cgraph.c (cgraph_node::verify_node): Verify MALLOC attribute
and return type of functions.
* ipa-param-manipulation.c (ipa_param_adjustments::adjust_decl):
Drop MALLOC attribute for void functions.
* ipa-pure-const.c (propagate_malloc): Do not set malloc flag
for void functions.
gcc/testsuite/ChangeLog:
2020-02-17 Martin Liska <mli...@suse.cz>
PR ipa/93583
* gcc.dg/ipa/pr93583.c: New test.
---
gcc/cgraph.c | 6 ++++++
gcc/ipa-param-manipulation.c | 4 ++++
gcc/ipa-pure-const.c | 9 ++++++---
gcc/testsuite/gcc.dg/ipa/pr93583.c | 15 +++++++++++++++
4 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr93583.c
>From c49949575f661d67afc7cc77d8e6f5f8bea922a2 Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Mon, 17 Feb 2020 12:33:28 +0100
Subject: [PATCH] Drop MALLOC attribute for void functions.
gcc/ChangeLog:
2020-02-17 Martin Liska <mli...@suse.cz>
PR ipa/93583
* cgraph.c (cgraph_node::verify_node): Verify MALLOC attribute
and return type of functions.
* ipa-param-manipulation.c (ipa_param_adjustments::adjust_decl):
Drop MALLOC attribute for void functions.
* ipa-pure-const.c (funct_state_summary_t::duplicate): Drop
malloc_state for a new VOID clone.
gcc/testsuite/ChangeLog:
2020-02-17 Martin Liska <mli...@suse.cz>
PR ipa/93583
* gcc.dg/ipa/pr93583.c: New test.
---
gcc/cgraph.c | 6 ++++++
gcc/ipa-param-manipulation.c | 4 ++++
gcc/ipa-pure-const.c | 14 ++++++++++----
gcc/testsuite/gcc.dg/ipa/pr93583.c | 15 +++++++++++++++
4 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr93583.c
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 294b2d392fd..6e99fbb45f4 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3374,6 +3374,12 @@ cgraph_node::verify_node (void)
error ("calls_comdat_local is set outside of a comdat group");
error_found = true;
}
+ if (DECL_IS_MALLOC (decl)
+ && VOID_TYPE_P (TREE_TYPE (TREE_TYPE (decl))))
+ {
+ error ("MALLOC attribute set on a void function");
+ error_found = true;
+ }
for (e = indirect_calls; e; e = e->next_callee)
{
if (e->aux)
diff --git a/gcc/ipa-param-manipulation.c b/gcc/ipa-param-manipulation.c
index 19ec87358fa..839bd2ef870 100644
--- a/gcc/ipa-param-manipulation.c
+++ b/gcc/ipa-param-manipulation.c
@@ -410,6 +410,10 @@ ipa_param_adjustments::adjust_decl (tree orig_decl)
DECL_VIRTUAL_P (new_decl) = 0;
DECL_LANG_SPECIFIC (new_decl) = NULL;
+ /* Drop MALLOC attribute for a void function. */
+ if (m_skip_return)
+ DECL_IS_MALLOC (new_decl) = 0;
+
return new_decl;
}
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index ccd0918c120..a2d0792b0ce 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -1157,11 +1157,14 @@ funct_state_summary_t::insert (cgraph_node *node, funct_state_d *state)
/* Called when new clone is inserted to callgraph late. */
void
-funct_state_summary_t::duplicate (cgraph_node *, cgraph_node *,
+funct_state_summary_t::duplicate (cgraph_node *src, cgraph_node *dst,
funct_state_d *src_data,
funct_state_d *dst_data)
{
new (dst_data) funct_state_d (*src_data);
+ if (dst_data->malloc_state == STATE_MALLOC
+ && VOID_TYPE_P (TREE_TYPE (TREE_TYPE (dst->decl))))
+ dst_data->malloc_state = STATE_MALLOC_BOTTOM;
}
@@ -1973,9 +1976,12 @@ propagate_malloc (void)
node->dump_name ());
bool malloc_decl_p = DECL_IS_MALLOC (node->decl);
- node->set_malloc_flag (true);
- if (!malloc_decl_p && warn_suggest_attribute_malloc)
- warn_function_malloc (node->decl);
+ if (!VOID_TYPE_P (TREE_TYPE (TREE_TYPE (node->decl))))
+ {
+ node->set_malloc_flag (true);
+ if (!malloc_decl_p && warn_suggest_attribute_malloc)
+ warn_function_malloc (node->decl);
+ }
}
}
diff --git a/gcc/testsuite/gcc.dg/ipa/pr93583.c b/gcc/testsuite/gcc.dg/ipa/pr93583.c
new file mode 100644
index 00000000000..30ef506553d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr93583.c
@@ -0,0 +1,15 @@
+/* PR ipa/93583 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+void *bar(const char*);
+static void *__attribute__((malloc,noinline)) foo(const char *p)
+{
+ return bar (p);
+}
+
+int main(int argc, char **argv)
+{
+ foo (argv[0]);
+ return 0;
+}
--
2.25.0
