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

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

From-SVN: r31640
This commit is contained in:
Jason Merrill 2000-01-27 02:01:36 +00:00 committed by Jason Merrill
parent 1e14a542ea
commit 24e2e58e0a
2 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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);
}