Skip to content

Commit 9062853

Browse files
author
thk123
committed
Tidied up the generic specalised class copying the base class visibility
1 parent f934ca3 commit 9062853

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/java_bytecode/generate_java_generic_type.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ symbolt generate_java_generic_typet::operator()(
106106

107107
const java_specialized_generic_class_typet new_java_class{
108108
generic_name,
109-
class_definition.get_tag(),
109+
class_definition,
110110
replacement_components,
111111
existing_generic_type.generic_type_arguments()};
112112

src/java_bytecode/java_types.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,20 +456,22 @@ class java_specialized_generic_class_typet : public java_class_typet
456456
/// parameters and name.
457457
/// \param generic_name: The new name for the class
458458
/// (like Generic<java::Float>)
459-
/// \param tag: The name for the original class (like java::Generic)
459+
/// \param originating_class: The name for the original class (like
460+
/// java::Generic)
460461
/// \param new_components: The specialised components
461462
/// \return The newly constructed class.
462463
java_specialized_generic_class_typet(
463464
const irep_idt &generic_name,
464-
const irep_idt &tag,
465+
const java_class_typet &originating_class,
465466
const struct_typet::componentst &new_components,
466467
const generic_type_argumentst &specialised_parameters)
467468
{
468469
set(ID_C_specialized_generic_java_class, true);
469470
set(ID_name, "java::" + id2string(generic_name));
470471
set(ID_base_name, id2string(generic_name));
471472
components() = new_components;
472-
set_tag(tag);
473+
set_tag(originating_class.get_tag());
474+
set_access(originating_class.get_access());
473475

474476
generic_type_arguments() = specialised_parameters;
475477
}

0 commit comments

Comments
 (0)