Skip to content

kept consistency between parse options of cbmc and goto-instrument tools for link_to_library call #703

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
Mar 28, 2017
Merged

kept consistency between parse options of cbmc and goto-instrument tools for link_to_library call #703

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
2 changes: 0 additions & 2 deletions src/cbmc/cbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,6 @@ bool cbmc_parse_optionst::process_goto_program(
remove_asm(symbol_table, goto_functions);

// add the library
status() << "Adding CPROVER library ("
<< config.ansi_c.arch << ")" << eom;
link_to_library(symbol_table, goto_functions, ui_message_handler);

if(cmdline.isset("string-abstraction"))
Expand Down
1 change: 0 additions & 1 deletion src/clobber/clobber_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ bool clobber_parse_optionst::get_goto_program(

// finally add the library
#if 0
status() << "Adding CPROVER library" << eom;
link_to_library(symbol_table, goto_functions, ui_message_handler);
#endif

Expand Down
2 changes: 0 additions & 2 deletions src/goto-analyzer/goto_analyzer_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,6 @@ bool goto_analyzer_parse_optionst::process_goto_program(
remove_asm(goto_model);

// add the library
status() << "Adding CPROVER library ("
<< config.ansi_c.arch << ")" << eom;
link_to_library(goto_model, ui_message_handler);
#endif

Expand Down
2 changes: 0 additions & 2 deletions src/goto-diff/goto_diff_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,6 @@ bool goto_diff_parse_optionst::process_goto_program(
remove_asm(symbol_table, goto_functions);

// add the library
status() << "Adding CPROVER library ("
<< config.ansi_c.arch << ")" << eom;
link_to_library(symbol_table, goto_functions, ui_message_handler);

// remove function pointers
Expand Down
2 changes: 1 addition & 1 deletion src/goto-instrument/goto_instrument_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ void goto_instrument_parse_optionst::instrument_goto_program()
cmdline.isset("custom-bitvector-analysis"))
config.ansi_c.defines.push_back("__CPROVER_CUSTOM_BITVECTOR_ANALYSIS");

status() << "Adding CPROVER library" << eom;
// add the library
link_to_library(symbol_table, goto_functions, ui_message_handler);
}

Expand Down
7 changes: 7 additions & 0 deletions src/goto-programs/link_to_library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]

\*******************************************************************/

#include <util/config.h>

#include <ansi-c/cprover_library.h>

#include "link_to_library.h"
Expand Down Expand Up @@ -54,6 +56,11 @@ void link_to_library(
// this needs a fixedpoint, as library functions
// may depend on other library functions

messaget message(message_handler);

message.status() << "Adding CPROVER library ("
<< config.ansi_c.arch << ")" << messaget::eom;

std::set<irep_idt> added_functions;

while(true)
Expand Down
1 change: 0 additions & 1 deletion src/musketeer/musketeer_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ void goto_fence_inserter_parse_optionst::instrument_goto_program(

// we add the library, as some analyses benefit

status() << "Adding CPROVER library" << eom;
link_to_library(symbol_table, goto_functions, ui_message_handler);

namespacet ns(symbol_table);
Expand Down
1 change: 0 additions & 1 deletion src/symex/symex_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ bool symex_parse_optionst::process_goto_program(const optionst &options)
try
{
// we add the library
status() << "Adding CPROVER library" << eom;
link_to_library(goto_model, ui_message_handler);

// do partial inlining
Expand Down