2003-11-19 Eric Christopher <echristo@redhat.com>

        * reload1.c (reload): Revert 2 previous checkins.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73742 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 95f974f..717489f 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -910,24 +910,18 @@ reload (rtx first, int global)
        if (reg_renumber[i] < 0 && reg_equiv_memory_loc[i])
          {
            rtx x = eliminate_regs (reg_equiv_memory_loc[i], 0, NULL_RTX);
-           enum reg_class class = MODE_BASE_REG_CLASS (GET_MODE (x));
 
            if (strict_memory_address_p (GET_MODE (regno_reg_rtx[i]),
                                         XEXP (x, 0)))
              reg_equiv_mem[i] = x, reg_equiv_address[i] = 0;
-           else if ((CONSTANT_P (XEXP (x, 0))
-                     && LEGITIMATE_CONSTANT_P (XEXP (x, 0))
-                     && PREFERRED_RELOAD_CLASS (XEXP (x, 0), class) != NO_REGS)
+           else if (CONSTANT_P (XEXP (x, 0))
                     || (GET_CODE (XEXP (x, 0)) == REG
                         && REGNO (XEXP (x, 0)) < FIRST_PSEUDO_REGISTER)
                     || (GET_CODE (XEXP (x, 0)) == PLUS
                         && GET_CODE (XEXP (XEXP (x, 0), 0)) == REG
                         && (REGNO (XEXP (XEXP (x, 0), 0))
                             < FIRST_PSEUDO_REGISTER)
-                        && (CONSTANT_P (XEXP (XEXP (x, 0), 1))
-                            && LEGITIMATE_CONSTANT_P (XEXP (XEXP (x, 0), 1))
-                            && PREFERRED_RELOAD_CLASS (XEXP (XEXP (x, 0), 1), class)
-                                                           != NO_REGS)))
+                        && CONSTANT_P (XEXP (XEXP (x, 0), 1))))
              reg_equiv_address[i] = XEXP (x, 0), reg_equiv_mem[i] = 0;
            else
              {