From 32f4f7197f9c12930a4933fc92215fcc45af670f Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Fri, 19 Mar 2004 14:18:27 +0000 Subject: [PATCH] cxx-pretty-print.c (pp_cxx_unqualified_id): Use TEMPLATE_TYPE_PARM_INDEX instead of TYPE_FIELDS. * cxx-pretty-print.c (pp_cxx_unqualified_id): Use TEMPLATE_TYPE_PARM_INDEX instead of TYPE_FIELDS. * search.c (dfs_unuse_fields): Add two more TREE_CODES that mean the field is named TEMPLATE_TYPE_PARM_INDEX. From-SVN: r79683 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/cxx-pretty-print.c | 2 +- gcc/cp/search.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 77e30a55288..7c8c1d26412 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2004-03-19 Richard Kenner + + * cxx-pretty-print.c (pp_cxx_unqualified_id): Use + TEMPLATE_TYPE_PARM_INDEX instead of TYPE_FIELDS. + * search.c (dfs_unuse_fields): Add two more TREE_CODES that mean + the field is named TEMPLATE_TYPE_PARM_INDEX. + 2004-03-19 Giovanni Bajo PR c++/14545 diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 53c677ab88a..0a573f2850c 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -184,7 +184,7 @@ pp_cxx_unqualified_id (cxx_pretty_printer *pp, tree t) break; case TEMPLATE_TYPE_PARM: - t = TYPE_FIELDS (t); + t = TEMPLATE_TYPE_PARM_INDEX (t); case TEMPLATE_PARM_INDEX: pp_cxx_unqualified_id (pp, TEMPLATE_PARM_DECL (t)); break; diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 11c7dedf57d..5f4c91c3ec0 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -2258,7 +2258,9 @@ dfs_unuse_fields (tree binfo, void *data ATTRIBUTE_UNUSED) fields = TYPENAME_TYPE_FULLNAME (type); else if (TREE_CODE (type) == TYPEOF_TYPE) fields = TYPEOF_TYPE_EXPR (type); - else if (TREE_CODE (type) == TEMPLATE_TYPE_PARM) + else if (TREE_CODE (type) == TEMPLATE_TYPE_PARM + || TREE_CODE (type) == TEMPLATE_TEMPLATE_PARM + || TREE_CODE (type) == BOUND_TEMPLATE_TEMPLATE_PARM) fields = TEMPLATE_TYPE_PARM_INDEX (type); else fields = TYPE_FIELDS (type); -- 2.30.2