Fix fallout from merge with Aldy's threader branch.

From-SVN: r258690

diff --git a/gcc/ssa-range-bb.c b/gcc/ssa-range-bb.c
index e26a23070d0e245e0b85b4c14a39cdaefcf51f95..a288037b17088a84aa00d59d4a8ca44277bbb285 100644 (file)
--- a/gcc/ssa-range-bb.c
+++ b/gcc/ssa-range-bb.c
@@ -98,19 +98,18 @@ gori_map::gori_map ()
 
 gori_map::~gori_map ()
 {
-  unsigned x;
-  int bb;
-  for (bb = 0; bb < last_basic_block_for_fn (cfun); ++bb)
+  unsigned x, bb;
+  for (bb = 0; bb < outgoing.length (); ++bb)
     if (outgoing[bb])
       BITMAP_FREE (outgoing[bb]);
   outgoing.release ();
 
-  for (bb = 0; bb < last_basic_block_for_fn (cfun); ++bb)
+  for (bb = 0; bb < incoming.length (); ++bb)
     if (incoming[bb])
       BITMAP_FREE (incoming[bb]);
   incoming.release ();
 
-  for (x = 0; x < num_ssa_names; ++x)
+  for (x = 0; x < def_chain.length (); ++x)
     if (def_chain[x])
       BITMAP_FREE (def_chain[x]);
   def_chain.release ();
@@ -281,9 +280,11 @@ gori_map::dump(FILE *f, basic_block bb)
       return;
     }
 
-  for (x = 1; x< num_ssa_names; x++)
+  for (x = 1; x < num_ssa_names; x++)
     {
       tree name = ssa_name (x);
+      if (!name)
+       continue;
       gimple *stmt = SSA_NAME_DEF_STMT (name);
       if (stmt && gimple_bb (stmt) == bb && def_chain[x] &&
          !bitmap_empty_p (def_chain[x]))
@@ -707,6 +708,12 @@ block_ranger::get_derived_range_stmt (range_stmt& stmt, tree name, basic_block b
 #endif
 
 
+tree
+block_ranger::single_import (tree name)
+{
+  return gori->single_import (name);
+}
+
 bool
 block_ranger::range_p (basic_block bb, tree name)
 {

diff --git a/gcc/ssa-range-bb.h b/gcc/ssa-range-bb.h
index 89267ca2f42ad8dbbcbb519854e05205a253a44a..ce42d432bb22c8cf66606fb5ded4c7872f2f1d6c 100644 (file)
--- a/gcc/ssa-range-bb.h
+++ b/gcc/ssa-range-bb.h
@@ -59,6 +59,7 @@ public:
   bool range_of_def (irange& r, gimple *g, tree name,
                     const irange& range_for_name);
 
+  tree single_import (tree name);
   void dump (FILE *f);
   void exercise (FILE *f);
 };