Skip to content

[TG-1419] Specialization of generics #1877

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 6 commits into from
Mar 8, 2018
Merged

[TG-1419] Specialization of generics #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3111255
Introduce a map of parameter-type pairs
Feb 9, 2018
624cc91
Use the map of parameter-type pairs to specialize generics
Mar 2, 2018
5c00440
Remove the old way of specializing generics
Mar 2, 2018
2964910
Fix a bug in function for extracting generic interface reference
Mar 7, 2018
a1e9d00
Updating and extending utility functions
Feb 22, 2018
c53cb29
Adding and updating unit tests
Feb 23, 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
3 changes: 1 addition & 2 deletions src/java_bytecode/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SRC = bytecode_info.cpp \
ci_lazy_methods.cpp \
ci_lazy_methods_needed.cpp \
expr2java.cpp \
generic_arguments_name_builder.cpp \
generic_parameter_specialization_map_keys.cpp \
jar_file.cpp \
java_bytecode_convert_class.cpp \
java_bytecode_convert_method.cpp \
Expand All @@ -29,7 +29,6 @@ SRC = bytecode_info.cpp \
java_string_literals.cpp \
java_types.cpp \
java_utils.cpp \
generate_java_generic_type.cpp \
mz_zip_archive.cpp \
select_pointer_type.cpp \
# Empty last line
Expand Down
6 changes: 4 additions & 2 deletions src/java_bytecode/ci_lazy_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,10 @@ void ci_lazy_methodst::initialize_all_needed_classes_from_pointer(
{
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);
// TODO we should be passing here a map that maps generic parameters
// to concrete types in the current context TG-2664
const pointer_typet &subbed_pointer_type =
pointer_type_selector.convert_pointer_type(pointer_type, {}, ns);

if(subbed_pointer_type!=pointer_type)
{
Expand Down
343 changes: 0 additions & 343 deletions src/java_bytecode/generate_java_generic_type.cpp
View file
Open in desktop

This file was deleted.

Loading