pt.c (tsubst): Use template_parm_level_and_index.

2007-10-12  Paolo Carlini  <pcarlini@suse.de>

	* pt.c (tsubst): Use template_parm_level_and_index.

From-SVN: r129257

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index faea90d1e3c0ee4d69a84eee5b1a436f0becaa57..075e2096dc93ad8055e531d34181baa6327b54e3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-12  Paolo Carlini  <pcarlini@suse.de>
+
+       * pt.c (tsubst): Use template_parm_level_and_index.
+
 2007-10-12  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/32121

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index fe2a739d40c2a5c4c03f280b60547188f29700cd..c3ce0d1373468d0d2347825b42f5f4e18f44af6f 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8669,18 +8669,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
        r = NULL_TREE;
 
        gcc_assert (TREE_VEC_LENGTH (args) > 0);
-       if (TREE_CODE (t) == TEMPLATE_TYPE_PARM
-           || TREE_CODE (t) == TEMPLATE_TEMPLATE_PARM
-           || TREE_CODE (t) == BOUND_TEMPLATE_TEMPLATE_PARM)
-         {
-           idx = TEMPLATE_TYPE_IDX (t);
-           level = TEMPLATE_TYPE_LEVEL (t);
-         }
-       else
-         {
-           idx = TEMPLATE_PARM_IDX (t);
-           level = TEMPLATE_PARM_LEVEL (t);
-         }
+       template_parm_level_and_index (t, &level, &idx); 
 
        levels = TMPL_ARGS_DEPTH (args);
        if (level <= levels)