OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert PR c++/42697 

The commit is reverted as this was not a regression.
     It's rather going to be stagged for 4.6.

From-SVN: r155976
This commit is contained in:
Dodji Seketeli 2010-01-17 10:38:10 +00:00 committed by Dodji Seketeli
parent 4548cb4b83
commit c4471bb2aa
4 changed files with 11 additions and 31 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 @@
2010-01-17 Dodji Seketeli <dodji@redhat.com>
PR c++/42697
*pt.c (tsubst_decl): Revert commit for PR c++/42697.
2010-01-17 Dodji Seketeli <dodji@redhat.com>
PR c++/42697

3
gcc/cp/pt.c
View File

@ -8825,8 +8825,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
specialize R. */
gen_tmpl = most_general_template (DECL_TI_TEMPLATE (t));
argvec = tsubst_template_args (DECL_TI_ARGS
(DECL_TEMPLATE_RESULT
(DECL_TI_TEMPLATE (t))),
(DECL_TEMPLATE_RESULT (gen_tmpl)),
args, complain, in_decl);
/* Check to see if we already have this specialization. */

6
gcc/testsuite/ChangeLog
View File

@ -1,7 +1,11 @@
2010-01-17 Dodji Seketeli <dodji@redhat.com>
PR c++/42697
* g++.dg/template/crash94.C: New test.
* g++.dg/template/crash94.C: Reverted.
2010-01-17 Dodji Seketeli <dodji@redhat.com>
PR c++/42697
2010-01-17 Jie Zhang <jie.zhang@analog.com>

28
gcc/testsuite/g++.dg/template/crash94.C
View File

@ -1,28 +0,0 @@
// Origin: PR c++/42697
// { dg-do compile }
template<class Value_t>
class fparser
{
template<bool Option>
void eval2(Value_t r[2]);
public:
void evaltest();
};
template<>
template<bool Option>
void fparser<int>::eval2(int r[2])
{
struct ObjType {};
}
template<class Value_t>
void fparser<Value_t>::evaltest
()
{
eval2<false>(0);
}
template class fparser<int>;