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

re PR c++/60383 (ICE with invalid template specialization)

Browse source 
/cp
2014-03-13  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60383
	* pt.c (maybe_process_partial_specialization): Check return value
	of check_specialization_namespace.

/testsuite
2014-03-13  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/60383
	* g++.dg/template/crash118.C: New.
	* g++.dg/template/crash95.C: Adjust.

From-SVN: r208550
This commit is contained in:
Paolo Carlini 2014-03-13 16:05:15 +00:00 • committed by Paolo Carlini
parent 7891065aa7
commit b0a8740278
5 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-03-13 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60383
* pt.c (maybe_process_partial_specialization): Check return value
of check_specialization_namespace.
2014-03-13 Paolo Carlini <paolo.carlini@oracle.com> 2014-03-13 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60254 PR c++/60254

4
gcc/cp/pt.c
View file

@ -850,7 +850,9 @@ maybe_process_partial_specialization (tree type)
if (CLASSTYPE_IMPLICIT_INSTANTIATION (type) if (CLASSTYPE_IMPLICIT_INSTANTIATION (type)
&& !COMPLETE_TYPE_P (type)) && !COMPLETE_TYPE_P (type))
{ {
check_specialization_namespace (CLASSTYPE_TI_TEMPLATE (type)); if (!check_specialization_namespace (CLASSTYPE_TI_TEMPLATE (type))
&& !at_namespace_scope_p ())
return error_mark_node;
SET_CLASSTYPE_TEMPLATE_SPECIALIZATION (type); SET_CLASSTYPE_TEMPLATE_SPECIALIZATION (type);
DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (type)) = input_location; DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (type)) = input_location;
if (processing_template_decl) if (processing_template_decl)

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2014-03-13 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60383
* g++.dg/template/crash118.C: New.
* g++.dg/template/crash95.C: Adjust.
2014-03-13 Vladimir Makarov <vmakarov@redhat.com> 2014-03-13 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/57189 PR rtl-optimization/57189

11
gcc/testsuite/g++.dg/template/crash118.C Normal file
View file

@ -0,0 +1,11 @@
// PR c++/60383
template<int> struct A
{
template<typename> struct B
{
template<typename T> struct B<T*> {}; // { dg-error "specialization" }
};
};
A<0>::B<char*> b;

2
gcc/testsuite/g++.dg/template/crash95.C
View file

@ -8,4 +8,4 @@ template < typename > struct S
}; };
}; };
S < int > s(0); // { dg-error "incomplete type" } S < int > s(0); // { dg-error "no matching" }