mode-switching.c (create_pre_exit): Don't search past calls.

gcc/
	* mode-switching.c (create_pre_exit): Don't search past calls.

From-SVN: r127092

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8323fae31f51ac5995cab95de7f4cd972b2b473f..1f03151f051cb55d0d1199a4c8d5174ada24bd9c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-31  Richard Sandiford  <richard@codesourcery.com>
+
+       * mode-switching.c (create_pre_exit): Don't search past calls.
+
 2007-07-31  Sandra Loosemore  <sandra@codesourcery.com>
 
        * config/mips/mips.h (ISA_HAS_SYNCI):  Add !TARGET_MIPS16 test.

diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 9667d965a27bd985a84a4bddb443f1b080e2660a..dc05208d3cdd98f7ff78ddd95bcb098dcecb70d7 100644 (file)
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -245,6 +245,17 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
 
                if (INSN_P (return_copy))
                  {
+                   /* When using SJLJ exceptions, the call to the
+                      unregister function is inserted between the
+                      clobber of the return value and the copy.
+                      We do not want to split the block before this
+                      or any other call; if we have not found the
+                      copy yet, the copy must have been deleted.  */
+                   if (CALL_P (return_copy))
+                     {
+                       short_block = 1;
+                       break;
+                     }
                    return_copy_pat = PATTERN (return_copy);
                    switch (GET_CODE (return_copy_pat))
                      {