decl.c: (gnat_to_gnu_entity...

[platform/upstream/gcc.git] / gcc / ssa.c

diff --git a/gcc/ssa.c b/gcc/ssa.c
index 7735786..82be677 100644 (file)
--- a/gcc/ssa.c
+++ b/gcc/ssa.c
@@ -1,20 +1,20 @@
 /* Static Single Assignment conversion routines for the GNU compiler.
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to the Free
+along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
@@ -1498,8 +1498,7 @@ make_regs_equivalent_over_bad_edges (bb, reg_partition)
 
       /* Scan incoming abnormal critical edges.  */
       for (e = b->pred; e; e = e->pred_next)
-       if ((e->flags & (EDGE_ABNORMAL | EDGE_CRITICAL)) 
-               == (EDGE_ABNORMAL | EDGE_CRITICAL))
+       if ((e->flags & EDGE_ABNORMAL) && EDGE_CRITICAL_P (e))
          {
            rtx *alt = phi_alternative (set, e->src->index);
            int alt_regno;
@@ -2122,7 +2121,7 @@ rename_equivalent_regs (reg_partition)
 
                  PATTERN (insn) = XVECEXP (s, 0, slen-1);
                  for (i = 0; i < slen - 1; i++)
-                   emit_block_insn_before (XVECEXP (s, 0, i), insn, b);
+                   emit_insn_before (XVECEXP (s, 0, i), insn);
                }
            }