2004-03-01 Paolo Bonzini <bonzini@gnu.org>

[pf3gnuchains/gcc-fork.git] / gcc / cfganal.c

diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 91297e5..00771b4 100644 (file)
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -1,6 +1,6 @@
 /* Control flow graph analysis code for GNU compiler.
    Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -333,6 +333,7 @@ flow_call_edges_add (sbitmap blocks)
   for (i = 0; i < last_bb; i++)
     {
       basic_block bb = BASIC_BLOCK (i);
+      rtx libcall_end = NULL_RTX;
       rtx insn;
       rtx prev_insn;
 
@@ -350,9 +351,13 @@ flow_call_edges_add (sbitmap blocks)
              edge e;
              rtx split_at_insn = insn;
 
+             /* Don't split libcalls.  */
+             if (libcall_end)
+               split_at_insn = libcall_end;
+
              /* Don't split the block between a call and an insn that should
                 remain in the same block as the call.  */
-             if (GET_CODE (insn) == CALL_INSN)
+             else if (GET_CODE (insn) == CALL_INSN)
                while (split_at_insn != BB_END (bb)
                       && keep_with_call_p (NEXT_INSN (split_at_insn)))
                  split_at_insn = NEXT_INSN (split_at_insn);
@@ -381,6 +386,14 @@ flow_call_edges_add (sbitmap blocks)
              make_edge (bb, EXIT_BLOCK_PTR, EDGE_FAKE);
            }
 
+         /* Watch out for REG_LIBCALL/REG_RETVAL notes so that we know
+            whether we are currently in a libcall or not.  Remember that
+            we are scanning backwards!  */
+         if (find_reg_note (insn, REG_RETVAL, NULL_RTX))
+           libcall_end = insn;
+         if (find_reg_note (insn, REG_LIBCALL, NULL_RTX))
+           libcall_end = NULL_RTX;
+
          if (insn == BB_HEAD (bb))
            break;
        }