@@ -1398,13 +1398,14 @@ rewind_info_t::add_events_to_path (checker_path *emission_path,
/* exploded_edge's ctor. */
exploded_edge::exploded_edge (exploded_node *src, exploded_node *dest,
+ const extrinsic_state &ext_state,
const superedge *sedge,
const state_change &change,
custom_info_t *custom_info)
: dedge<eg_traits> (src, dest), m_sedge (sedge), m_change (change),
m_custom_info (custom_info)
{
- change.validate (dest->get_state ());
+ change.validate (dest->get_state (), ext_state);
}
/* exploded_edge's dtor. */
@@ -1898,8 +1899,14 @@ exploded_graph::get_or_create_node (const program_point &point,
logger->log ("merging new state with that of EN: %i",
existing_enode->m_index);
- /* Try again for a cache hit. */
+ /* Try again for a cache hit.
+ Whether we get one or not, merged_state's value_ids have no
+ relationship to those of the input state, and thus to those
+ of CHANGE, so we must purge any svalue_ids from *CHANGE. */
ps.set_state (merged_state);
+ if (change)
+ change->on_svalue_purge (svalue_id::from_int (0));
+
if (exploded_node **slot = m_point_and_state_to_node.get (&ps))
{
/* An exploded_node for PS already exists. */
@@ -1910,13 +1917,6 @@ exploded_graph::get_or_create_node (const program_point &point,
per_cs_stats->m_node_reuse_after_merge_count++;
return *slot;
}
-
- /* Otherwise, continue, using the merged state in "ps".
- Given that merged_state's svalue_ids have no relationship
- to those of the input state, and thus to those of CHANGE,
- purge any svalue_ids from *CHANGE. */
- if (change)
- change->on_svalue_purge (svalue_id::from_int (0));
}
else
if (logger)
@@ -1986,7 +1986,8 @@ exploded_graph::add_edge (exploded_node *src, exploded_node *dest,
const state_change &change,
exploded_edge::custom_info_t *custom_info)
{
- exploded_edge *e = new exploded_edge (src, dest, sedge, change, custom_info);
+ exploded_edge *e = new exploded_edge (src, dest, m_ext_state,
+ sedge, change, custom_info);
digraph<eg_traits>::add_edge (e);
return e;
}
@@ -306,6 +306,7 @@ class exploded_edge : public dedge<eg_traits>
};
exploded_edge (exploded_node *src, exploded_node *dest,
+ const extrinsic_state &ext_state,
const superedge *sedge,
const state_change &change,
custom_info_t *custom_info);
@@ -1083,8 +1083,13 @@ state_change::sm_change::on_svalue_purge (svalue_id first_unused_sid)
/* Assert that this object is sane. */
void
-state_change::sm_change::validate (const program_state &new_state) const
+state_change::sm_change::validate (const program_state &new_state,
+ const extrinsic_state &ext_state) const
{
+ gcc_assert ((unsigned)m_sm_idx < ext_state.get_num_checkers ());
+ const state_machine &sm = ext_state.get_sm (m_sm_idx);
+ sm.validate (m_old_state);
+ sm.validate (m_new_state);
m_new_sid.validate (*new_state.m_region_model);
}
@@ -1191,7 +1196,8 @@ state_change::on_svalue_purge (svalue_id first_unused_sid)
/* Assert that this object is sane. */
void
-state_change::validate (const program_state &new_state) const
+state_change::validate (const program_state &new_state,
+ const extrinsic_state &ext_state) const
{
/* Skip this in a release build. */
#if !CHECKING_P
@@ -1200,7 +1206,7 @@ state_change::validate (const program_state &new_state) const
unsigned i;
sm_change *change;
FOR_EACH_VEC_ELT (m_sm_changes, i, change)
- change->validate (new_state);
+ change->validate (new_state, ext_state);
}
#if CHECKING_P
@@ -343,7 +343,8 @@ class state_change
void remap_svalue_ids (const svalue_id_map &map);
int on_svalue_purge (svalue_id first_unused_sid);
- void validate (const program_state &new_state) const;
+ void validate (const program_state &new_state,
+ const extrinsic_state &ext_state) const;
int m_sm_idx;
svalue_id m_new_sid;
@@ -367,7 +368,8 @@ class state_change
void remap_svalue_ids (const svalue_id_map &map);
int on_svalue_purge (svalue_id first_unused_sid);
- void validate (const program_state &new_state) const;
+ void validate (const program_state &new_state,
+ const extrinsic_state &ext_state) const;
private:
auto_vec<sm_change> m_sm_changes;
new file mode 100644
@@ -0,0 +1,2 @@
+#include <stdlib.h>
+#include "../../../gcc.c-torture/execute/pr27073.c"