(C++) Patch to unify

[Jason Merrill]

Fixes testsuite failures from my earlier array patch.

2000-01-26  Jason Merrill  <jason@casey.cygnus.com>

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

Index: pt.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/pt.c,v
retrieving revision 1.393
diff -c -p -r1.393 pt.c
*** pt.c	2000/01/25 05:53:12	1.393
--- pt.c	2000/01/27 01:59:13
*************** unify (tparms, targs, parm, arg, strict)
*** 8619,8628 ****
  	  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));
  
  	  return unify (tparms, targs, t1, t, strict);
  	}
--- 8619,8625 ----
  	  t1 = TREE_OPERAND (parm, 0);
  	  t2 = TREE_OPERAND (parm, 1);
  
! 	  t = fold (build (PLUS_EXPR, integer_type_node, arg, t2));
  
  	  return unify (tparms, targs, t1, t, strict);
  	}