Skip to content

Refactor java object factory #871

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 2 commits into from
May 19, 2017
Merged

Refactor java object factory #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbbbef6
Refactor java argument creation code
Apr 25, 2017
405ce62
Factor Java object factory
smowton Apr 25, 2017
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
37 changes: 16 additions & 21 deletions src/java_bytecode/java_entry_point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Author: Daniel Kroening, [email protected]
#include <ansi-c/c_types.h>
#include <ansi-c/string_constant.h>

#include <goto-programs/goto_functions.h>
#include <goto-programs/remove_exceptions.h>

#include "java_entry_point.h"
Expand Down Expand Up @@ -98,10 +97,9 @@ Function: java_static_lifetime_init

\*******************************************************************/

bool java_static_lifetime_init(
void java_static_lifetime_init(
symbol_tablet &symbol_table,
const source_locationt &source_location,
message_handlert &message_handler,
bool assume_init_pointers_not_null,
unsigned max_nondet_array_length)
{
Expand Down Expand Up @@ -138,6 +136,7 @@ bool java_static_lifetime_init(
}
auto newsym=object_factory(
sym.type,
symname,
code_block,
allow_null,
symbol_table,
Expand Down Expand Up @@ -173,8 +172,6 @@ bool java_static_lifetime_init(
code_block.add(function_call);
}
}

return false;
}

/*******************************************************************\
Expand All @@ -194,8 +191,7 @@ exprt::operandst java_build_arguments(
code_blockt &init_code,
symbol_tablet &symbol_table,
bool assume_init_pointers_not_null,
unsigned max_nondet_array_length,
message_handlert &message_handler)
unsigned max_nondet_array_length)
{
const code_typet::parameterst &parameters=
to_code_type(function.type).parameters();
Expand Down Expand Up @@ -224,27 +220,29 @@ exprt::operandst java_build_arguments(
is_main=(named_main && has_correct_type);
}

const code_typet::parametert &p=parameters[param_number];
const irep_idt base_name=p.get_base_name().empty()?
("argument#"+std::to_string(param_number)):p.get_base_name();

bool allow_null=(!is_main) && (!is_this) && !assume_init_pointers_not_null;

main_arguments[param_number]=
object_factory(
parameters[param_number].type(),
p.type(),
base_name,
init_code,
allow_null,
symbol_table,
max_nondet_array_length,
function.location);

const symbolt &p_symbol=
symbol_table.lookup(parameters[param_number].get_identifier());

// record as an input
codet input(ID_input);
input.operands().resize(2);
input.op0()=
address_of_exprt(
index_exprt(
string_constantt(p_symbol.base_name),
string_constantt(base_name),
from_integer(0, index_type())));
input.op1()=main_arguments[param_number];
input.add_source_location()=function.location;
Expand Down Expand Up @@ -556,13 +554,11 @@ bool java_entry_point(

create_initialize(symbol_table);

if(java_static_lifetime_init(
symbol_table,
symbol.location,
message_handler,
assume_init_pointers_not_null,
max_nondet_array_length))
return true;
java_static_lifetime_init(
symbol_table,
symbol.location,
assume_init_pointers_not_null,
max_nondet_array_length);

code_blockt init_code;

Expand Down Expand Up @@ -626,8 +622,7 @@ bool java_entry_point(
init_code,
symbol_table,
assume_init_pointers_not_null,
max_nondet_array_length,
message_handler);
max_nondet_array_length);
call_main.arguments()=main_arguments;

init_code.move_to_operands(call_main);
Expand Down
Loading