From d9beaaeb563bcd99fb1999323604225b0c59d376 Mon Sep 17 00:00:00 2001 From: steven Date: Sat, 13 Jun 2009 23:15:48 +0000 Subject: [PATCH 1/1] * cfgcleanup.c (old_insns_match_p): Remove code to substitute REG_EQUAL/REG_EQUIV notes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148463 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/cfgcleanup.c | 34 ---------------------------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 264e5cc5768..99a578fd768 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-06-14 Steven Bosscher + + * cfgcleanup.c (old_insns_match_p): Remove code to substitute + REG_EQUAL/REG_EQUIV notes. + 2009-06-14 Richard Guenther PR middle-end/40389 diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index a8b38d72472..3d1fbb29701 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -1009,40 +1009,6 @@ old_insns_match_p (int mode ATTRIBUTE_UNUSED, rtx i1, rtx i2) ? rtx_renumbered_equal_p (p1, p2) : rtx_equal_p (p1, p2)) return true; - /* Do not do EQUIV substitution after reload. First, we're undoing the - work of reload_cse. Second, we may be undoing the work of the post- - reload splitting pass. */ - /* ??? Possibly add a new phase switch variable that can be used by - targets to disallow the troublesome insns after splitting. */ - if (!reload_completed) - { - /* The following code helps take care of G++ cleanups. */ - rtx equiv1 = find_reg_equal_equiv_note (i1); - rtx equiv2 = find_reg_equal_equiv_note (i2); - - if (equiv1 && equiv2 - /* If the equivalences are not to a constant, they may - reference pseudos that no longer exist, so we can't - use them. */ - && (! reload_completed - || (CONSTANT_P (XEXP (equiv1, 0)) - && rtx_equal_p (XEXP (equiv1, 0), XEXP (equiv2, 0))))) - { - rtx s1 = single_set (i1); - rtx s2 = single_set (i2); - if (s1 != 0 && s2 != 0 - && rtx_renumbered_equal_p (SET_DEST (s1), SET_DEST (s2))) - { - validate_change (i1, &SET_SRC (s1), XEXP (equiv1, 0), 1); - validate_change (i2, &SET_SRC (s2), XEXP (equiv2, 0), 1); - if (! rtx_renumbered_equal_p (p1, p2)) - cancel_changes (0); - else if (apply_change_group ()) - return true; - } - } - } - return false; } -- 2.11.0