Skip to content

Commit 6a76ae2

Browse files
committed
Remove goto_check_java
The Java front-end instruments checks via other means. The only remaining use of `goto_check_javat` was handling of the `no-assertions` and `no-assumptions` command-line options, which is now handled by `transform_assertions_assumptions`.
1 parent e616881 commit 6a76ae2

9 files changed

+19
-1753
lines changed

jbmc/src/janalyzer/janalyzer_parse_options.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ void janalyzer_parse_optionst::get_command_line_options(optionst &options)
9393
else
9494
options.set_option("assumptions", true);
9595

96-
// magic error label
97-
if(cmdline.isset("error-label"))
98-
options.set_option("error-label", cmdline.get_values("error-label"));
99-
10096
// Select a specific analysis
10197
if(cmdline.isset("taint"))
10298
{
@@ -791,7 +787,8 @@ void janalyzer_parse_optionst::help()
791787
HELP_SHOW_PROPERTIES
792788
"\n"
793789
"Program instrumentation options:\n"
794-
HELP_GOTO_CHECK_JAVA
790+
" --no-assertions ignore user assertions\n"
791+
" --no-assumptions ignore user assumptions\n"
795792
"\n"
796793
"Other options:\n"
797794
" --version show version and exit\n"

jbmc/src/janalyzer/janalyzer_parse_options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ Author: Daniel Kroening, [email protected]
108108
#include <goto-programs/show_goto_functions.h>
109109
#include <goto-programs/show_properties.h>
110110

111-
#include <java_bytecode/goto_check_java.h>
112111
#include <java_bytecode/java_bytecode_language.h>
113112

114113
class abstract_goto_modelt;
115114
class ai_baset;
115+
class goto_functiont;
116116
class goto_model_functiont;
117117
class optionst;
118118

@@ -127,7 +127,7 @@ class optionst;
127127
"(little-endian)(big-endian)" \
128128
OPT_SHOW_GOTO_FUNCTIONS \
129129
OPT_SHOW_PROPERTIES \
130-
OPT_GOTO_CHECK_JAVA \
130+
"(no-assertions)(no-assumptions)" \
131131
"(show-loops)" \
132132
"(show-symbol-table)(show-parse-tree)" \
133133
"(show-reachable-properties)(property):" \

jbmc/src/java_bytecode/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SRC = assignments_from_json.cpp \
99
expr2java.cpp \
1010
generic_parameter_specialization_map.cpp \
1111
generic_parameter_specialization_map_keys.cpp \
12-
goto_check_java.cpp \
1312
jar_file.cpp \
1413
jar_pool.cpp \
1514
java_bmc_util.cpp \

0 commit comments

Comments
 (0)