re PR rtl-optimization/11350 (undefined labels with -Os -fPIC)

        PR opt/11350
        * cfgcleanup.c (try_optimize_cfg): Suppress tablejump removal
        after reload.
        * cfgrtl.c (rtl_can_merge_blocks, cfglayout_can_merge_blocks,
        rtl_try_redirect_by_replacing_branch): Likewise.

From-SVN: r75968

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index adc7d9bd8b70e8d5d7577e7501a0ec385065bd70..d57fcb051df0f3dfc5b822c6ffa9f3c5449dc5ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-16  Jan Hubicka  <jh@suse.cz>
+
+        PR opt/11350
+        * cfgcleanup.c (try_optimize_cfg): Suppress tablejump removal
+       after reload.
+        * cfgrtl.c (rtl_can_merge_blocks, cfglayout_can_merge_blocks,
+        rtl_try_redirect_by_replacing_branch): Likewise.
+
 2004-01-15  Geoffrey Keating  <geoffk@apple.com>
 
        PR pch/13689

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 3e68cbe3a173d170fe71abb11542d46ee2e879a4..3da1ea5ae59d6207242d5fbacbac3daa146ed5f0 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1766,7 +1766,7 @@ try_optimize_cfg (int mode)
                           /* If the jump insn has side effects,
                              we can't kill the edge.  */
                           && (GET_CODE (BB_END (b)) != JUMP_INSN
-                              || (flow2_completed
+                              || (reload_completed
                                   ? simplejump_p (BB_END (b))
                                   : onlyjump_p (BB_END (b))))
                           && (next = merge_blocks_move (s, b, c, mode)))

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 7839d5bf75097ed027d9ee887919073dc314c139..c1b17455345cebb5775f0fd77f9754f20b3992a1 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -661,7 +661,7 @@ rtl_can_merge_blocks (basic_block a,basic_block b)
          /* If the jump insn has side effects,
             we can't kill the edge.  */
          && (GET_CODE (BB_END (a)) != JUMP_INSN
-             || (flow2_completed
+             || (reload_completed
                  ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a)))));
 }
 \f
@@ -703,7 +703,7 @@ try_redirect_by_replacing_jump (edge e, basic_block target, bool in_cfglayout)
 
   if (tmp || !onlyjump_p (insn))
     return false;
-  if ((!optimize || flow2_completed) && tablejump_p (insn, NULL, NULL))
+  if ((!optimize || reload_completed) && tablejump_p (insn, NULL, NULL))
     return false;
 
   /* Avoid removing branch with side effects.  */
@@ -2607,7 +2607,7 @@ cfg_layout_can_merge_blocks_p (basic_block a, basic_block b)
          /* If the jump insn has side effects,
             we can't kill the edge.  */
          && (GET_CODE (BB_END (a)) != JUMP_INSN
-             || (flow2_completed
+             || (reload_completed
                  ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a)))));
 }