Skip to content

JBMC: Remove C-only passes #1715

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 10, 2018
Merged

JBMC: Remove C-only passes #1715

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
32 changes: 1 addition & 31 deletions src/jbmc/jbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ Author: Daniel Kroening, [email protected]
#include <goto-programs/instrument_preconditions.h>
#include <goto-programs/goto_convert_functions.h>
#include <goto-programs/goto_inline.h>
#include <goto-programs/link_to_library.h>
#include <goto-programs/loop_ids.h>
#include <goto-programs/remove_function_pointers.h>
#include <goto-programs/remove_virtual_functions.h>
#include <goto-programs/remove_instanceof.h>
#include <goto-programs/remove_returns.h>
#include <goto-programs/remove_exceptions.h>
#include <goto-programs/remove_vector.h>
#include <goto-programs/remove_complex.h>
#include <goto-programs/remove_asm.h>
#include <goto-programs/remove_unused_functions.h>
#include <goto-programs/remove_skip.h>
Expand All @@ -48,11 +44,8 @@ Author: Daniel Kroening, [email protected]
#include <goto-programs/show_goto_functions.h>
#include <goto-programs/show_symbol_table.h>
#include <goto-programs/show_properties.h>
#include <goto-programs/string_abstraction.h>
#include <goto-programs/string_instrumentation.h>
#include <goto-programs/remove_java_new.h>

#include <goto-symex/rewrite_union.h>
#include <goto-symex/adjust_float_expressions.h>

#include <goto-instrument/full_slicer.h>
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/jbmc/jbmc_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" \
Expand Down