update

2 files changed, 16 insertions, 16 deletions

diff --git a/Test/linear/async-bug.bpl b/Test/linear/async-bug.bpl
index ff6cdded..ad7020ad 100644
--- a/Test/linear/async-bug.bpl
+++ b/Test/linear/async-bug.bpl
@@ -2,35 +2,35 @@
 // RUN: %diff "%s.expect" "%t"

 const GcTid:int;

 

-procedure {:yields} {:phase 100} Initialize({:linear "tid"} tid:int)

-requires{:phase 100} tid == GcTid;

+procedure {:yields} {:layer 100} Initialize({:linear "tid"} tid:int)

+requires{:layer 100} tid == GcTid;

 {

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 

     call GarbageCollect(tid);

 

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 

     async call GarbageCollect(tid);

 

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 

     async call GarbageCollect(tid);

 

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 }

 

-procedure {:yields} {:phase 100} GarbageCollect({:linear "tid"} tid:int)

-requires{:phase 100} tid == GcTid;

+procedure {:yields} {:layer 100} GarbageCollect({:linear "tid"} tid:int)

+requires{:layer 100} tid == GcTid;

 {

     yield;

-    assert{:phase 100} tid == GcTid;

+    assert{:layer 100} tid == GcTid;

 }

 

diff --git a/Test/linear/typecheck.bpl b/Test/linear/typecheck.bpl
index 057718cf..57080cb8 100644
--- a/Test/linear/typecheck.bpl
+++ b/Test/linear/typecheck.bpl
@@ -22,7 +22,7 @@ procedure C()
 

 function f(X): X;

 

-procedure {:yields} {:phase 1} D()

+procedure {:yields} {:layer 1} D()

 {

     var {:linear "D"} a: X;

     var {:linear "D"} x: X;

@@ -70,7 +70,7 @@ procedure E({:linear_in "D"} a: X, {:linear_in "D"} b: X) returns ({:linear "D"}
     c := a;

 }

 

-procedure {:yields} {:phase 0} F({:linear_in "D"} a: X) returns ({:linear "D"} c: X);

+procedure {:yields} {:layer 0} F({:linear_in "D"} a: X) returns ({:linear "D"} c: X);

 

 var {:linear "x"} g:int;

 

@@ -85,16 +85,16 @@ modifies g;
   g := r;

 }

 

-procedure {:yields} {:phase 0} I({:linear_in ""} x:int) returns({:linear ""} x':int)

+procedure {:yields} {:layer 0} I({:linear_in ""} x:int) returns({:linear ""} x':int)

 {

   x' := x;

 }

 

-procedure {:yields} {:phase 0} J()

+procedure {:yields} {:layer 0} J()

 {

 }

 

-procedure {:yields} {:phase 1} P1({:linear_in ""} x:int) returns({:linear ""} x':int)

+procedure {:yields} {:layer 1} P1({:linear_in ""} x:int) returns({:linear ""} x':int)

 {

   yield;

   par x' := I(x) | J();

@@ -103,7 +103,7 @@ procedure {:yields} {:phase 1} P1({:linear_in ""} x:int) returns({:linear ""} x'
   yield;

 }

 

-procedure {:yields} {:phase 1} P2({:linear_in ""} x:int) returns({:linear ""} x':int)

+procedure {:yields} {:layer 1} P2({:linear_in ""} x:int) returns({:linear ""} x':int)

 {

   yield;

   call x' := I(x);