strengthened type checking

cleaned up the generation of mover checks (based on example from Chris)
added two examples from Chris to regressions

1 files changed, 10 insertions, 2 deletions

diff --git a/Test/og/FlanaganQadeer.bpl b/Test/og/FlanaganQadeer.bpl
index a912a89a..7345b5b2 100644
--- a/Test/og/FlanaganQadeer.bpl
+++ b/Test/og/FlanaganQadeer.bpl
@@ -11,8 +11,13 @@ function {:inline} {:linear "tid"} TidCollector(x: X) : [X]bool
   MapConstBool(false)[x := true]

 }

 

-procedure {:yields} {:layer 1} Allocate() returns ({:linear "tid"} xls: X);

-ensures {:layer 1} xls != nil;

+procedure {:yields} {:layer 1} Allocate() returns ({:linear "tid"} xl: X)

+ensures {:layer 1} xl != nil;

+{

+    yield;

+    call xl := AllocateLow();

+    yield;

+}

 

 procedure {:yields} {:layer 1} main()

 {

@@ -38,6 +43,9 @@ ensures {:atomic} |{A: l := nil; return true; }|;
 procedure {:yields} {:layer 0,1} Set(val: int);

 ensures {:atomic} |{A: x := val; return true; }|;

 

+procedure {:yields} {:layer 0,1} AllocateLow() returns ({:linear "tid"} xl: X);

+ensures {:atomic} |{ A: assume xl != nil; return true; }|;

+

 procedure {:yields} {:layer 1} foo({:linear_in "tid"} tid': X, val: int)

 requires {:layer 1} tid' != nil;

 {