From 56841f01ec38e019698d4b1d54367e79d313916a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 27 Jan 1998 12:07:36 +0000 Subject: [PATCH] expr.c (cplus_expand_expr, [...]): Don't check that return_target and call_target are equivalent. * expr.c (cplus_expand_expr, AGGR_INIT_EXPR): Don't check that return_target and call_target are equivalent. From-SVN: r17510 --- gcc/cp/ChangeLog | 5 ++++- gcc/cp/expr.c | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4230426b2da..4830897654c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,7 +1,10 @@ Tue Jan 27 01:44:02 1998 Jason Merrill + * expr.c (cplus_expand_expr, AGGR_INIT_EXPR): Don't check that + return_target and call_target are equivalent. + * pt.c (type_unification_real): Just accept function parms that - don't use any template parms. + don't use any template parms. Sun Jan 25 03:30:00 1998 Jason Merrill diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c index 266da02e904..a275c8ed5b9 100644 --- a/gcc/cp/expr.c +++ b/gcc/cp/expr.c @@ -125,11 +125,9 @@ cplus_expand_expr (exp, target, tmode, modifier) return_target = expand_call (call_exp, call_target, ignore); if (call_target) - { - my_friendly_assert (rtx_equal_p (call_target, return_target) - || TYPE_HAS_TRIVIAL_INIT_REF (type), 317); - return return_target; - } + /* Trust that the right thing has been done; it's too hard to + verify. */ + return return_target; /* If we're suffering under the ancient PCC_STATIC_STRUCT_RETURN calling convention, we need to copy the return value out of -- 2.43.5