public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-5231] Whitelity type attributes for function signature change
@ 2021-11-13 14:47 Jan Hubicka
0 siblings, 0 replies; only message in thread
From: Jan Hubicka @ 2021-11-13 14:47 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:2af63f0f53a12a7275b99d92b271d3dff5112690
commit r12-5231-g2af63f0f53a12a7275b99d92b271d3dff5112690
Author: Jan Hubicka <jh@suse.cz>
Date: Sat Nov 13 15:46:57 2021 +0100
Whitelity type attributes for function signature change
gcc/ChangeLog:
* ipa-fnsummary.c (compute_fn_summary): Use type_attribut_allowed_p
* ipa-param-manipulation.c
(ipa_param_adjustments::type_attribute_allowed_p):
New member function.
(drop_type_attribute_if_params_changed_p): New function.
(build_adjusted_function_type): Use it.
* ipa-param-manipulation.h: Add type_attribute_allowed_p.
Diff:
---
gcc/ipa-fnsummary.c | 4 ++--
gcc/ipa-param-manipulation.c | 43 ++++++++++++++++++++++++++++++++++++-------
gcc/ipa-param-manipulation.h | 1 +
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index 94a80d3ec90..7e9201a554a 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -3141,8 +3141,8 @@ compute_fn_summary (struct cgraph_node *node, bool early)
modref summaries. */
for (tree list = TYPE_ATTRIBUTES (TREE_TYPE (node->decl));
list && !no_signature; list = TREE_CHAIN (list))
- if (!flag_ipa_modref
- || !is_attribute_p ("fn spec", get_attribute_name (list)))
+ if (!ipa_param_adjustments::type_attribute_allowed_p
+ (get_attribute_name (list)))
{
if (dump_file)
{
diff --git a/gcc/ipa-param-manipulation.c b/gcc/ipa-param-manipulation.c
index 991db0d9b1b..0a5ed858a28 100644
--- a/gcc/ipa-param-manipulation.c
+++ b/gcc/ipa-param-manipulation.c
@@ -279,6 +279,32 @@ fill_vector_of_new_param_types (vec<tree> *new_types, vec<tree> *otypes,
}
}
+/* Return false if given attribute should prevent type adjustments. */
+
+bool
+ipa_param_adjustments::type_attribute_allowed_p (tree name)
+{
+ if ((is_attribute_p ("fn spec", name) && flag_ipa_modref)
+ || is_attribute_p ("access", name)
+ || is_attribute_p ("returns_nonnull", name)
+ || is_attribute_p ("assume_aligned", name)
+ || is_attribute_p ("nocf_check", name)
+ || is_attribute_p ("warn_unused_result", name))
+ return true;
+ return false;
+}
+
+/* Return true if attribute should be dropped if parameter changed. */
+
+static bool
+drop_type_attribute_if_params_changed_p (tree name)
+{
+ if (is_attribute_p ("fn spec", name)
+ || is_attribute_p ("access", name))
+ return true;
+ return false;
+}
+
/* Build and return a function type just like ORIG_TYPE but with parameter
types given in NEW_PARAM_TYPES - which can be NULL if, but only if,
ORIG_TYPE itself has NULL TREE_ARG_TYPEs. If METHOD2FUNC is true, also make
@@ -337,16 +363,19 @@ build_adjusted_function_type (tree orig_type, vec<tree> *new_param_types,
if (skip_return)
TREE_TYPE (new_type) = void_type_node;
}
- /* We only support one fn spec attribute on type. Be sure to remove it.
- Once we support multiple attributes we will need to be able to unshare
- the list. */
if (args_modified && TYPE_ATTRIBUTES (new_type))
{
- gcc_checking_assert
- (!TREE_CHAIN (TYPE_ATTRIBUTES (new_type))
- && (is_attribute_p ("fn spec",
- get_attribute_name (TYPE_ATTRIBUTES (new_type)))));
+ tree t = TYPE_ATTRIBUTES (new_type);
+ tree *last = &TYPE_ATTRIBUTES (new_type);
TYPE_ATTRIBUTES (new_type) = NULL;
+ for (;t; t = TREE_CHAIN (t))
+ if (!drop_type_attribute_if_params_changed_p
+ (get_attribute_name (t)))
+ {
+ *last = copy_node (t);
+ TREE_CHAIN (*last) = NULL;
+ last = &TREE_CHAIN (*last);
+ }
}
return new_type;
diff --git a/gcc/ipa-param-manipulation.h b/gcc/ipa-param-manipulation.h
index 9440cbfc56c..5adf8a22356 100644
--- a/gcc/ipa-param-manipulation.h
+++ b/gcc/ipa-param-manipulation.h
@@ -254,6 +254,7 @@ public:
/* If true, make the function not return any value. */
bool m_skip_return;
+ static bool type_attribute_allowed_p (tree);
private:
ipa_param_adjustments () {}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-13 14:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-13 14:47 [gcc r12-5231] Whitelity type attributes for function signature change Jan Hubicka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).