diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/class.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/abi-tag19.C | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3831b92..2cf989b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2016-04-06 Jason Merrill <jason@redhat.com> + + * class.c (check_abi_tags): Fix function template handling. + 2016-04-05 Nathan Sidwell <nathan@acm.org> PR c++/70512 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index ade2001..e66f0b9 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1604,6 +1604,15 @@ check_abi_tags (tree t, tree subob) void check_abi_tags (tree decl) { + tree t; + if (abi_version_at_least (10) + && DECL_LANG_SPECIFIC (decl) + && DECL_USE_TEMPLATE (decl) + && (t = DECL_TEMPLATE_RESULT (DECL_TI_TEMPLATE (decl)), + t != decl)) + /* Make sure that our template has the appropriate tags, since + write_unqualified_name looks for them there. */ + check_abi_tags (t); if (VAR_P (decl)) check_abi_tags (decl, TREE_TYPE (decl)); else if (TREE_CODE (decl) == FUNCTION_DECL diff --git a/gcc/testsuite/g++.dg/abi/abi-tag19.C b/gcc/testsuite/g++.dg/abi/abi-tag19.C new file mode 100644 index 0000000..e21d7b1 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/abi-tag19.C @@ -0,0 +1,4 @@ +struct __attribute__((abi_tag("a"))) X { }; +template<typename T> struct Y { X f() { return X(); } }; +template struct Y<int>; +// { dg-final { scan-assembler "_ZN1YIiE1fB1aEv" } } |