Skip to content

Factor out object allocation from object factories [blocks: #3455] #3443

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 4 commits into from
Dec 19, 2018
Merged

Factor out object allocation from object factories [blocks: #3455] #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d4f8fe
Factor out object allocation code from object factories to util/alloc…
danpoe Nov 19, 2018
1adfa5c
Use allocate_objectst in the c nondet object factory
danpoe Nov 19, 2018
255c6bd
Use allocate_objectst in jbmc
danpoe Dec 15, 2018
890be45
Make nondet function arg regression tests independent of variable out…
danpoe Dec 18, 2018
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
2 changes: 1 addition & 1 deletion jbmc/src/java_bytecode/convert_java_nondet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static goto_programt get_gen_nondet_init_instructions(
symbol_table,
source_loc,
skip_classid,
allocation_typet::DYNAMIC,
lifetimet::DYNAMIC,
object_factory_parameters,
update_in_placet::NO_UPDATE_IN_PLACE);

Expand Down
6 changes: 3 additions & 3 deletions jbmc/src/java_bytecode/java_entry_point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ static void java_static_lifetime_init(
symbol_table,
source_location,
false,
allocation_typet::GLOBAL,
lifetimet::STATIC_GLOBAL,
parameters,
pointer_type_selector,
update_in_placet::NO_UPDATE_IN_PLACE);
Expand Down Expand Up @@ -348,7 +348,7 @@ exprt::operandst java_build_arguments(
init_code,
symbol_table,
parameters,
allocation_typet::LOCAL,
lifetimet::AUTOMATIC_LOCAL,
function.location,
pointer_type_selector);
}
Expand Down Expand Up @@ -394,7 +394,7 @@ exprt::operandst java_build_arguments(
init_code_for_type,
symbol_table,
parameters,
allocation_typet::DYNAMIC,
lifetimet::DYNAMIC,
function.location,
pointer_type_selector);
init_code_for_type.add(
Expand Down
Loading