procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

class.c (mark_type_abi_tags): New.

Browse source 
* class.c (mark_type_abi_tags): New.
	(check_abi_tags): Use it.

From-SVN: r199629
This commit is contained in:
Jason Merrill 2013-06-03 19:13:10 -04:00 • committed by Jason Merrill
parent 25c229379a
commit 3aaaa103d7
3 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-05-31 Jason Merrill <jason@redhat.com>
* class.c (mark_type_abi_tags): New.
(check_abi_tags): Use it.
2013-06-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/57419

44
gcc/cp/class.c
View file

@ -1354,11 +1354,11 @@ find_abi_tags_r (tree *tp, int */*walk_subtrees*/, void *data)
return NULL_TREE;
}
/* Check that class T has all the abi tags that subobject SUBOB has, or
warn if not. */
/* Set IDENTIFIER_MARKED on all the ABI tags on T and its (transitively
complete) template arguments. */
static void
check_abi_tags (tree t, tree subob)
mark_type_abi_tags (tree t, bool val)
{
tree attributes = lookup_attribute ("abi_tag", TYPE_ATTRIBUTES (t));
if (attributes)
@ -1368,25 +1368,41 @@ check_abi_tags (tree t, tree subob)
{
tree tag = TREE_VALUE (list);
tree id = get_identifier (TREE_STRING_POINTER (tag));
IDENTIFIER_MARKED (id) = true;
IDENTIFIER_MARKED (id) = val;
}
}
/* Also mark ABI tags from template arguments. */
if (CLASSTYPE_TEMPLATE_INFO (t))
{
tree args = CLASSTYPE_TI_ARGS (t);
for (int i = 0; i < TMPL_ARGS_DEPTH (args); ++i)
{
tree level = TMPL_ARGS_LEVEL (args, i+1);
for (int j = 0; j < TREE_VEC_LENGTH (level); ++j)
{
tree arg = TREE_VEC_ELT (level, j);
if (CLASS_TYPE_P (arg))
mark_type_abi_tags (arg, val);
}
}
}
}
/* Check that class T has all the abi tags that subobject SUBOB has, or
warn if not. */
static void
check_abi_tags (tree t, tree subob)
{
mark_type_abi_tags (t, true);
tree subtype = TYPE_P (subob) ? subob : TREE_TYPE (subob);
struct abi_tag_data data = { t, subob };
cp_walk_tree_without_duplicates (&subtype, find_abi_tags_r, &data);
if (attributes)
{
for (tree list = TREE_VALUE (attributes); list;
list = TREE_CHAIN (list))
{
tree tag = TREE_VALUE (list);
tree id = get_identifier (TREE_STRING_POINTER (tag));
IDENTIFIER_MARKED (id) = false;
}
}
mark_type_abi_tags (t, false);
}
/* Run through the base classes of T, updating CANT_HAVE_CONST_CTOR_P,

6
gcc/testsuite/g++.dg/abi/abi-tag5.C Normal file
View file

@ -0,0 +1,6 @@
// { dg-options -Wabi-tag }
struct __attribute__ ((abi_tag ("foo"))) A { };
template <class T> struct B: T { };
B<A> b;