2010-12-02 Richard Guenther <rguenther@suse.de>

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

diff --git a/gcc/omega.c b/gcc/omega.c
index ff7da4e..fff3a29 100644 (file)
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -5,8 +5,8 @@
    This code has no license restrictions, and is considered public
    domain.
 
-   Changes copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-   Inc.
+   Changes copyright (C) 2005, 2006, 2007, 2008, 2009,
+   2010 Free Software Foundation, Inc.
    Contributed by Sebastian Pop <sebastian.pop@inria.fr>
 
 This file is part of GCC.
@@ -37,8 +37,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "ggc.h"
 #include "tree.h"
-#include "diagnostic.h"
-#include "varray.h"
+#include "diagnostic-core.h"
 #include "tree-pass.h"
 #include "omega.h"
 
@@ -364,7 +363,7 @@ omega_print_vars (FILE *file, omega_pb pb)
 
 /* Debug problem PB.  */
 
-void
+DEBUG_FUNCTION void
 debug_omega_problem (omega_pb pb)
 {
   omega_print_problem (stderr, pb);
@@ -1978,7 +1977,7 @@ resurrect_subs (omega_pb pb)
   if (pb->num_subs > 0
       && please_no_equalities_in_simplified_problems == 0)
     {
-      int i, e, n, m;
+      int i, e, m;
 
       if (dump_file && (dump_flags & TDF_DETAILS))
        {
@@ -1992,7 +1991,6 @@ resurrect_subs (omega_pb pb)
          omega_unprotect_1 (pb, &i, NULL);
 
       m = pb->num_subs;
-      n = MAX (pb->num_vars, pb->safe_vars + m);
 
       for (e = pb->num_geqs - 1; e >= 0; e--)
        if (single_var_geq (&pb->geqs[e], pb->num_vars))
@@ -2215,7 +2213,6 @@ omega_eliminate_redundant (omega_pb pb, bool expensive)
                          || pb->geqs[e3].color == omega_red)
                        goto nextE3;
 
-                     alpha3 = alpha3;
                      /* verify alpha1*v1+alpha2*v2 = alpha3*v3 */
                      for (k = pb->num_vars; k >= 1; k--)
                        if (alpha3 * pb->geqs[e3].coef[k]
@@ -3723,7 +3720,6 @@ omega_solve_geq (omega_pb pb, enum omega_result desired_res)
       int max_splinters = 1;
       bool exact = false;
       bool lucky_exact = false;
-      int neweqns = 0;
       int best = (INT_MAX);
       int j = 0, jLe = 0, jLowerBoundCount = 0;
 
@@ -3862,7 +3858,7 @@ omega_solve_geq (omega_pb pb, enum omega_result desired_res)
              || lucky
              || in_approximate_mode)
            {
-             neweqns = score = upper_bound_count * lower_bound_count;
+             score = upper_bound_count * lower_bound_count;
 
              if (dump_file && (dump_flags & TDF_DETAILS))
                fprintf (dump_file,
@@ -3898,7 +3894,6 @@ omega_solve_geq (omega_pb pb, enum omega_result desired_res)
                         upper_bound_count,
                         lower_bound_count, minC, maxC);
 
-             neweqns = upper_bound_count * lower_bound_count;
              score = maxC - minC;
 
              if (best > score)