Skip to content

Use a switch statement for clarity #2804

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 1 commit into from
Aug 22, 2018
Merged

Use a switch statement for clarity #2804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 32 additions & 27 deletions jbmc/src/java_bytecode/java_bytecode_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,36 +735,41 @@ bool java_bytecode_languaget::typecheck(

// Now incrementally elaborate methods
// that are reachable from this entry point.
if(lazy_methods_mode==LAZY_METHODS_MODE_CONTEXT_INSENSITIVE)
switch(lazy_methods_mode)
{
// ci: context-insensitive.
if(do_ci_lazy_method_conversion(symbol_table, method_bytecode))
return true;
}
else if(lazy_methods_mode==LAZY_METHODS_MODE_EAGER)
{
journalling_symbol_tablet journalling_symbol_table =
journalling_symbol_tablet::wrap(symbol_table);
case LAZY_METHODS_MODE_CONTEXT_INSENSITIVE:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compilation error: https://travis-ci.org/diffblue/cbmc/jobs/418815188#L1728

// ci = context-insensitive
if(do_ci_lazy_method_conversion(symbol_table, method_bytecode))
return true;
break;
case LAZY_METHODS_MODE_EAGER:
{
journalling_symbol_tablet journalling_symbol_table =
journalling_symbol_tablet::wrap(symbol_table);

// Convert all synthetic methods:
for(const auto &function_id_and_type : synthetic_methods)
{
convert_single_method(
function_id_and_type.first, journalling_symbol_table);
}
// Convert all methods for which we have bytecode now
for(const auto &method_sig : method_bytecode)
{
convert_single_method(method_sig.first, journalling_symbol_table);
}
// Now convert all newly added string methods
for(const auto &fn_name : journalling_symbol_table.get_inserted())
{
if(string_preprocess.implements_function(fn_name))
convert_single_method(fn_name, symbol_table);
}
// Convert all synthetic methods:
for(const auto &function_id_and_type : synthetic_methods)
{
convert_single_method(
function_id_and_type.first, journalling_symbol_table);
}
// Convert all methods for which we have bytecode now
for(const auto &method_sig : method_bytecode)
{
convert_single_method(method_sig.first, journalling_symbol_table);
}
// Now convert all newly added string methods
for(const auto &fn_name : journalling_symbol_table.get_inserted())
{
if(string_preprocess.implements_function(fn_name))
convert_single_method(fn_name, symbol_table);
}
}
break;
default:
// Our caller is in charge of elaborating methods on demand.
break;
}
// Otherwise our caller is in charge of elaborating methods on demand.

// now instrument runtime exceptions
java_bytecode_instrument(
Expand Down