Skip to content

Fix String type initialisation when --refine-strings is not active #2188

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
10 changes: 10 additions & 0 deletions regression/cbmc-java/NondetCharSequence/NondetCharSequence.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import org.cprover.CProver;

class NondetCharSequence
{
static void main()
{
CharSequence x = CProver.nondetWithNull();
assert x == null || x instanceof CharSequence;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-java/NondetCharSequence/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
NondetCharSequence.class

^VERIFICATION SUCCESSFUL$
^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
Binary file added regression/cbmc-java/NondetString/NondetString.class
Binary file not shown.
10 changes: 10 additions & 0 deletions regression/cbmc-java/NondetString/NondetString.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import org.cprover.CProver;

class NondetString
{
static void main()
{
String x = CProver.nondetWithNull();
assert x == null || x instanceof String;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-java/NondetString/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
NondetString.class

^VERIFICATION SUCCESSFUL$
^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
Binary file not shown.
10 changes: 10 additions & 0 deletions regression/cbmc-java/NondetStringBuffer/NondetStringBuffer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import org.cprover.CProver;

class NondetStringBuffer
{
static void main()
{
StringBuffer x = CProver.nondetWithNull();
assert x == null || x instanceof StringBuffer;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-java/NondetStringBuffer/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
NondetStringBuffer.class

^VERIFICATION SUCCESSFUL$
^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
Binary file not shown.
10 changes: 10 additions & 0 deletions regression/cbmc-java/NondetStringBuilder/NondetStringBuilder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import org.cprover.CProver;

class NondetStringBuilder
{
static void main()
{
StringBuilder x = CProver.nondetWithNull();
assert x == null || x instanceof StringBuilder;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-java/NondetStringBuilder/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
NondetStringBuilder.class

^VERIFICATION SUCCESSFUL$
^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
31 changes: 19 additions & 12 deletions src/java_bytecode/java_object_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -841,20 +841,27 @@ void java_object_factoryt::gen_nondet_pointer_init(
// and asign to `expr` the address of such object
code_blockt non_null_inst;

if(
java_string_library_preprocesst::implements_java_char_sequence_pointer(
expr.type()))
// Note string-type-specific initialization might fail, e.g. if java.lang.CharSequence does not
// have the expected fields (typically this happens if --refine-strings was not passed). In this
// case we fall back to normal pointer target init.

bool string_init_succeeded = false;

if(java_string_library_preprocesst::implements_java_char_sequence_pointer(
expr.type()))
{
add_nondet_string_pointer_initialization(
expr,
object_factory_parameters.max_nondet_string_length,
object_factory_parameters.string_printable,
symbol_table,
loc,
object_factory_parameters.function_id,
assignments);
string_init_succeeded =
!add_nondet_string_pointer_initialization(
expr,
object_factory_parameters.max_nondet_string_length,
object_factory_parameters.string_printable,
symbol_table,
loc,
object_factory_parameters.function_id,
assignments);
}
else

if(!string_init_succeeded)
{
gen_pointer_target_init(
non_null_inst,
Expand Down