* (REG_CLASS_FROM_CONSTRAINT): Only define if not already defined.

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

diff --git a/gcc/recog.c b/gcc/recog.c
index 6206be1..8ea1e8d 100644 (file)
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -2883,18 +2883,7 @@ split_all_insns (upd_life)
       find_many_sub_basic_blocks (blocks);
 
       if (old_last_basic_block != last_basic_block && upd_life)
-       {
-         sbitmap new_blocks = sbitmap_alloc (last_basic_block);
-
-         sbitmap_copy (new_blocks, blocks);
-         while (old_last_basic_block < last_basic_block)
-           {
-             SET_BIT (new_blocks, old_last_basic_block);
-             old_last_basic_block++;
-           }
-         sbitmap_free (blocks);
-         new_blocks = blocks;
-       }
+       blocks = sbitmap_resize (blocks, last_basic_block, 1);
     }
 
   if (changed && upd_life)
@@ -3260,8 +3249,8 @@ peephole2_optimize (dump_file)
                                        REG_EH_REGION, NULL_RTX);
 
                  /* Replace the old sequence with the new.  */
-                 try = emit_insn_after_scope (try, peep2_insn_data[i].insn,
-                                              INSN_SCOPE (peep2_insn_data[i].insn));
+                 try = emit_insn_after_setloc (try, peep2_insn_data[i].insn,
+                                               INSN_LOCATOR (peep2_insn_data[i].insn));
                  before_try = PREV_INSN (insn);
                  delete_insn_chain (insn, peep2_insn_data[i].insn);