fixup! arc: check if the addend fits when referencing small data memory

Author: MichielDerhaeg

gcc/config/arc/arc.cc

@@ -386,8 +386,9 @@ legitimate_small_data_address_p (rtx x, machine_mode mode)
       return SYMBOL_REF_SMALL_P (x);
     case PLUS:
       {
-	bool p0 = (GET_CODE (XEXP (x, 0)) == SYMBOL_REF)
-	  && SYMBOL_REF_SMALL_P (XEXP (x, 0));
+	if ((GET_CODE (XEXP (x, 0)) != SYMBOL_REF)
+	    || !SYMBOL_REF_SMALL_P (XEXP (x, 0)))
+	  return false;
 
 	/* If no constant then we cannot do small data.  */
 	if (!CONST_INT_P (XEXP (x, 1)))
@@ -402,11 +403,11 @@ legitimate_small_data_address_p (rtx x, machine_mode mode)
 	switch (size)
 	  {
 	  case 1:
-	    if (p0) break;
+	    break;
 	  case 2:
-	    if (p0 && ((offset & 0x1) == 0)) break;
+	    if ((offset & 0x1) == 0) break; else return false;
 	  case 4:
-	    if (p0 && ((offset & 0x3) == 0)) break;
+	    if ((offset & 0x3) == 0) break; else return false;
 	  default:
 	    return false;
 	  }