Skip to content

Minor code cleanup related to lazy loading #2817

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
Aug 23, 2018
Merged

Minor code cleanup related to lazy loading #2817

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
13 changes: 4 additions & 9 deletions jbmc/src/java_bytecode/ci_lazy_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,12 @@ bool ci_lazy_methodst::operator()(

// Add any extra entry points specified; we should elaborate these in the
// same way as the main function.
std::vector<irep_idt> extra_entry_points;
for(const auto &extra_function_generator : lazy_methods_extra_entry_points)
{
const auto &extra_methods = extra_function_generator(symbol_table);
extra_entry_points.insert(
extra_entry_points.end(), extra_methods.begin(), extra_methods.end());
std::vector<irep_idt> extra_methods =
extra_function_generator(symbol_table);
methods_to_convert_later.insert(extra_methods.begin(), extra_methods.end());
}
methods_to_convert_later.insert(
extra_entry_points.begin(), extra_entry_points.end());

std::unordered_set<irep_idt> instantiated_classes;

Expand Down Expand Up @@ -300,9 +297,7 @@ ci_lazy_methodst::convert_and_analyze_method(
symbol_table,
pointer_type_selector);

const bool could_not_convert_function =
method_converter(method_name, needed_methods);
if(could_not_convert_function)
if(method_converter(method_name, needed_methods))
return result;

const exprt &method_body = symbol_table.lookup_ref(method_name).value;
Expand Down