diff options
Diffstat (limited to 'gcc/loop-init.c')
| -rw-r--r-- | gcc/loop-init.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gcc/loop-init.c b/gcc/loop-init.c index 6cae157e66d..a04faefaf33 100644 --- a/gcc/loop-init.c +++ b/gcc/loop-init.c @@ -37,6 +37,9 @@ loop_optimizer_init (dumpfile) struct loops *loops = xcalloc (1, sizeof (struct loops)); edge e; + /* Initialize structures for layout changes. */ + cfg_layout_initialize (); + /* Avoid annoying special cases of edges going to exit block. */ for (e = EXIT_BLOCK_PTR->pred; e; e = e->pred_next) @@ -47,9 +50,16 @@ loop_optimizer_init (dumpfile) if (flow_loops_find (loops, LOOP_TREE) <= 1) { + basic_block bb; + /* No loops. */ flow_loops_free (loops); free (loops); + /* Make chain. */ + FOR_EACH_BB (bb) + if (bb->next_bb != EXIT_BLOCK_PTR) + bb->rbi->next = bb->next_bb; + cfg_layout_finalize (); return NULL; } @@ -59,11 +69,8 @@ loop_optimizer_init (dumpfile) free (loops->cfg.dfs_order); loops->cfg.dfs_order = NULL; - /* Initialize structures for layout changes. */ - cfg_layout_initialize (loops); - /* Create pre-headers. */ - create_preheaders (loops, CP_SIMPLE_PREHEADERS | CP_INSIDE_CFGLAYOUT); + create_preheaders (loops, CP_SIMPLE_PREHEADERS); /* Force all latches to have only single successor. */ force_single_succ_latches (loops); @@ -94,7 +101,7 @@ loop_optimizer_finalize (loops, dumpfile) /* Make chain. */ FOR_EACH_BB (bb) if (bb->next_bb != EXIT_BLOCK_PTR) - RBI (bb)->next = bb->next_bb; + bb->rbi->next = bb->next_bb; /* Another dump. */ flow_loops_dump (loops, dumpfile, NULL, 1); |