diff --git a/gcc/fwprop.cc b/gcc/fwprop.cc
index de543923b92f..11a3dfc9546d 100644
--- a/gcc/fwprop.cc
+++ b/gcc/fwprop.cc
@@ -180,7 +180,7 @@ namespace
 
     bool changed_mem_p () const { return result_flags & CHANGED_MEM; }
     bool folded_to_constants_p () const;
-    bool likely_profitable_p () const;
+    bool profitable_p () const;
 
     bool check_mem (int, rtx) final override;
     void note_simplification (int, uint16_t, rtx, rtx) final override;
@@ -323,7 +323,7 @@ fwprop_propagation::folded_to_constants_p () const
    false if it would increase the complexity of the pattern too much.  */
 
 bool
-fwprop_propagation::likely_profitable_p () const
+fwprop_propagation::profitable_p () const
 {
   if (changed_mem_p ())
     return true;
@@ -398,7 +398,7 @@ try_fwprop_subst_note (insn_info *use_insn, set_info *def,
     }
   else
     {
-      if (!prop.folded_to_constants_p () && !prop.likely_profitable_p ())
+      if (!prop.folded_to_constants_p () && !prop.profitable_p ())
 	{
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    fprintf (dump_file, "cannot propagate from insn %d into"
@@ -449,11 +449,7 @@ try_fwprop_subst_pattern (obstack_watermark &attempt, insn_change &use_change,
   if (prop.num_replacements == 0)
     return false;
 
-  if (!prop.likely_profitable_p ()
-      && (prop.changed_mem_p ()
-	  || contains_mem_rtx_p (src)
-	  || use_insn->is_asm ()
-	  || !single_set (use_rtl)))
+  if (!prop.profitable_p ())
     {
       if (dump_file && (dump_flags & TDF_DETAILS))
 	fprintf (dump_file, "cannot propagate from insn %d into"
@@ -485,8 +481,7 @@ try_fwprop_subst_pattern (obstack_watermark &attempt, insn_change &use_change,
 	redo_changes (0);
 	auto new_cost = set_src_cost (SET_SRC (use_set),
 				      GET_MODE (SET_DEST (use_set)), speed);
-	if (new_cost > old_cost
-	    || (new_cost == old_cost && !prop.likely_profitable_p ()))
+	if (new_cost > old_cost)
 	  {
 	    if (dump_file)
 	      fprintf (dump_file, "change not profitable"
diff --git a/gcc/testsuite/gcc.target/i386/pr111267.c b/gcc/testsuite/gcc.target/i386/pr111267.c
deleted file mode 100644
index e3d549d8cbaf..000000000000
--- a/gcc/testsuite/gcc.target/i386/pr111267.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2" } */
-struct S { float a, b, c, d; };
-
-int
-bar (struct S x, struct S y)
-{
-  return x.b <= y.d && x.c >= y.a;
-}
-
-/* { dg-final { scan-assembler-not "movq" } } */
-/* { dg-final { scan-assembler-not "xchgq" } } */
-/* { dg-final { scan-assembler-not "shrq" } } */
-/* { dg-final { scan-assembler-not "movd" } } */