From deef37064f673be0391a7224ed8551b1e68be829 Mon Sep 17 00:00:00 2001 From: Shuvendu Lahiri Date: Mon, 26 Oct 2015 17:27:52 -0700 Subject: Bug fix for deterministExtractLoops for Shaobo's example --- Test/extractloops/detLoopExtract2.bpl | 27 ++++++++++ Test/extractloops/detLoopExtract2.bpl.expect | 2 + Test/snapshots/Snapshots41.v0.bpl | 70 ++++++++++++------------- Test/snapshots/Snapshots41.v1.bpl | 78 ++++++++++++++-------------- 4 files changed, 103 insertions(+), 74 deletions(-) create mode 100644 Test/extractloops/detLoopExtract2.bpl create mode 100644 Test/extractloops/detLoopExtract2.bpl.expect (limited to 'Test') diff --git a/Test/extractloops/detLoopExtract2.bpl b/Test/extractloops/detLoopExtract2.bpl new file mode 100644 index 00000000..f2befc53 --- /dev/null +++ b/Test/extractloops/detLoopExtract2.bpl @@ -0,0 +1,27 @@ +// RUN: %boogie -nologo -nologo -stratifiedInline:1 -extractLoops -deterministicExtractLoops -recursionBound:6 "%s" > "%t" +// RUN: %diff "%s.expect" "%t" + +//This example checks the bug fix in the loop extract for http://symdiff.codeplex.com/workitem/4 +procedure {:entrypoint} Main() returns(r:int) +{ + var i, j : int; + var Flag : bool; + var b : bool; + i := 0; + j := 0; + Flag := false; + while(i<3) + { + havoc b; + if (b || Flag) { + i := i + 1; + j := j + 1; + } + else { + Flag := true; + j := j + 1; + } + } + assume !(i == j || i == j - 1); + return; +} diff --git a/Test/extractloops/detLoopExtract2.bpl.expect b/Test/extractloops/detLoopExtract2.bpl.expect new file mode 100644 index 00000000..37fad75c --- /dev/null +++ b/Test/extractloops/detLoopExtract2.bpl.expect @@ -0,0 +1,2 @@ + +Boogie program verifier finished with 1 verified, 0 errors diff --git a/Test/snapshots/Snapshots41.v0.bpl b/Test/snapshots/Snapshots41.v0.bpl index 631fe544..dbfe3e2d 100644 --- a/Test/snapshots/Snapshots41.v0.bpl +++ b/Test/snapshots/Snapshots41.v0.bpl @@ -1,35 +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; -} +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 index 0cd9fbf9..9864e0e4 100644 --- a/Test/snapshots/Snapshots41.v1.bpl +++ b/Test/snapshots/Snapshots41.v1.bpl @@ -1,39 +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; } +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; } -- cgit v1.2.3