Skip to content

goto-instrument: Remove inline asm before doing various operations #2029

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.

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
Jun 5, 2018
Merged
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions src/goto-instrument/goto_instrument_parse_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,8 @@ void goto_instrument_parse_optionst::do_indirect_call_and_rtti_removal(
cmdline.isset("pointer-check"));
status() << "Virtual function removal" << eom;
remove_virtual_functions(goto_model);
status() << "Cleaning inline assembler statements" << eom;
remove_asm(goto_model);
}

/// Remove function pointers that can be resolved by analysing const variables
Expand Down Expand Up @@ -1184,12 +1186,6 @@ void goto_instrument_parse_optionst::instrument_goto_program()

if(cmdline.isset("mm"))
{
// TODO: move to wmm/weak_mem, and copy goto_functions AFTER some of the
// modifications. Do the analysis on the copy, after remove_asm, and
// instrument the original (without remove_asm)
remove_asm(goto_model);
goto_model.goto_functions.update();

std::string mm=cmdline.get_value("mm");
memory_modelt model;

Expand Down