From: Jason Merrill <jason@casey.cygnus.com>
Date: Thu, 27 Jan 2000 02:01:36 +0000 (+0000)
Subject: pt.c (unify): Use fold, not maybe_fold_nontype_arg.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24e2e58e0a03c43571c5301c76a398100acc5a3b;p=gcc.git

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

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

From-SVN: r31640
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2834ebb7863..c497e6ffe32 100644
--- 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 b0b3289869f..64d3251e75b 100644
--- 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);
 	}