optabs.c (prepare_cmp_insn): Merge a couple of conditional blocks.

	* optabs.c (prepare_cmp_insn): Merge a couple of conditional blocks.
	* sched-rgn.c (compute_trg_info): Zero 'el' local variable.
	* tree-if-conv.c (process_phi_nodes): Zero 'cond' local variable.

From-SVN: r129830

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e87bbf2..a39ef31 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * optabs.c (prepare_cmp_insn): Merge a couple of conditional blocks.
+       * sched-rgn.c (compute_trg_info): Zero 'el' local variable.
+       * tree-if-conv.c (process_phi_nodes): Zero 'cond' local variable.
+
 2007-11-01  Nathan Sidwell  <nathan@codesourcery.com>
 
        * gcc.c (getenv_spec_function): Escape the environment variable's

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 3344b2c..6917796 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4275,16 +4275,15 @@ prepare_cmp_insn (rtx *px, rtx *py, enum rtx_code *pcomparison, rtx size,
   if (libfunc && !SCALAR_FLOAT_MODE_P (mode))
     {
       rtx result;
-      rtx ulibfunc;
 
       /* If we want unsigned, and this mode has a distinct unsigned
         comparison routine, use that.  */
       if (unsignedp)
        {
-         ulibfunc = optab_libfunc (ucmp_optab, mode);
+         rtx ulibfunc = optab_libfunc (ucmp_optab, mode);
+         if (ulibfunc)
+           libfunc = ulibfunc;
        }
-      if (unsignedp && ulibfunc)
-       libfunc = ulibfunc;
 
       result = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST_MAKE_BLOCK,
                                        targetm.libgcc_cmp_return_mode (),

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 0ca1a47..12f2e66 100644 (file)
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -1341,7 +1341,7 @@ static void
 compute_trg_info (int trg)
 {
   candidate *sp;
-  edgelst el;
+  edgelst el = { NULL, 0 };
   int i, j, k, update_idx;
   basic_block block;
   sbitmap visited;

diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 9d2fe26..324fc93 100644 (file)
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -873,7 +873,7 @@ process_phi_nodes (struct loop *loop)
   /* Replace phi nodes with cond. modify expr.  */
   for (i = 1; i < orig_loop_num_nodes; i++)
     {
-      tree phi, cond;
+      tree phi, cond = NULL_TREE;
       block_stmt_iterator bsi;
       basic_block true_bb = NULL;
       bb = ifc_bbs[i];