Skip to content

move goto_check_java.h/.cpp to the Java frontend #6507

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
Dec 5, 2021
Merged

move goto_check_java.h/.cpp to the Java frontend #6507

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
3 changes: 1 addition & 2 deletions jbmc/src/janalyzer/janalyzer_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ Author: Daniel Kroening, [email protected]
#include <goto-programs/show_goto_functions.h>
#include <goto-programs/show_properties.h>

#include <analyses/goto_check_java.h>

#include <java_bytecode/goto_check_java.h>
#include <java_bytecode/java_bytecode_language.h>

class abstract_goto_modelt;
Expand Down
1 change: 1 addition & 0 deletions jbmc/src/java_bytecode/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SRC = assignments_from_json.cpp \
expr2java.cpp \
generic_parameter_specialization_map.cpp \
generic_parameter_specialization_map_keys.cpp \
goto_check_java.cpp \
jar_file.cpp \
jar_pool.cpp \
java_bmc_util.cpp \
Expand Down
4 changes: 1 addition & 3 deletions src/analyses/goto_check_java.cpp → jbmc/src/java_bytecode/goto_check_java.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ Author: Daniel Kroening, [email protected]
#include <goto-programs/goto_model.h>
#include <goto-programs/remove_skip.h>

#include "guard.h"
#include "local_bitvector_analysis.h"
#include <analyses/local_bitvector_analysis.h>

class goto_check_javat
{
Expand Down Expand Up @@ -84,7 +83,6 @@ class goto_check_javat
const namespacet &ns;
std::unique_ptr<local_bitvector_analysist> local_bitvector_analysis;
goto_programt::const_targett current_target;
guard_managert guard_manager;
messaget log;

/// Check an address-of expression:
Expand Down
0 src/analyses/goto_check_java.h → jbmc/src/java_bytecode/goto_check_java.h
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions jbmc/src/jbmc/jbmc_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Author: Daniel Kroening, [email protected]

#include <langapi/language.h>

#include <analyses/goto_check_java.h>

#include <goto-checker/bmc_util.h>

#include <goto-programs/class_hierarchy.h>
Expand All @@ -29,6 +27,7 @@ Author: Daniel Kroening, [email protected]

#include <solvers/strings/string_refinement.h>

#include <java_bytecode/goto_check_java.h>
#include <java_bytecode/java_bytecode_language.h>
#include <java_bytecode/java_trace_validation.h>

Expand Down
2 changes: 1 addition & 1 deletion jbmc/src/jdiff/jdiff_parse_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Author: Peter Schrammel
#ifndef CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H
#define CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H

#include <analyses/goto_check_java.h>
#include <java_bytecode/goto_check_java.h>

#include <util/parse_options.h>
#include <util/timestamper.h>
Expand Down
1 change: 0 additions & 1 deletion src/analyses/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ SRC = ai.cpp \
global_may_alias.cpp \
goto_check.cpp \
goto_check_c.cpp \
goto_check_java.cpp \
goto_rw.cpp \
guard_bdd.cpp \
guard_expr.cpp \
Expand Down
8 changes: 0 additions & 8 deletions src/analyses/goto_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Author: Daniel Kroening, [email protected]
#include "goto_check.h"

#include "goto_check_c.h"
#include "goto_check_java.h"

#include <util/symbol.h>

Expand All @@ -30,11 +29,6 @@ void goto_check(
goto_check_c(
function_identifier, goto_function, ns, options, message_handler);
}
else if(function_symbol.mode == ID_java)
{
goto_check_java(
function_identifier, goto_function, ns, options, message_handler);
}
}

void goto_check(
Expand All @@ -44,7 +38,6 @@ void goto_check(
message_handlert &message_handler)
{
goto_check_c(ns, options, goto_functions, message_handler);
goto_check_java(ns, options, goto_functions, message_handler);
}

void goto_check(
Expand All @@ -53,5 +46,4 @@ void goto_check(
message_handlert &message_handler)
{
goto_check_c(options, goto_model, message_handler);
goto_check_java(options, goto_model, message_handler);
}