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

        * reload1.c (reload): Fix previous change.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ab81d7..77ef784 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-17  Eric Christopher  <echristo@redhat.com>
+
+       * reload1.c (reload): Fix previous change.
+
 2003-11-17  Scott Snyder  <snyder@fnal.gov>
 
        PR debug/11325
@@ -92,7 +96,7 @@
        autoconf, automake and perl requirements.  Document required
        gettext version.
 
-2003-11-14  Jason Merrill  <jason@redhat.com>
+<2003-11-14  Jason Merrill  <jason@redhat.com>
 
        * function.c (assign_parms): Use TREE_TYPE to determine the real
        type of the argument object.
@@ -119,7 +123,7 @@
        * config/frv/frv-protos.h: Update for C90.
        * config/frv/frv.h: Likewise.
        * config/frv/frvbegin.c: Likewise.
-       * config/frv/frv.c: Likewise. 
+       * config/frv/frv.c: Likewise.
        (frv_adjust_field_align): Delete unused variable.
 
 2003-11-14  Geoffrey Keating  <geoffk@apple.com>
@@ -165,7 +169,7 @@
 
 2003-11-14  Richard Earnshaw  <rearnsha@arm.com>
 
-       * arm.c (arm_emit_vector_const, arm_output_load_gr): Use ISO C 
+       * arm.c (arm_emit_vector_const, arm_output_load_gr): Use ISO C
        function definition syntax.
 
 2003-11-14  Eric Christopher  <echristo@redhat.com>

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 5851dbf..95f974f 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -915,9 +915,9 @@ reload (rtx first, int global)
            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 (x)
-                     && LEGITIMATE_CONSTANT_P (x)
-                     && PREFERRED_RELOAD_CLASS (x, class) != NO_REGS)
+           else if ((CONSTANT_P (XEXP (x, 0))
+                     && LEGITIMATE_CONSTANT_P (XEXP (x, 0))
+                     && PREFERRED_RELOAD_CLASS (XEXP (x, 0), class) != NO_REGS)
                     || (GET_CODE (XEXP (x, 0)) == REG
                         && REGNO (XEXP (x, 0)) < FIRST_PSEUDO_REGISTER)
                     || (GET_CODE (XEXP (x, 0)) == PLUS