On 2/18/20 11:09 AM, Richard Biener wrote:
On Mon, Feb 17, 2020 at 3:47 PM Martin Liška <mli...@suse.cz> wrote:
Sorry, I attached wrong patch.
Ah yeah, that looks like a better place (the IPA pure-const one). OK
with Jakubs
suggested changes.
Richard.
Martin
All right. There's hopefully a final version of the patch that includes
Jakub's notes.
I've just tested that ppc64le-linux-gnu LTO bootstrap. I'll install it
if there are no objections.
Martin
>From 6c29b60fa67b5cbafec4a1089a4edee03ac97ea1 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 | 7 +++++++
gcc/ipa-param-manipulation.c | 4 ++++
gcc/ipa-pure-const.c | 5 ++++-
gcc/testsuite/gcc.dg/ipa/pr93583.c | 15 +++++++++++++++
4 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr93583.c
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 294b2d392fd..c3423791c12 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3374,6 +3374,13 @@ cgraph_node::verify_node (void)
error ("calls_comdat_local is set outside of a comdat group");
error_found = true;
}
+ if (DECL_IS_MALLOC (decl)
+ && !POINTER_TYPE_P (TREE_TYPE (TREE_TYPE (decl))))
+ {
+ error ("malloc attribute should be used for a function that "
+ "returns a pointer");
+ 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..564c6629c92 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 *, 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;
}
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
