From 79bdd5ffbdff5ef603a8d4ddac847c6cf0784592 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 20 Aug 2003 12:24:18 +0000 Subject: [PATCH] * stor-layout.c (do_type_align): Only copy DECL_USER_ALIGN from TYPE_USER_ALIGN for FIELD_DECLs. * attribs.c (decl_attributes): Rebuild the function pointer type after changing the target type. * tree.c (get_qualified_type): Also check that the attributes match. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70597 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 9 +++++++++ gcc/attribs.c | 29 ++++++++++++++++++++++++++--- gcc/stor-layout.c | 3 ++- gcc/tree.c | 3 ++- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1cc883ad0e64..ff2a9f70f9c9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2003-08-20 Jason Merrill + + * stor-layout.c (do_type_align): Only copy DECL_USER_ALIGN from + TYPE_USER_ALIGN for FIELD_DECLs. + + * attribs.c (decl_attributes): Rebuild the function pointer type after + changing the target type. + * tree.c (get_qualified_type): Also check that the attributes match. + 2003-08-19 Matt Kraai * Makefile.in (STAGESTUFF): Move cc1obj$(exeext) from here ... diff --git a/gcc/attribs.c b/gcc/attribs.c index 38a4308bdaae..a40fea7e7610 100644 --- a/gcc/attribs.c +++ b/gcc/attribs.c @@ -154,6 +154,7 @@ decl_attributes (tree *node, tree attributes, int flags) tree *anode = node; const struct attribute_spec *spec = NULL; bool no_add_attrs = 0; + tree fn_ptr_tmp = NULL_TREE; size_t i; for (i = 0; i < ARRAY_SIZE (attribute_tables); i++) @@ -222,9 +223,18 @@ decl_attributes (tree *node, tree attributes, int flags) && (TREE_CODE (TREE_TYPE (*anode)) == FUNCTION_TYPE || TREE_CODE (TREE_TYPE (*anode)) == METHOD_TYPE)) { - if (!(flags & (int) ATTR_FLAG_TYPE_IN_PLACE)) - *anode = build_type_copy (*anode); - anode = &TREE_TYPE (*anode); + /* OK, this is a bit convoluted. We can't just make a copy + of the pointer type and modify its TREE_TYPE, because if + we change the attributes of the target type the pointer + type needs to have a different TYPE_MAIN_VARIANT. So we + pull out the target type now, frob it as appropriate, and + rebuild the pointer type later. + + This would all be simpler if attributes were part of the + declarator, grumble grumble. */ + fn_ptr_tmp = TREE_TYPE (*anode); + anode = &fn_ptr_tmp; + flags &= ~(int) ATTR_FLAG_TYPE_IN_PLACE; } else if (flags & (int) ATTR_FLAG_FUNCTION_NEXT) { @@ -291,6 +301,19 @@ decl_attributes (tree *node, tree attributes, int flags) old_attrs)); } } + + if (fn_ptr_tmp) + { + /* Rebuild the function pointer type and put it in the + appropriate place. */ + fn_ptr_tmp = build_pointer_type (fn_ptr_tmp); + if (DECL_P (*node)) + TREE_TYPE (*node) = fn_ptr_tmp; + else if (TREE_CODE (*node) == POINTER_TYPE) + *node = fn_ptr_tmp; + else + abort (); + } } return returned_attrs; diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 54e6a56de990..afd830d20e8b 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -344,7 +344,8 @@ do_type_align (tree type, tree decl) if (TYPE_ALIGN (type) > DECL_ALIGN (decl)) { DECL_ALIGN (decl) = TYPE_ALIGN (type); - DECL_USER_ALIGN (decl) = TYPE_USER_ALIGN (type); + if (TREE_CODE (decl) == FIELD_DECL) + DECL_USER_ALIGN (decl) = TYPE_USER_ALIGN (type); } } diff --git a/gcc/tree.c b/gcc/tree.c index 841876712d2b..3bae512970c3 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -2849,7 +2849,8 @@ get_qualified_type (tree type, int type_quals) preserve the TYPE_NAME, since there is code that depends on this. */ for (t = TYPE_MAIN_VARIANT (type); t; t = TYPE_NEXT_VARIANT (t)) if (TYPE_QUALS (t) == type_quals && TYPE_NAME (t) == TYPE_NAME (type) - && TYPE_CONTEXT (t) == TYPE_CONTEXT (type)) + && TYPE_CONTEXT (t) == TYPE_CONTEXT (type) + && attribute_list_equal (TYPE_ATTRIBUTES (t), TYPE_ATTRIBUTES (type))) return t; return NULL_TREE; -- 2.47.2