diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 341e9aa434bbb97651eaae187fbc79696eaa7199..b8b116a1a0f834ec44789cd7a15bbd4442063b32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-31  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR middle-end/56113
+	* fwprop.c (fwprop_init): Set up loops without CFG modifications.
+
 2013-01-31  Hiroyuki Ono  <hiroyuki.ono.jc@renesas.com>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index a055fd041e062ad5db7caf4a444661e8069c5074..6a82deabfd10a0a9a828664331117b4e4e44eb0d 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -1404,10 +1404,10 @@ fwprop_init (void)
   calculate_dominance_info (CDI_DOMINATORS);
 
   /* We do not always want to propagate into loops, so we have to find
-     loops and be careful about them.  But we have to call flow_loops_find
-     before df_analyze, because flow_loops_find may introduce new jump
-     insns (sadly) if we are not working in cfglayout mode.  */
-  loop_optimizer_init (0);
+     loops and be careful about them.  Avoid CFG modifications so that
+     we don't have to update dominance information afterwards for
+     build_single_def_use_links.  */
+  loop_optimizer_init (AVOID_CFG_MODIFICATIONS);
 
   build_single_def_use_links ();
   df_set_flags (DF_DEFER_INSN_RESCAN);