Skip to content

Move convert_nondet to java_bytecode #2187

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
May 17, 2018
Merged

Move convert_nondet to java_bytecode #2187

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
1 change: 0 additions & 1 deletion src/cbmc/cbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Author: Daniel Kroening, kroening@kroening.com

#include <ansi-c/c_preprocess.h>

#include <goto-programs/convert_nondet.h>
#include <goto-programs/initialize_goto_model.h>
#include <goto-programs/instrument_preconditions.h>
#include <goto-programs/goto_convert_functions.h>
Expand Down
1 change: 0 additions & 1 deletion src/goto-programs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ SRC = basic_blocks.cpp \
class_hierarchy.cpp \
class_identifier.cpp \
compute_called_functions.cpp \
convert_nondet.cpp \
destructor.cpp \
elf_reader.cpp \
format_strings.cpp \
Expand Down
1 change: 1 addition & 0 deletions src/java_bytecode/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ SRC = bytecode_info.cpp \
character_refine_preprocess.cpp \
ci_lazy_methods.cpp \
ci_lazy_methods_needed.cpp \
convert_java_nondet.cpp \
expr2java.cpp \
generic_parameter_specialization_map_keys.cpp \
jar_file.cpp \
Expand Down
13 changes: 7 additions & 6 deletions src/goto-programs/convert_nondet.cpp → src/java_bytecode/convert_java_nondet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ Author: Reuben Thomas, reuben.thomas@diffblue.com
/// \file
/// Convert side_effect_expr_nondett expressions

#include "convert_nondet.h"
#include "goto_convert.h"
#include "goto_model.h"
#include "remove_skip.h"
#include "convert_java_nondet.h"

#include <java_bytecode/java_object_factory.h> // gen_nondet_init
#include <goto-programs/goto_convert.h>
#include <goto-programs/goto_model.h>
#include <goto-programs/remove_skip.h>

#include <util/irep_ids.h>
#include <util/fresh_symbol.h>
#include <util/irep_ids.h>

#include <memory>

#include "java_object_factory.h" // gen_nondet_init

/// Checks an instruction to see whether it contains an assignment from
/// side_effect_expr_nondet. If so, replaces the instruction with a range of
/// instructions to properly nondet-initialize the lhs.
Expand Down
6 changes: 3 additions & 3 deletions src/goto-programs/convert_nondet.h → src/java_bytecode/convert_java_nondet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Author: Reuben Thomas, reuben.thomas@diffblue.com
/// \file
/// Convert side_effect_expr_nondett expressions

#ifndef CPROVER_GOTO_PROGRAMS_CONVERT_NONDET_H
#define CPROVER_GOTO_PROGRAMS_CONVERT_NONDET_H
#ifndef CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H
#define CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H

#include <cstddef> // size_t
#include <util/irep.h>
Expand Down Expand Up @@ -52,4 +52,4 @@ void convert_nondet(
const object_factory_parameterst &object_factory_parameters,
const irep_idt &mode);

#endif
#endif // CPROVER_JAVA_BYTECODE_CONVERT_NONDET_H
2 changes: 1 addition & 1 deletion src/jbmc/jbmc_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Author: Daniel Kroening, kroening@kroening.com

#include <ansi-c/ansi_c_language.h>

#include <goto-programs/convert_nondet.h>
#include <goto-programs/lazy_goto_model.h>
#include <goto-programs/instrument_preconditions.h>
#include <goto-programs/goto_convert_functions.h>
Expand Down Expand Up @@ -54,6 +53,7 @@ Author: Daniel Kroening, kroening@kroening.com

#include <langapi/mode.h>

#include <java_bytecode/convert_java_nondet.h>
#include <java_bytecode/java_bytecode_language.h>
#include <java_bytecode/java_enum_static_init_unwind_handler.h>
#include <java_bytecode/remove_exceptions.h>
Expand Down