Skip to content

cfgt: introduce and use a public interface when interacting with the entry map [blocks: 5049, 5059] #5051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2019
Merged

cfgt: introduce and use a public interface when interacting with the entry map [blocks: 5049, 5059] #5051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions jbmc/src/java_bytecode/java_local_variable_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ struct procedure_local_cfg_baset<
: public grapht<
cfg_base_nodet<T, java_bytecode_convert_methodt::method_offsett>>
{
typedef grapht<
cfg_base_nodet<T, java_bytecode_convert_methodt::method_offsett>>
base_grapht;
typedef typename base_grapht::nodet nodet;
typedef java_bytecode_convert_methodt::method_with_amapt method_with_amapt;
typedef std::map<java_bytecode_convert_methodt::method_offsett,
java_bytecode_convert_methodt::method_offsett>
Expand Down Expand Up @@ -85,6 +89,23 @@ struct procedure_local_cfg_baset<
}
}

java_bytecode_convert_methodt::method_offsett get_node_index(
const java_bytecode_convert_methodt::method_offsett &instruction) const
{
return entry_map.at(instruction);
}

nodet &
get_node(const java_bytecode_convert_methodt::method_offsett &instruction)
{
return (*this)[get_node_index(instruction)];
}
const nodet &get_node(
const java_bytecode_convert_methodt::method_offsett &instruction) const
{
return (*this)[get_node_index(instruction)];
}

static java_bytecode_convert_methodt::method_offsett
get_first_node(const method_with_amapt &args)
{
Expand Down
10 changes: 5 additions & 5 deletions src/analyses/cfg_dominators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ class cfg_dominators_templatet
/// for \p program_point
const typename cfgt::nodet &get_node(const T &program_point) const
{
return cfg[cfg.entry_map.at(program_point)];
return cfg.get_node(program_point);
}

/// Get the graph node (which gives dominators, predecessors and successors)
/// for \p program_point
typename cfgt::nodet &get_node(const T &program_point)
{
return cfg[cfg.entry_map.at(program_point)];
return cfg.get_node(program_point);
}

/// Returns true if the program point corresponding to \p rhs_node is
Expand Down Expand Up @@ -149,7 +149,7 @@ void cfg_dominators_templatet<P, T, post_dom>::fixedpoint(P &program)
entry_node = cfgt::get_last_node(program);
else
entry_node = cfgt::get_first_node(program);
typename cfgt::nodet &n=cfg[cfg.entry_map[entry_node]];
typename cfgt::nodet &n = cfg.get_node(entry_node);
n.dominators.insert(entry_node);

for(typename cfgt::edgest::const_iterator
Expand All @@ -165,7 +165,7 @@ void cfg_dominators_templatet<P, T, post_dom>::fixedpoint(P &program)
worklist.pop_front();

bool changed=false;
typename cfgt::nodet &node=cfg[cfg.entry_map[current]];
typename cfgt::nodet &node = cfg.get_node(current);
if(node.dominators.empty())
{
for(const auto &edge : (post_dom ? node.out : node.in))
Expand Down Expand Up @@ -248,7 +248,7 @@ inline void dominators_pretty_print_node(
template <class P, class T, bool post_dom>
void cfg_dominators_templatet<P, T, post_dom>::output(std::ostream &out) const
{
for(const auto &node : cfg.entry_map)
for(const auto &node : cfg.entries())
{
auto n=node.first;

Expand Down
50 changes: 23 additions & 27 deletions src/goto-diff/change_impact.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,26 @@ void full_slicert::operator()(
// declarations or dead instructions may be necessary as well
decl_deadt decl_dead;

for(cfgt::entry_mapt::iterator
e_it=cfg.entry_map.begin();
e_it!=cfg.entry_map.end();
e_it++)
for(const auto &entry : cfg.entries())
{
if(criterion(e_it->first))
add_to_queue(queue, e_it->second, e_it->first);
else if(implicit(e_it->first))
add_to_queue(queue, e_it->second, e_it->first);
else if((e_it->first->is_goto() && e_it->first->guard.is_true()) ||
e_it->first->is_throw())
jumps.push_back(e_it->second);
else if(e_it->first->is_decl())
const auto &instruction = instruction_and_index.first;
const auto instruction_node_index = instruction_and_index.second;
if(criterion(instruction))
add_to_queue(queue, instruction_node_index, instruction);
else if(implicit(instruction))
add_to_queue(queue, instruction_node_index, instruction);
else if((instruction->is_goto() && instruction->guard.is_true()) ||
instruction->is_throw())
jumps.push_back(instruction_node_index);
else if(instruction->is_decl())
{
const auto &s=to_code_decl(e_it->first->code).symbol();
decl_dead[s.get_identifier()].push(e_it->second);
const auto &s=to_code_decl(instruction->code).symbol();
decl_dead[s.get_identifier()].push(instruction_node_index);
}
else if(e_it->first->is_dead())
else if(instruction->is_dead())
{
const auto &s=to_code_dead(e_it->first->code).symbol();
decl_dead[s.get_identifier()].push(e_it->second);
const auto &s=to_code_dead(instruction->code).symbol();
decl_dead[s.get_identifier()].push(instruction_node_index);
}
}

Expand All @@ -105,21 +104,21 @@ void full_slicert::operator()(
{
Forall_goto_program_instructions(i_it, f_it->second.body)
{
const cfgt::entryt &e=cfg.entry_map[i_it];
const auto &node = cfg.get_node(i_it);
if(!i_it->is_end_function() && // always retained
!cfg[e].node_required)
!node.node_required)
i_it->make_skip();
#ifdef DEBUG_FULL_SLICERT
else
{
std::string c="ins:"+std::to_string(i_it->location_number);
c+=" req by:";
for(std::set<unsigned>::const_iterator
req_it=cfg[e].required_by.begin();
req_it!=cfg[e].required_by.end();
req_it=node.required_by.begin();
req_it!=node.required_by.end();
++req_it)
{
if(req_it!=cfg[e].required_by.begin())
if(req_it!=node.required_by.begin())
c+=",";
c+=std::to_string(*req_it);
}
Expand All @@ -144,13 +143,10 @@ void full_slicert::fixedpoint(
{
std::vector<cfgt::entryt> dep_node_to_cfg;
dep_node_to_cfg.reserve(dep_graph.size());

for(unsigned i=0; i<dep_graph.size(); ++i)
{
cfgt::entry_mapt::const_iterator entry=
cfg.entry_map.find(dep_graph[i].PC);
assert(entry!=cfg.entry_map.end());

dep_node_to_cfg.push_back(entry->second);
dep_node_to_cfg.push_back(cfg.get_node_index(dep_graph[i].PC));
}

// process queue until empty
Expand Down
10 changes: 5 additions & 5 deletions src/goto-instrument/count_eloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ void print_path_lengths(const goto_modelt &goto_model)

const goto_programt &start_program=start->second.body;

const cfgt::entryt &start_node=
cfg.entry_map[start_program.instructions.begin()];
const cfgt::entryt &last_node=
cfg.entry_map[--start_program.instructions.end()];
const cfgt::entryt &start_node =
cfg.get_node_index(start_program.instructions.begin());
const cfgt::entryt &last_node =
cfg.get_node_index(--start_program.instructions.end());

cfgt::patht shortest_path;
cfg.shortest_path(start_node, last_node, shortest_path);
Expand All @@ -123,7 +123,7 @@ void print_path_lengths(const goto_modelt &goto_model)
if(i_it->is_backwards_goto() ||
i_it==gf_it->second.body.instructions.begin())
{
const cfgt::entryt &node=cfg.entry_map[i_it];
const cfgt::entryt &node = cfg.get_node_index(i_it);
cfgt::patht loop;
cfg.shortest_loop(node, loop);

Expand Down
86 changes: 34 additions & 52 deletions src/goto-instrument/full_slicer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,9 @@ void full_slicert::add_function_calls(
goto_programt::const_targett begin_function=
f_it->second.body.instructions.begin();

cfgt::entry_mapt::const_iterator entry=
cfg.entry_map.find(begin_function);
assert(entry!=cfg.entry_map.end());

for(cfgt::edgest::const_iterator
it=cfg[entry->second].in.begin();
it!=cfg[entry->second].in.end();
++it)
add_to_queue(queue, it->first, node.PC);
const auto &entry = cfg.get_node(begin_function);
for(const auto &in_edge : entry.in)
add_to_queue(queue, in_edge.first, node.PC);
}

void full_slicert::add_decl_dead(
Expand Down Expand Up @@ -135,11 +129,7 @@ void full_slicert::add_jumps(
goto_programt::const_targett lex_succ=j.PC;
for( ; !lex_succ->is_end_function(); ++lex_succ)
{
cfgt::entry_mapt::const_iterator entry=
cfg.entry_map.find(lex_succ);
assert(entry!=cfg.entry_map.end());

if(cfg[entry->second].node_required)
if(cfg.get_node(lex_succ).node_required)
break;
}
if(lex_succ->is_end_function())
Expand Down Expand Up @@ -170,13 +160,10 @@ void full_slicert::add_jumps(
d_it != j_PC_node.dominators.end();
++d_it)
{
cfgt::entry_mapt::const_iterator entry=
cfg.entry_map.find(*d_it);
assert(entry!=cfg.entry_map.end());

if(cfg[entry->second].node_required)
const auto &node = cfg.get_node(*d_it);
if(node.node_required)
{
const irep_idt &id2 = cfg[entry->second].function_id;
const irep_idt &id2 = node.function_id;
INVARIANT(id==id2,
"goto/jump expected to be within a single function");

Expand Down Expand Up @@ -209,14 +196,9 @@ void full_slicert::fixedpoint(
{
std::vector<cfgt::entryt> dep_node_to_cfg;
dep_node_to_cfg.reserve(dep_graph.size());
for(dependence_grapht::node_indext i=0; i<dep_graph.size(); ++i)
{
cfgt::entry_mapt::const_iterator entry=
cfg.entry_map.find(dep_graph[i].PC);
assert(entry!=cfg.entry_map.end());

dep_node_to_cfg.push_back(entry->second);
}
for(dependence_grapht::node_indext i = 0; i < dep_graph.size(); ++i)
dep_node_to_cfg.push_back(cfg.get_node_index(dep_graph[i].PC));

// process queue until empty
while(!queue.empty())
Expand Down Expand Up @@ -279,7 +261,7 @@ void full_slicert::operator()(
forall_goto_functions(f_it, goto_functions)
{
forall_goto_program_instructions(i_it, f_it->second.body)
cfg[cfg.entry_map[i_it]].function_id = f_it->first;
cfg.get_node(i_it).function_id = f_it->first;
}

// fill queue with according to slicing criterion
Expand All @@ -289,28 +271,27 @@ void full_slicert::operator()(
// declarations or dead instructions may be necessary as well
decl_deadt decl_dead;

for(cfgt::entry_mapt::iterator
e_it=cfg.entry_map.begin();
e_it!=cfg.entry_map.end();
e_it++)
for(const auto &instruction_and_index : cfg.entries())
{
if(criterion(cfg[e_it->second].function_id, e_it->first))
add_to_queue(queue, e_it->second, e_it->first);
else if(implicit(e_it->first))
add_to_queue(queue, e_it->second, e_it->first);
const auto &instruction = instruction_and_index.first;
const auto instruction_node_index = instruction_and_index.second;
if(criterion(cfg[instruction_node_index].function_id, instruction))
add_to_queue(queue, instruction_node_index, instruction);
else if(implicit(instruction))
add_to_queue(queue, instruction_node_index, instruction);
else if(
(e_it->first->is_goto() && e_it->first->get_condition().is_true()) ||
e_it->first->is_throw())
jumps.push_back(e_it->second);
else if(e_it->first->is_decl())
(instruction->is_goto() && instruction->get_condition().is_true()) ||
instruction->is_throw())
jumps.push_back(instruction_node_index);
else if(instruction->is_decl())
{
const auto &s = to_code_decl(e_it->first->code).symbol();
decl_dead[s.get_identifier()].push(e_it->second);
const auto &s = to_code_decl(instruction->code).symbol();
decl_dead[s.get_identifier()].push(instruction_node_index);
}
else if(e_it->first->is_dead())
else if(instruction->is_dead())
{
const auto &s = to_code_dead(e_it->first->code).symbol();
decl_dead[s.get_identifier()].push(e_it->second);
const auto &s = to_code_dead(instruction->code).symbol();
decl_dead[s.get_identifier()].push(instruction_node_index);
}
}

Expand All @@ -329,9 +310,10 @@ void full_slicert::operator()(
{
Forall_goto_program_instructions(i_it, f_it->second.body)
{
const cfgt::entryt &e=cfg.entry_map[i_it];
if(!i_it->is_end_function() && // always retained
!cfg[e].node_required)
const auto &cfg_node = cfg.get_node(i_it);
if(
!i_it->is_end_function() && // always retained
!cfg_node.node_required)
{
i_it->turn_into_skip();
}
Expand All @@ -340,12 +322,12 @@ void full_slicert::operator()(
{
std::string c="ins:"+std::to_string(i_it->location_number);
c+=" req by:";
for(std::set<unsigned>::const_iterator
req_it=cfg[e].required_by.begin();
req_it!=cfg[e].required_by.end();
for(std::set<unsigned>::const_iterator req_it =
cfg_node.required_by.begin();
req_it != cfg_node.required_by.end();
++req_it)
{
if(req_it!=cfg[e].required_by.begin())
if(req_it != cfg_node.required_by.begin())
c+=",";
c+=std::to_string(*req_it);
}
Expand Down
7 changes: 2 additions & 5 deletions src/goto-instrument/points_to.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ void points_tot::fixedpoint()
{
added=false;

for(cfgt::entry_mapt::iterator
e_it=cfg.entry_map.begin();
e_it!=cfg.entry_map.end();
e_it++)
for(const auto &instruction_and_entry : cfg.entries())
{
if(transform(cfg[e_it->second]))
if(transform(cfg[instruction_and_entry.second]))
added=true;
}
}
Expand Down
Loading