@@ -135,10 +135,24 @@ void
path_range_query::range_on_path_entry (irange &r, tree name)
{
gcc_checking_assert (defined_outside_path (name));
- int_range_max tmp;
basic_block entry = entry_bb ();
- bool changed = false;
+ // Prefer to use range_of_expr if we have a statement to look at,
+ // since it has better caching than range_on_edge.
+ gimple *last = last_stmt (entry);
+ if (last)
+ {
+ if (m_ranger.range_of_expr (r, name, last))
+ return;
+ gcc_unreachable ();
+ }
+
+ // If we have no statement, look at all the incoming ranges to the
+ // block. This can happen when we're querying a block with only an
+ // outgoing edge (no statement but the fall through edge), but for
+ // which we can determine a range on entry to the block.
+ int_range_max tmp;
+ bool changed = false;
r.set_undefined ();
for (unsigned i = 0; i < EDGE_COUNT (entry->preds); ++i)
{