Skip to content

Commit 4fc60e7

Browse files
committed
Disable default pointer check (replaced by java_bytecode_instrument)
Also amend tests that are perturbed by this. They used to require a specific goal marked as success, but when they become simple enough that the simplifier solves the problem by itself the goal list is not printed. Therefore just look for VERIFICATION SUCCESSFUL. Also modify a test that was looking for a null pointer failure, since the phrasing of them has changed.
1 parent 8486e6c commit 4fc60e7

File tree

6 files changed

+2
-10
lines changed

6 files changed

+2
-10
lines changed

regression/cbmc-java/stack_var4/test.desc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ stack_test.class
33

44
^EXIT=0$
55
^SIGNAL=0$
6-
^.*assertion at file stack_test.java line 5 function.*: SUCCESS
7-
$
86
^VERIFICATION SUCCESSFUL$
97
--
108
^warning: ignoring

regression/cbmc-java/stack_var5/test.desc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ stack_test.class
33

44
^EXIT=0$
55
^SIGNAL=0$
6-
^.*assertion at file stack_test.java line 5 function.*: SUCCESS
7-
$
86
^VERIFICATION SUCCESSFUL$
97
--
108
^warning: ignoring

regression/cbmc-java/stack_var6/test.desc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ stack_test.class
33

44
^EXIT=0$
55
^SIGNAL=0$
6-
^.*assertion at file stack_test.java line 5 function.*: SUCCESS
7-
$
86
^VERIFICATION SUCCESSFUL$
97
--
108
^warning: ignoring

regression/cbmc-java/stack_var7/test.desc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ stack_test.class
33

44
^EXIT=0$
55
^SIGNAL=0$
6-
^.*assertion at file stack_test.java line 5 function.*: SUCCESS
7-
$
86
^VERIFICATION SUCCESSFUL$
97
--
108
^warning: ignoring

regression/strings/StaticCharMethods05/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ StaticCharMethods05.class
33
--refine-strings
44
^EXIT=10$
55
^SIGNAL=0$
6-
^\[pointer_dereference\.2\] reference is null in \*this->data: FAILURE$
6+
null-pointer-exception\.14\] Throw null: FAILURE
77
^\[.*assertion\.1\] .* line 12 .* FAILURE$
88
^\[.*assertion\.2\] .* line 22 .* FAILURE$
99
^VERIFICATION FAILED$

src/analyses/goto_check.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ void goto_checkt::pointer_validity_check(
909909
const exprt &access_ub,
910910
const irep_idt &mode)
911911
{
912-
if(mode!=ID_java && !enable_pointer_check)
912+
if(!enable_pointer_check)
913913
return;
914914

915915
const exprt &pointer=expr.op0();

0 commit comments

Comments
 (0)