replica
/
diffblue-cbmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change from optional set to simply set

This commit is contained in:
Matthias Güdemann 2018-08-14 15:53:41 +02:00
parent d2bc0123b3
commit 6e96333e7a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jbmc/src/java_bytecode/java_entry_point.cpp
View File

@ -327,7 +327,7 @@ exprt::operandst java_build_arguments(
const auto alternatives =
pointer_type_selector.get_parameter_alternative_types(
function.name, p.get_identifier(), ns);
if(!alternatives.has_value())
if(alternatives.empty())
{
main_arguments[param_number] = object_factory(
p.type(),
@ -344,7 +344,6 @@ exprt::operandst java_build_arguments(
INVARIANT(!is_this, "We cannot have different types for `this` here");
// create a non-deterministic switch between all possible values for the
// type of the parameter.
const auto alternative_object_types = alternatives.value();
code_switcht code_switch;
// the idea is to get a new symbol for the parameter value `tmp`
@ -374,7 +373,7 @@ exprt::operandst java_build_arguments(
std::vector<codet> cases;
size_t alternative = 0;
for(const auto &type : alternative_object_types)
for(const auto &type : alternatives)
{
code_blockt init_code_for_type;
exprt init_expr_for_parameter = object_factory(

3
jbmc/src/java_bytecode/select_pointer_type.cpp
View File

@ -224,8 +224,7 @@ select_pointer_typet::get_recursively_instantiated_type(
return inst_val;
}
optionalt<std::set<symbol_typet>>
select_pointer_typet::get_parameter_alternative_types(
std::set<symbol_typet> select_pointer_typet::get_parameter_alternative_types(
const irep_idt &function_name,
const irep_idt &parameter_name,
const namespacet &ns) const

2
jbmc/src/java_bytecode/select_pointer_type.h
View File

@ -42,7 +42,7 @@ public:
&generic_parameter_specialization_map,
const namespacet &ns) const;
virtual optionalt<std::set<symbol_typet>> get_parameter_alternative_types(
virtual std::set<symbol_typet> get_parameter_alternative_types(
const irep_idt &function_name,
const irep_idt &parameter_name,
const namespacet &ns) const;