Added /verifySnapshots:3, which prints recycled errors messages with the source locations of the new code.

4 files changed, 118 insertions, 0 deletions

diff --git a/Test/snapshots/Snapshots41.v0.bpl b/Test/snapshots/Snapshots41.v0.bpl
new file mode 100644
index 00000000..631fe544
--- /dev/null
+++ b/Test/snapshots/Snapshots41.v0.bpl
@@ -0,0 +1,35 @@
+procedure {:checksum "0"} M(x: int);

+implementation {:id "M"} {:checksum "1"} M(x: int)

+{                     assert x < 20 || 10 <= x;  // always true

+  assert x < 10;  // error

+  call Other(x);  // error: precondition violation

+}

+

+procedure {:checksum "10"} Other(y: int);

+  requires 0 <= y;

+implementation {:id "Other"} {:checksum "11"} Other(y: int)

+{

+}

+

+procedure {:checksum "20"} Posty() returns (z: int);

+  ensures 2 <= z;  // error: postcondition violation

+implementation {:id "Posty"} {:checksum "21"} Posty() returns (z: int)

+{

+  var t: int;

+  t := 20;

+  if (t < z) {

+  } else {  // the postcondition violation occurs on this 'else' branch

+  }

+}

+

+procedure {:checksum "30"} NoChangeWhazzoeva(u: int);

+implementation {:id "NoChangeWhazzoeva"} {:checksum "3"} NoChangeWhazzoeva(u: int)

+{

+  assert u != 53;  // error

+}

+

+procedure {:checksum "40"} NoChangeAndCorrect();

+implementation {:id "NoChangeAndCorrect"} {:checksum "41"} NoChangeAndCorrect()

+{

+  assert true;

+}

diff --git a/Test/snapshots/Snapshots41.v1.bpl b/Test/snapshots/Snapshots41.v1.bpl
new file mode 100644
index 00000000..0cd9fbf9
--- /dev/null
+++ b/Test/snapshots/Snapshots41.v1.bpl
@@ -0,0 +1,39 @@
+procedure {:checksum "0"} M(x: int);

+implementation {:id "M"} {:checksum "1"} M(x: int)

+{

+assert x < 20 || 10 <= x;  // always true

+  

+       assert x < 10;  // error

+  call Other(x);  // error: precondition violation

+  assert x == 7;  // error: this is a new error in v1

+}

+

+

+       procedure {:checksum "10"} Other(y: int);

+         requires 0 <= y;

+       implementation {:id "Other"} {:checksum "11"} Other(y: int)

+       {

+       }

+

+

+

+procedure {:checksum "20"} Posty() returns (z: int);

+  ensures 2 <= z;  // error: postcondition violation

+implementation {:id "Posty"} {:checksum "21"} Posty() returns (z: int)

+{

+  var t: int;

+  t := 20;

+  if (t < z) {

+    assert true;  // this is a new assert

+  } else {  // the postcondition violation occurs on this 'else' branch

+  }

+}

+

+  procedure   {:checksum "30"} NoChangeWhazzoeva(u: int);

+  implementation {:id "NoChangeWhazzoeva"} {:checksum "3"} NoChangeWhazzoeva(u: int)

+  {

+       assert u != 53;  // error

+  }

+

+procedure {:checksum "40"} NoChangeAndCorrect();

+implementation {:id "NoChangeAndCorrect"} {:checksum "41"} NoChangeAndCorrect() { assert true; }

diff --git a/Test/snapshots/runtest.snapshot b/Test/snapshots/runtest.snapshot
index 01a231fe..908fc2fd 100644
--- a/Test/snapshots/runtest.snapshot
+++ b/Test/snapshots/runtest.snapshot
@@ -1,2 +1,3 @@
 // RUN: %boogie -errorTrace:0 -traceCaching:1 -verifySnapshots:2 -verifySeparately -noinfer Snapshots0.bpl Snapshots1.bpl Snapshots2.bpl Snapshots3.bpl Snapshots4.bpl Snapshots5.bpl Snapshots6.bpl Snapshots7.bpl Snapshots8.bpl Snapshots9.bpl Snapshots10.bpl Snapshots11.bpl Snapshots12.bpl Snapshots13.bpl Snapshots14.bpl Snapshots15.bpl Snapshots16.bpl Snapshots17.bpl Snapshots18.bpl Snapshots19.bpl Snapshots20.bpl Snapshots21.bpl Snapshots22.bpl Snapshots23.bpl Snapshots24.bpl Snapshots25.bpl Snapshots26.bpl Snapshots27.bpl Snapshots28.bpl Snapshots30.bpl Snapshots31.bpl Snapshots32.bpl Snapshots33.bpl Snapshots34.bpl Snapshots35.bpl > "%t"

+// RUN: %boogie -errorTrace:0 -traceCaching:1 -verifySnapshots:3 -verifySeparately -noinfer Snapshots41.bpl >> "%t"

 // RUN: %diff "%s.expect" "%t"

diff --git a/Test/snapshots/runtest.snapshot.expect b/Test/snapshots/runtest.snapshot.expect
index 637dd088..9dd3d0ec 100644
--- a/Test/snapshots/runtest.snapshot.expect
+++ b/Test/snapshots/runtest.snapshot.expect
@@ -648,3 +648,46 @@ Processing command (at Snapshots35.v1.bpl(5,5)) assert p;
 Snapshots35.v1.bpl(5,5): Error BP5001: This assertion might not hold.

 

 Boogie program verifier finished with 0 verified, 1 error

+Processing command (at Snapshots41.v0.bpl(3,23)) assert x < 20 || 10 <= x;

+  >>> DoNothingToAssert

+Processing command (at Snapshots41.v0.bpl(4,3)) assert x < 10;

+  >>> DoNothingToAssert

+Processing command (at Snapshots41.v0.bpl(5,3)) assert 0 <= call0formal#AT#y;

+  >>> DoNothingToAssert

+Snapshots41.v0.bpl(4,3): Error BP5001: This assertion might not hold.

+Snapshots41.v0.bpl(5,3): Error BP5002: A precondition for this call might not hold.

+Snapshots41.v0.bpl(9,3): Related location: This is the precondition that might not hold.

+Processing command (at Snapshots41.v0.bpl(15,3)) assert 2 <= z;

+  >>> DoNothingToAssert

+Snapshots41.v0.bpl(22,3): Error BP5003: A postcondition might not hold on this return path.

+Snapshots41.v0.bpl(15,3): Related location: This is the postcondition that might not hold.

+Processing command (at Snapshots41.v0.bpl(28,3)) assert u != 53;

+  >>> DoNothingToAssert

+Snapshots41.v0.bpl(28,3): Error BP5001: This assertion might not hold.

+Processing command (at Snapshots41.v0.bpl(34,3)) assert true;

+  >>> DoNothingToAssert

+

+Boogie program verifier finished with 2 verified, 4 errors

+Processing command (at Snapshots41.v1.bpl(4,1)) assert x < 20 || 10 <= x;

+  >>> MarkAsFullyVerified

+Processing command (at Snapshots41.v1.bpl(6,8)) assert x < 10;

+  >>> RecycleError

+Processing command (at Snapshots41.v1.bpl(7,3)) assert 0 <= call0formal#AT#y;

+  >>> RecycleError

+Processing command (at Snapshots41.v1.bpl(8,3)) assert x == 7;

+  >>> DoNothingToAssert

+Snapshots41.v1.bpl(6,8): Error BP5001: This assertion might not hold.

+Snapshots41.v1.bpl(7,3): Error BP5002: A precondition for this call might not hold.

+Snapshots41.v1.bpl(13,10): Related location: This is the precondition that might not hold.

+Snapshots41.v1.bpl(8,3): Error BP5001: This assertion might not hold.

+Processing command (at Snapshots41.v1.bpl(27,5)) assert true;

+  >>> DoNothingToAssert

+Processing command (at Snapshots41.v1.bpl(21,3)) assert 2 <= z;

+  >>> DoNothingToAssert

+Snapshots41.v1.bpl(29,3): Error BP5003: A postcondition might not hold on this return path.

+Snapshots41.v1.bpl(21,3): Related location: This is the postcondition that might not hold.

+Processing command (at Snapshots41.v1.bpl(35,8)) assert u != 53;

+  >>> RecycleError

+Snapshots41.v1.bpl(35,8): Error BP5001: This assertion might not hold.

+

+Boogie program verifier finished with 2 verified, 5 errors