Skip to content

strengthen return types of java_*_type() functions #3704

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
Jan 7, 2019
Merged

strengthen return types of java_*_type() functions #3704

Show file tree
Hide file tree
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
30 changes: 15 additions & 15 deletions jbmc/src/java_bytecode/java_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,47 +29,47 @@ std::vector<typet> parse_list_types(
const char opening_bracket,
const char closing_bracket);

typet java_int_type()
signedbv_typet java_int_type()
{
return signedbv_typet(32);
}

typet java_void_type()
void_typet java_void_type()
{
return void_typet();
}

typet java_long_type()
signedbv_typet java_long_type()
{
return signedbv_typet(64);
}

typet java_short_type()
signedbv_typet java_short_type()
{
return signedbv_typet(16);
}

typet java_byte_type()
signedbv_typet java_byte_type()
{
return signedbv_typet(8);
}

typet java_char_type()
unsignedbv_typet java_char_type()
{
return unsignedbv_typet(16);
}

typet java_float_type()
floatbv_typet java_float_type()
{
return ieee_float_spect::single_precision().to_type();
}

typet java_double_type()
floatbv_typet java_double_type()
{
return ieee_float_spect::double_precision().to_type();
}

typet java_boolean_type()
c_bool_typet java_boolean_type()
{
// The Java standard doesn't really prescribe the width
// of a boolean. However, JNI suggests that it's 8 bits.
Expand Down Expand Up @@ -638,23 +638,23 @@ char java_char_from_type(const typet &type)
if(id==ID_signedbv)
{
const size_t width=to_signedbv_type(type).get_width();
if(to_signedbv_type(java_int_type()).get_width()==width)
if(java_int_type().get_width() == width)
return 'i';
else if(to_signedbv_type(java_long_type()).get_width()==width)
else if(java_long_type().get_width() == width)
return 'l';
else if(to_signedbv_type(java_short_type()).get_width()==width)
else if(java_short_type().get_width() == width)
return 's';
else if(to_signedbv_type(java_byte_type()).get_width()==width)
else if(java_byte_type().get_width() == width)
return 'b';
}
else if(id==ID_unsignedbv)
return 'c';
else if(id==ID_floatbv)
{
const size_t width(to_floatbv_type(type).get_width());
if(to_floatbv_type(java_float_type()).get_width()==width)
if(java_float_type().get_width() == width)
return 'f';
else if(to_floatbv_type(java_double_type()).get_width()==width)
else if(java_double_type().get_width() == width)
return 'd';
}
else if(id==ID_c_bool)
Expand Down
18 changes: 9 additions & 9 deletions jbmc/src/java_bytecode/java_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,15 +359,15 @@ inline java_method_typet &to_java_method_type(typet &type)
return static_cast<java_method_typet &>(type);
}

typet java_int_type();
typet java_long_type();
typet java_short_type();
typet java_byte_type();
typet java_char_type();
typet java_float_type();
typet java_double_type();
typet java_boolean_type();
typet java_void_type();
signedbv_typet java_int_type();
signedbv_typet java_long_type();
signedbv_typet java_short_type();
signedbv_typet java_byte_type();
unsignedbv_typet java_char_type();
floatbv_typet java_float_type();
floatbv_typet java_double_type();
c_bool_typet java_boolean_type();
void_typet java_void_type();
reference_typet java_reference_type(const typet &subtype);
reference_typet java_lang_object_type();
struct_tag_typet java_classname(const std::string &);
Expand Down