diff options
| author | Jason Merrill <jason@redhat.com> | 2010-06-07 16:42:09 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-06-07 16:42:09 -0400 |
| commit | 55cdb6b69069481ecf19ff07d0ebb23208bc8162 (patch) | |
| tree | 67b7b513169a30d7c1477b589cc7fccf1b5b27e8 /gcc | |
| parent | 390b2b32773f84b28c8e6c7abee2ba57efcafe9a (diff) | |
| download | gcc-55cdb6b69069481ecf19ff07d0ebb23208bc8162.zip gcc-55cdb6b69069481ecf19ff07d0ebb23208bc8162.tar.gz gcc-55cdb6b69069481ecf19ff07d0ebb23208bc8162.tar.bz2 | |
pt.c (lookup_template_class): Don't mess with DECL_TEMPLATE_INSTANTIATIONS except for partial instantiations.
* pt.c (lookup_template_class): Don't mess with
DECL_TEMPLATE_INSTANTIATIONS except for partial instantiations.
From-SVN: r160397
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3bfd7f1..7119ddd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-07 Jason Merrill <jason@redhat.com> + + * pt.c (lookup_template_class): Don't mess with + DECL_TEMPLATE_INSTANTIATIONS except for partial instantiations. + 2010-06-07 Jakub Jelinek <jakub@redhat.com> PR c++/44444 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b95fdf7..fd93b1b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6723,9 +6723,10 @@ lookup_template_class (tree d1, /* Note this use of the partial instantiation so we can check it later in maybe_process_partial_specialization. */ - DECL_TEMPLATE_INSTANTIATIONS (templ) - = tree_cons (arglist, t, - DECL_TEMPLATE_INSTANTIATIONS (templ)); + if (use_partial_inst_tmpl) + DECL_TEMPLATE_INSTANTIATIONS (templ) + = tree_cons (arglist, t, + DECL_TEMPLATE_INSTANTIATIONS (templ)); if (TREE_CODE (t) == ENUMERAL_TYPE && !is_dependent_type) /* Now that the type has been registered on the instantiations |