aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2010-06-07 16:55:43 -0400
committerJason Merrill <jason@gcc.gnu.org>2010-06-07 16:55:43 -0400
commit2f86b26a4f144c583c9f84d77b31e3e2bf238ca1 (patch)
tree736a28087abb0186fa4af956013582510da00c55 /gcc/cp
parentb0a421e8c1edf21466756f1354a481273c2cb362 (diff)
downloadgcc-2f86b26a4f144c583c9f84d77b31e3e2bf238ca1.zip
gcc-2f86b26a4f144c583c9f84d77b31e3e2bf238ca1.tar.gz
gcc-2f86b26a4f144c583c9f84d77b31e3e2bf238ca1.tar.bz2
revert: pt.c (lookup_template_class): Don't mess with DECL_TEMPLATE_INSTANTIATIONS except for partial instantiations.
Revert: * pt.c (lookup_template_class): Don't mess with DECL_TEMPLATE_INSTANTIATIONS except for partial instantiations. From-SVN: r160401
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/pt.c7
2 files changed, 3 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5f74ab9..77d7c51 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -9,9 +9,6 @@
(instantiate_class_template): Use it.
* search.c (lookup_base): Use it.
- * 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 b62a9bc..d66c1bf 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6723,10 +6723,9 @@ lookup_template_class (tree d1,
/* Note this use of the partial instantiation so we can check it
later in maybe_process_partial_specialization. */
- if (use_partial_inst_tmpl)
- DECL_TEMPLATE_INSTANTIATIONS (templ)
- = tree_cons (arglist, t,
- DECL_TEMPLATE_INSTANTIATIONS (templ));
+ 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