Skip to content

Preserve true array type in Java -> GOTO conversion. Fixes #184. #788

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
Apr 11, 2017
Merged

Preserve true array type in Java -> GOTO conversion. Fixes #184. #788

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
37 changes: 34 additions & 3 deletions src/goto-programs/builtin_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,10 +830,41 @@ void goto_convertt::do_java_new_array(
deref,
struct_type.components()[2].get_name(),
struct_type.components()[2].type());
side_effect_exprt data_cpp_new_expr(ID_cpp_new_array, data.type());

// Allocate a (struct realtype**) instead of a (void**) if possible.
const irept &given_element_type=object_type.find(ID_C_element_type);
typet allocate_data_type;
exprt cast_data_member;
if(given_element_type.is_not_nil())
{
allocate_data_type=
pointer_typet(static_cast<const typet &>(given_element_type));
}
else
allocate_data_type=data.type();

side_effect_exprt data_cpp_new_expr(ID_cpp_new_array, allocate_data_type);
data_cpp_new_expr.set(ID_size, rhs.op0());

// Must directly assign the new array to a temporary
// because goto-symex will notice `x=side_effect_exprt` but not
// `x=typecast_exprt(side_effect_exprt(...))`
symbol_exprt new_array_data_symbol=
new_tmp_symbol(
data_cpp_new_expr.type(),
"new_array_data",
dest,
location)
.symbol_expr();
goto_programt::targett t_p2=dest.add_instruction(ASSIGN);
t_p2->code=code_assignt(new_array_data_symbol, data_cpp_new_expr);
t_p2->source_location=location;

goto_programt::targett t_p=dest.add_instruction(ASSIGN);
t_p->code=code_assignt(data, data_cpp_new_expr);
exprt cast_cpp_new=new_array_data_symbol;
if(cast_cpp_new.type()!=data.type())
cast_cpp_new=typecast_exprt(cast_cpp_new, data.type());
t_p->code=code_assignt(data, cast_cpp_new);
t_p->source_location=location;

// zero-initialize the data
Expand All @@ -846,7 +877,7 @@ void goto_convertt::do_java_new_array(
ns,
get_message_handler());
codet array_set(ID_array_set);
array_set.copy_to_operands(data, zero_element);
array_set.copy_to_operands(new_array_data_symbol, zero_element);
goto_programt::targett t_d=dest.add_instruction(OTHER);
t_d->code=array_set;
t_d->source_location=location;
Expand Down