aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@gcc.gnu.org>2018-03-20 18:07:57 +0000
committerAldy Hernandez <aldyh@gcc.gnu.org>2018-03-20 18:07:57 +0000
commit75e06b71300cd907fa4c40f83563bd0151a6d691 (patch)
treebb097a7a44f5692fb4a5fa83856f64e07843f6ac
parent7e73c7cb307e2e837639501b66e2ed306a3c2ea7 (diff)
downloadgcc-75e06b71300cd907fa4c40f83563bd0151a6d691.zip
gcc-75e06b71300cd907fa4c40f83563bd0151a6d691.tar.gz
gcc-75e06b71300cd907fa4c40f83563bd0151a6d691.tar.bz2
Fix fallout from merge with Aldy's threader branch.
From-SVN: r258690
-rw-r--r--gcc/ssa-range-bb.c19
-rw-r--r--gcc/ssa-range-bb.h1
2 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ssa-range-bb.c b/gcc/ssa-range-bb.c
index e26a230..a288037 100644
--- 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 89267ca..ce42d43 100644
--- 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);
};