re PR c++/55275 (abi_tag attribute doesn't work on explicit specializations of class templates)

PR c++/55275
	* pt.c (maybe_process_partial_specialization): Update
	DECL_SOURCE_LOCATION for new specializations.

From-SVN: r193524
This commit is contained in:
Jason Merrill 2012-11-14 20:53:23 -05:00 committed by Jason Merrill
parent c25639b1a3
commit 4fce678f8a
7 changed files with 52 additions and 6 deletions

View file

@ -1,3 +1,9 @@
2012-11-13 Jason Merrill <jason@redhat.com>
PR c++/55275
* pt.c (maybe_process_partial_specialization): Update
DECL_SOURCE_LOCATION for new specializations.
2012-11-14 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/55323

View file

@ -838,6 +838,7 @@ maybe_process_partial_specialization (tree type)
{
check_specialization_namespace (CLASSTYPE_TI_TEMPLATE (type));
SET_CLASSTYPE_TEMPLATE_SPECIALIZATION (type);
DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (type)) = input_location;
if (processing_template_decl)
{
if (push_template_decl (TYPE_MAIN_DECL (type))
@ -934,6 +935,7 @@ maybe_process_partial_specialization (tree type)
have one level of template argument for the innermost
class template. */
SET_CLASSTYPE_TEMPLATE_SPECIALIZATION (type);
DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (type)) = input_location;
CLASSTYPE_TI_ARGS (type)
= INNERMOST_TEMPLATE_ARGS (CLASSTYPE_TI_ARGS (type));
}

View file

@ -0,0 +1,36 @@
// An explicit specialization doesn't get the tag from its template unless
// it is specified there, too.
// { dg-final { scan-assembler "_ZN3FooB5cxx11IcE1fEv" } }
template<typename T>
struct __attribute ((abi_tag("cxx11"))) Foo
{
int f();
};
// { dg-final { scan-assembler "_ZN3FooB5cxx11IiE1fEv" } }
template<>
struct
__attribute ((abi_tag("cxx11")))
Foo<int>
{
int f();
};
// { dg-final { scan-assembler "_ZN3FooIdE1fEv" } }
template<>
struct
Foo<double>
{
int f();
};
int main()
{
Foo<int> f;
f.f();
Foo<char> f1;
f1.f();
Foo<double> f2;
f2.f();
}

View file

@ -1,7 +1,7 @@
// { dg-options "-std=c++0x" }
template<typename...> struct A; // { dg-error "declaration" }
template<typename...> struct A;
template<char> struct A<> {}; // { dg-error "not used in partial specialization|anonymous" }
template<char> struct A<> {}; // { dg-error "not used in partial specialization|anonymous|declaration" }
template<typename T, typename... U> struct A<T, U...> : A<U...> {}; // { dg-error "incomplete type" }

View file

@ -1,8 +1,8 @@
// PR c++/43630
template < typename > struct A; // { dg-error "declaration" }
template < typename > struct A;
template < typename > struct A < int > // { dg-error "not used|template\\-parameter" }
template < typename > struct A < int > // { dg-error "not used|template\\-parameter|declaration" }
{
int i;
int f ();

View file

@ -36,4 +36,5 @@ int main()
}
// { dg-error "invalid use of incomplete" "" { target *-*-* } 28 }
// { dg-error "declaration of" "" { target *-*-* } 63 }
// { dg-error "declaration of" "" { target *-*-* } 98 }
// { dg-error "declaration of" "" { target *-*-* } 101 }

View file

@ -36,4 +36,5 @@ int main()
}
// { dg-error "invalid use of incomplete" "" { target *-*-* } 28 }
// { dg-error "declaration of" "" { target *-*-* } 106 }
// { dg-error "declaration of" "" { target *-*-* } 141 }
// { dg-error "declaration of" "" { target *-*-* } 144 }