* pt.c (unify): Use fold, not maybe_fold_nontype_arg.

--------------------------------------------------------------------

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31640 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2834ebb..c497e6f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-26  Jason Merrill  <jason@casey.cygnus.com>
+
+       * pt.c (unify): Use fold, not maybe_fold_nontype_arg.
+
 Wed Jan 26 22:19:14 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
        * cp/optimize.c (calls_setjmp_r): Supply new argument

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b0b3289..64d3251 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8619,10 +8619,7 @@ unify (tparms, targs, parm, arg, strict)
          t1 = TREE_OPERAND (parm, 0);
          t2 = TREE_OPERAND (parm, 1);
 
-         /* Should this be a regular fold?  */
-         t = maybe_fold_nontype_arg (build (PLUS_EXPR,
-                                            integer_type_node,
-                                            arg, t2));
+         t = fold (build (PLUS_EXPR, integer_type_node, arg, t2));
 
          return unify (tparms, targs, t1, t, strict);
        }