diff --git a/src/jbmc/jbmc_parse_options.cpp b/src/jbmc/jbmc_parse_options.cpp index e406a373c46..eaa16574045 100644 --- a/src/jbmc/jbmc_parse_options.cpp +++ b/src/jbmc/jbmc_parse_options.cpp @@ -30,15 +30,11 @@ Author: Daniel Kroening, kroening@kroening.com #include #include #include -#include #include -#include #include #include #include #include -#include -#include #include #include #include @@ -48,11 +44,8 @@ Author: Daniel Kroening, kroening@kroening.com #include #include #include -#include -#include #include -#include #include #include @@ -678,18 +671,7 @@ bool jbmc_parse_optionst::process_goto_functions( { remove_java_new(goto_model, get_message_handler()); - // add the library - link_to_library(goto_model, get_message_handler()); - - if(cmdline.isset("string-abstraction")) - string_instrumentation(goto_model, get_message_handler()); - - // remove function pointers - status() << "Removal of function pointers and virtual functions" << eom; - remove_function_pointers( - get_message_handler(), - goto_model, - cmdline.isset("pointer-check")); + status() << "Removal of virtual functions" << eom; // Java virtual functions -> explicit dispatch tables: remove_virtual_functions(goto_model); // remove catch and throw (introduces instanceof) @@ -702,9 +684,6 @@ bool jbmc_parse_optionst::process_goto_functions( // remove returns, gcc vectors, complex remove_returns(goto_model); - remove_vector(goto_model); - remove_complex(goto_model); - rewrite_union(goto_model); // Similar removal of java nondet statements: // TODO Should really get this from java_bytecode_language somehow, but we @@ -746,14 +725,6 @@ bool jbmc_parse_optionst::process_goto_functions( nondet_static(goto_model); } - if(cmdline.isset("string-abstraction")) - { - status() << "String Abstraction" << eom; - string_abstraction( - goto_model, - get_message_handler()); - } - // add failed symbols // needs to be done before pointer analysis add_failed_symbols(goto_model.symbol_table); @@ -884,7 +855,6 @@ void jbmc_parse_optionst::help() " --stop-on-fail stop analysis once a failed property is detected\n" // NOLINT(*) " --trace give a counterexample trace for failed properties\n" //NOLINT(*) "\n" - " --no-library disable built-in abstract Java library\n" HELP_FUNCTIONS "\n" "Program representations:\n" diff --git a/src/jbmc/jbmc_parse_options.h b/src/jbmc/jbmc_parse_options.h index 5c722e0821a..2b8794279a4 100644 --- a/src/jbmc/jbmc_parse_options.h +++ b/src/jbmc/jbmc_parse_options.h @@ -52,13 +52,13 @@ class optionst; "(show-properties)" \ "(drop-unused-functions)" \ "(property):(stop-on-fail)(trace)" \ - "(verbosity):(no-library)" \ + "(verbosity):" \ "(version)" \ "(cover):(symex-coverage-report):" \ "(i386-linux)(i386-macos)(i386-win32)(win32)(winx64)" \ "(ppc-macos)" \ "(arrays-uf-always)(arrays-uf-never)" \ - "(string-abstraction)(no-arch)(arch):" \ + "(no-arch)(arch):" \ "(graphml-witness):" \ JAVA_BYTECODE_LANGUAGE_OPTIONS \ "(java-unwind-enum-static)" \