Load string functions on demand #1644
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,6 @@ | |
| #include <java_bytecode/java_entry_point.h> | ||
| #include <java_bytecode/java_class_loader.h> | ||
| #include <java_bytecode/java_utils.h> | ||
| #include <util/suffix.h> | ||
| #include <java_bytecode/java_string_library_preprocess.h> | ||
|
|
||
|
|
@@ -61,14 +60,14 @@ ci_lazy_methodst::ci_lazy_methodst( | |
| /// from the main entry point (usually provided with the --function command- | ||
| /// line option | ||
| /// \param symbol_table: global symbol table | ||
| /// \param [out] method_bytecode: map from method names to relevant symbol and | ||
| /// parsed-method objects. | ||
| /// \param method_converter: Function for converting methods on demand. | ||
| /// \return Returns false on success | ||
| bool ci_lazy_methodst::operator()( | ||
| symbol_tablet &symbol_table, | ||
| method_bytecodet &method_bytecode, | ||
| const method_convertert &method_converter) | ||
|
There was a problem hiding this comment. AFAIK this is a There was a problem hiding this comment. I think we'd only do that if we were going to move it into the function (e.g. if the lambda was declared in the argument list). |
||
| { | ||
| std::vector<irep_idt> method_worklist1; | ||
| std::vector<irep_idt> method_worklist2; | ||
|
|
@@ -141,21 +140,17 @@ bool ci_lazy_methodst::operator()( | |
| { | ||
| if(!methods_already_populated.insert(mname).second) | ||
| continue; | ||
| debug() << "CI lazy methods: elaborate " << mname << eom; | ||
| if( | ||
| method_converter( | ||
| mname, | ||
| // Note this wraps *references* to method_worklist2 & needed_classes | ||
| ci_lazy_methods_neededt( | ||
| method_worklist2, needed_classes, symbol_table))) | ||
| { | ||
| // Couldn't convert this function | ||
| continue; | ||
| } | ||
| gather_virtual_callsites( | ||
| symbol_table.lookup_ref(mname).value, | ||
| virtual_callsites); | ||
|
|
@@ -189,15 +184,23 @@ bool ci_lazy_methodst::operator()( | |
|
|
||
| for(const auto &sym : symbol_table.symbols) | ||
| { | ||
| // Don't keep global variables (unless they're gathered below from a | ||
| // function that references them) | ||
| if(sym.second.is_static_lifetime) | ||
| continue; | ||
| if(sym.second.type.id()==ID_code) | ||
| { | ||
| // Don't keep functions that belong to this language that we haven't | ||
| // converted above | ||
| if( | ||
| method_bytecode.contains_method(sym.first) && | ||
| !methods_already_populated.count(sym.first)) | ||
| { | ||
| continue; | ||
| } | ||
| // If this is a function then add all the things used in it | ||
| gather_needed_globals(sym.second.value, symbol_table, keep_symbols); | ||
| } | ||
| keep_symbols.add(sym.second); | ||
| } | ||
|
|
||
|
|
@@ -263,13 +266,13 @@ void ci_lazy_methodst::resolve_method_names( | |
| /// \param entry_points: list of fully-qualified function names that | ||
| /// we should assume are reachable | ||
| /// \param ns: global namespace | ||
| /// \param [out] needed_lazy_methods: Populated with all Java reference types | ||
| /// whose references may be passed, directly or indirectly, to any of the | ||
| /// functions in `entry_points`. | ||
| void ci_lazy_methodst::initialize_needed_classes( | ||
| const std::vector<irep_idt> &entry_points, | ||
| const namespacet &ns, | ||
| ci_lazy_methods_neededt &needed_lazy_methods) | ||
| { | ||
| for(const auto &mname : entry_points) | ||
| { | ||
|
|
@@ -281,67 +284,66 @@ void ci_lazy_methodst::initialize_needed_classes( | |
| { | ||
| const pointer_typet &original_pointer=to_pointer_type(param.type()); | ||
| initialize_all_needed_classes_from_pointer( | ||
| original_pointer, ns, needed_lazy_methods); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Also add classes whose instances are magically | ||
| // created by the JVM and so won't be spotted by | ||
| // looking for constructors and calls as usual: | ||
| needed_lazy_methods.add_needed_class("java::java.lang.String"); | ||
| needed_lazy_methods.add_needed_class("java::java.lang.Class"); | ||
| needed_lazy_methods.add_needed_class("java::java.lang.Object"); | ||
|
|
||
| // As in class_loader, ensure these classes stay available | ||
| for(const auto &id : extra_needed_classes) | ||
| needed_lazy_methods.add_needed_class("java::" + id2string(id)); | ||
| } | ||
|
|
||
| /// Build up list of methods for types for a pointer and any types it | ||
| /// might be subsituted for. See | ||
| /// `initialize_needed_classes` for more details. | ||
| /// \param pointer_type: The type to gather methods for. | ||
| /// \param ns: global namespace | ||
| /// \param [out] needed_lazy_methods: Populated with all Java reference types | ||
| /// whose references may be passed, directly or indirectly, to any of the | ||
| /// functions in `entry_points` | ||
| void ci_lazy_methodst::initialize_all_needed_classes_from_pointer( | ||
| const pointer_typet &pointer_type, | ||
| const namespacet &ns, | ||
| ci_lazy_methods_neededt &needed_lazy_methods) | ||
| { | ||
| initialize_needed_classes_from_pointer(pointer_type, ns, needed_lazy_methods); | ||
|
|
||
| const pointer_typet &subbed_pointer_type= | ||
| pointer_type_selector.convert_pointer_type(pointer_type, ns); | ||
|
|
||
| if(subbed_pointer_type!=pointer_type) | ||
| { | ||
| initialize_needed_classes_from_pointer( | ||
| subbed_pointer_type, ns, needed_lazy_methods); | ||
| } | ||
| } | ||
|
|
||
| /// Build up list of methods for types for a specific pointer type. See | ||
| /// `initialize_needed_classes` for more details. | ||
| /// \param pointer_type: The type to gather methods for. | ||
| /// \param ns: global namespace | ||
| /// \param [out] needed_lazy_methods: Populated with all Java reference types | ||
| /// whose references may be passed, directly or indirectly, to any of the | ||
| /// functions in `entry_points` | ||
| void ci_lazy_methodst::initialize_needed_classes_from_pointer( | ||
| const pointer_typet &pointer_type, | ||
| const namespacet &ns, | ||
| ci_lazy_methods_neededt &needed_lazy_methods) | ||
| { | ||
| const symbol_typet &class_type=to_symbol_type(pointer_type.subtype()); | ||
| const auto ¶m_classid=class_type.get_identifier(); | ||
|
|
||
| if(needed_lazy_methods.add_needed_class(param_classid)) | ||
| { | ||
| gather_field_types(pointer_type.subtype(), ns, needed_lazy_methods); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -462,30 +464,30 @@ void ci_lazy_methodst::gather_needed_globals( | |
| gather_needed_globals(*opit, symbol_table, needed); | ||
| } | ||
|
|
||
| /// See param needed_lazy_methods | ||
| /// \param class_type: root of class tree to search | ||
| /// \param ns: global namespace | ||
| /// \param [out] needed_lazy_methods: Popualted with all Java reference types | ||
| /// reachable starting at `class_type`. For example if `class_type` is | ||
| /// `symbol_typet("java::A")` and A has a B field, then `B` (but not `A`) will | ||
| /// noted as a needed class. | ||
| void ci_lazy_methodst::gather_field_types( | ||
| const typet &class_type, | ||
| const namespacet &ns, | ||
| ci_lazy_methods_neededt &needed_lazy_methods) | ||
| { | ||
| const auto &underlying_type=to_struct_type(ns.follow(class_type)); | ||
| for(const auto &field : underlying_type.components()) | ||
| { | ||
| if(field.type().id()==ID_struct || field.type().id()==ID_symbol) | ||
| gather_field_types(field.type(), ns, needed_lazy_methods); | ||
| else if(field.type().id()==ID_pointer) | ||
| { | ||
| // Skip array primitive pointers, for example: | ||
| if(field.type().subtype().id()!=ID_symbol) | ||
| continue; | ||
| initialize_all_needed_classes_from_pointer( | ||
| to_pointer_type(field.type()), ns, needed_lazy_methods); | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commit message is not very precise, consider changing
thingsforlazy_methods variableThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does change a couple of other things.