From a9772b60f3716f6f82d695bd0fc0300b87ca0b89 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 16 Apr 2002 08:09:39 +0200 Subject: [PATCH] re PR middle-end/6279 (gcc-3.1 miscompiles qmake on IA-64) PR middle-end/6279 * expr.c (store_expr): Don't copy if DECL_RTL (exp) == target. * expr.c (safe_from_p): Cleanup: use DECL_RTL_IF_SET. From-SVN: r52356 --- gcc/ChangeLog | 7 +++++++ gcc/expr.c | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 83627779e07..6fc0b2454dc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2002-04-16 Jakub Jelinek + + PR middle-end/6279 + * expr.c (store_expr): Don't copy if DECL_RTL (exp) == target. + + * expr.c (safe_from_p): Cleanup: use DECL_RTL_IF_SET. + 2002-04-15 Richard Henderson * config/mips/abi64.h (SUBTARGET_CONDITIONAL_REGISTER_USAGE): Set diff --git a/gcc/expr.c b/gcc/expr.c index c5b1eced98d..55002afc58f 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4125,7 +4125,12 @@ store_expr (exp, target, want_value) || (temp != target && (side_effects_p (temp) || side_effects_p (target)))) && TREE_CODE (exp) != ERROR_MARK - && ! dont_store_target) + && ! dont_store_target + /* If store_expr stores a DECL whose DECL_RTL(exp) == TARGET, + but TARGET is not valid memory reference, TEMP will differ + from TARGET although it is really the same location. */ + && (TREE_CODE_CLASS (TREE_CODE (exp)) != 'd' + || target != DECL_RTL_IF_SET (exp))) { target = protect_from_queue (target, 1); if (GET_MODE (temp) != GET_MODE (target) @@ -5598,7 +5603,7 @@ safe_from_p (x, exp, top_p) switch (TREE_CODE_CLASS (TREE_CODE (exp))) { case 'd': - exp_rtl = DECL_RTL_SET_P (exp) ? DECL_RTL (exp) : NULL_RTX; + exp_rtl = DECL_RTL_IF_SET (exp); break; case 'c': -- 2.30.2