From e4bc16ea74994fcaf9ccf89d10a6af1300df8fa5 Mon Sep 17 00:00:00 2001 From: Nathan Phillips Date: Tue, 21 Aug 2018 18:40:42 +0100 Subject: [PATCH] Minor code cleanup related to lazy loading --- jbmc/src/java_bytecode/ci_lazy_methods.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/jbmc/src/java_bytecode/ci_lazy_methods.cpp b/jbmc/src/java_bytecode/ci_lazy_methods.cpp index f4c7f502d66..4442e51f968 100644 --- a/jbmc/src/java_bytecode/ci_lazy_methods.cpp +++ b/jbmc/src/java_bytecode/ci_lazy_methods.cpp @@ -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 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 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 instantiated_classes; @@ -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;