* config/arm/arm.c (thumb1_size_rtx_costs) <SET>: Add missing guard.

From-SVN: r239888

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54f2f7a33ba469be1dfd1c01dc10421a852553fb..e9dd53779c808daa41f6e89b4e7231b67b9931a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-31  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * config/arm/arm.c (thumb1_size_rtx_costs) <SET>: Add missing guard.
+
 2016-08-30  David Malcolm  <dmalcolm@redhat.com>
 
        * diagnostic-show-locus.c (colorizer::begin_state): Support more

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 43a832eeb5cb4ba4642e9388c022c196130af04d..946f308ca84e232af8af6eca4813464914cbd59c 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -9127,7 +9127,8 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer)
       if (satisfies_constraint_J (SET_SRC (x))
          || satisfies_constraint_K (SET_SRC (x))
             /* Too big an immediate for a 2-byte mov, using MOVT.  */
-         || (UINTVAL (SET_SRC (x)) >= 256
+         || (CONST_INT_P (SET_SRC (x))
+             && UINTVAL (SET_SRC (x)) >= 256
              && TARGET_HAVE_MOVT
              && satisfies_constraint_j (SET_SRC (x)))
             /* thumb1_movdi_insn.  */