diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-10-10 19:22:04 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-10-10 15:22:04 -0400 |
| commit | 7ac63bcadb511dd552b7ce6b31dad203eea4971e (patch) | |
| tree | 504c4e06b79418fa60f7c810af43f611b810689f /gcc/cp | |
| parent | 9cd60aa99b7471aa513b269dcc38c77f5bb5cb8e (diff) | |
| download | gcc-7ac63bcadb511dd552b7ce6b31dad203eea4971e.zip gcc-7ac63bcadb511dd552b7ce6b31dad203eea4971e.tar.gz gcc-7ac63bcadb511dd552b7ce6b31dad203eea4971e.tar.bz2 | |
* pt.c (instantiate_decl): Fix previous change.
From-SVN: r15888
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0f703f1..d5d187f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 10 12:21:11 1997 Jason Merrill <jason@yorick.cygnus.com> + + * pt.c (instantiate_decl): Fix previous change. + Thu Oct 9 12:08:21 1997 Jason Merrill <jason@yorick.cygnus.com> * pt.c (tsubst): Fix thinko. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4daf052..8e1e42c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -623,8 +623,7 @@ check_explicit_specialization (declarator, decl, template_count, flags) member class template of a non-specialized class template is itself a template. - So, we just leave the template info alone in this case. - */ + So, we just leave the template info alone in this case. */ if (!(DECL_TEMPLATE_INFO (decl) && DECL_TI_TEMPLATE (decl))) DECL_TEMPLATE_INFO (decl) = perm_tree_cons (tmpl, targs, NULL_TREE); @@ -4411,9 +4410,6 @@ instantiate_decl (d) int line = lineno; char *file = input_filename; - if (DECL_TEMPLATE_SPECIALIZATION (d)) - return d; - for (td = tmpl; DECL_TEMPLATE_INSTANTIATION (td); ) td = DECL_TI_TEMPLATE (td); @@ -4437,6 +4433,18 @@ instantiate_decl (d) if (d_defined) return d; + if (TREE_CODE (d) == FUNCTION_DECL) + { + tree specs; + + /* Check to see if there is a matching specialization. */ + for (specs = DECL_TEMPLATE_SPECIALIZATIONS (tmpl); + specs != NULL_TREE; + specs = TREE_CHAIN (specs)) + if (comp_template_args (TREE_PURPOSE (specs), args)) + return TREE_VALUE (specs); + } + /* This needs to happen before any tsubsting. */ if (! push_tinst_level (d)) return d; |