reload1.c (reload): Fix previous change.

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

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

From-SVN: r73687

gcc/ChangeLog

+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.

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