diff options
| author | Jason Merrill <jason@casey.cygnus.com> | 2000-01-27 02:01:36 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-01-26 21:01:36 -0500 |
| commit | 24e2e58e0a03c43571c5301c76a398100acc5a3b (patch) | |
| tree | 5e064ee55ea182d2d764480684058ca57d46713c /gcc | |
| parent | 1e14a542ea2ab3757e0ef9a8d234dbdd947a6025 (diff) | |
| download | gcc-24e2e58e0a03c43571c5301c76a398100acc5a3b.zip gcc-24e2e58e0a03c43571c5301c76a398100acc5a3b.tar.gz gcc-24e2e58e0a03c43571c5301c76a398100acc5a3b.tar.bz2 | |
pt.c (unify): Use fold, not maybe_fold_nontype_arg.
* pt.c (unify): Use fold, not maybe_fold_nontype_arg.
--------------------------------------------------------------------
From-SVN: r31640
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2834ebb..c497e6f 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 b0b3289..64d3251 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); } |