diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0340fa32e55..d0112655d3c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -74,11 +74,6 @@
 	* ipa-inline.c (inline_to_all_callers_1):
 	Call ultimate_alias_target for node being inlined.
 
-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 c3edd9ef45d..774d1ff3aaa 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -3243,7 +3243,8 @@ 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)
-	   && !(get_constraint_type (cn) == CT_FIXED_FORM
+	   && !(INSN_CODE (curr_insn) < 0
+		&& get_constraint_type (cn) == CT_FIXED_FORM
 	        && constraint_satisfied_p (op, cn)))
     decompose_mem_address (&ad, op);
   else if (GET_CODE (op) == SUBREG