Skip to content

Use goto_programt::make_X factories in two places #4003

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
Jan 31, 2019
Merged

Use goto_programt::make_X factories in two places #4003

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
22 changes: 9 additions & 13 deletions src/goto-programs/goto_convert_exceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ void goto_convertt::convert_msc_leave(
convert(d_code, dest, mode);
}

goto_programt::targett t=dest.add_instruction();
t->make_goto(targets.leave_target);
t->source_location=code.source_location();
dest.add(
goto_programt::make_goto(targets.leave_target, code.source_location()));
}

void goto_convertt::convert_try_catch(
Expand All @@ -112,8 +111,7 @@ void goto_convertt::convert_try_catch(

// add a SKIP target for the end of everything
goto_programt end;
goto_programt::targett end_target=end.add_instruction();
end_target->make_skip();
goto_programt::targett end_target = end.add(goto_programt::make_skip());

// the first operand is the 'try' block
convert(to_code(code.op0()), dest, mode);
Expand All @@ -124,7 +122,7 @@ void goto_convertt::convert_try_catch(
catch_pop_instruction->code=code_pop_catcht();

// add a goto to the end of the 'try' block
dest.add_instruction()->make_goto(end_target);
dest.add(goto_programt::make_goto(end_target));

for(std::size_t i=1; i<code.operands().size(); i++)
{
Expand All @@ -140,7 +138,7 @@ void goto_convertt::convert_try_catch(
dest.destructive_append(tmp);

// add a goto to the end of the 'catch' block
dest.add_instruction()->make_goto(end_target);
dest.add(goto_programt::make_goto(end_target));
}

catch_push_instruction->code=push_catch_code;
Expand Down Expand Up @@ -205,19 +203,17 @@ void goto_convertt::convert_CPROVER_throw(
code.source_location(), targets.throw_stack_size, dest, mode);

// add goto
goto_programt::targett t=dest.add_instruction();
t->make_goto(targets.throw_target);
t->source_location=code.source_location();
dest.add(
goto_programt::make_goto(targets.throw_target, code.source_location()));
}
else // otherwise, we do a return
{
// need to process destructor stack
unwind_destructor_stack(code.source_location(), 0, dest, mode);

// add goto
goto_programt::targett t=dest.add_instruction();
t->make_goto(targets.return_target);
t->source_location=code.source_location();
dest.add(
goto_programt::make_goto(targets.return_target, code.source_location()));
}
}

Expand Down
12 changes: 4 additions & 8 deletions src/goto-programs/goto_inline_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ void goto_inlinet::parameter_assignments(
{
const symbolt &symbol=ns.lookup(identifier);

goto_programt::targett decl=dest.add_instruction();
decl->make_decl();
decl->code=code_declt(symbol.symbol_expr());
goto_programt::targett decl = dest.add(
goto_programt::make_decl(symbol.symbol_expr(), source_location));
decl->code.add_source_location()=source_location;
decl->source_location=source_location;
decl->function=adjust_function?target->function:function_name;
}

Expand Down Expand Up @@ -169,11 +167,9 @@ void goto_inlinet::parameter_destruction(
{
const symbolt &symbol=ns.lookup(identifier);

goto_programt::targett dead=dest.add_instruction();
dead->make_dead();
dead->code=code_deadt(symbol.symbol_expr());
goto_programt::targett dead = dest.add(
goto_programt::make_dead(symbol.symbol_expr(), source_location));
dead->code.add_source_location()=source_location;
dead->source_location=source_location;
dead->function=adjust_function?target->function:function_name;
}
}
Expand Down