diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03bc5727c23..d8fafe03bce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-04  Thomas Preud'homme  <thomas.preudhomme@linaro.org>
+
+	* lra-constraints.c (process_address_1): Bail out for all
+	satisfied fixed constraints.
+
 2018-10-03  Jeff Law  <law@redhat.com>
 
         * gimple-ssa-sprintf.c (format_string): Do not hardcode size of
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 774d1ff3aaa..c3edd9ef45d 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -3243,8 +3243,7 @@ process_address_1 (int nop, bool check_only_p,
   /* Do not attempt to decompose arbitrary addresses generated by combine
      for asm operands with loose constraints, e.g 'X'.  */
   else if (MEM_P (op)
-	   && !(INSN_CODE (curr_insn) < 0
-		&& get_constraint_type (cn) == CT_FIXED_FORM
+	   && !(get_constraint_type (cn) == CT_FIXED_FORM
 	        && constraint_satisfied_p (op, cn)))
     decompose_mem_address (&ad, op);
   else if (GET_CODE (op) == SUBREG