Fix PR c++/42697

gcc/cp/ChangeLog:
	PR c++/42697
	*pt.c (tsubst_decl): Get the arguments of a specialization from
	the specialization template, not from the most general template.

gcc/testsuite/ChangeLog:
	PR c++/42697
	* g++.dg/template/crash94.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158068 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ddd7bf6..3145df7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-07  Dodji Seketeli  <dodji@redhat.com>
 
+       PR c++/42697
+       *pt.c (tsubst_decl): Get the arguments of a specialization from
+       the specialization template, not from the most general template.
+
+2010-04-07  Dodji Seketeli  <dodji@redhat.com>
+
        PR c++/40239
        * typeck2.c (process_init_constructor_record):
        value-initialize members that are are not explicitely

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1293ee9..f02fe06 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-07  Dodji Seketeli  <dodji@redhat.com>
 
+       PR c++/42697
+       * g++.dg/template/crash94.C: New test.
+
+2010-04-07  Dodji Seketeli  <dodji@redhat.com>
+
        PR c++/40239
        * g++.dg/init/aggr5.C: New test.
        * g++.dg/init/aggr5.C: New test.