diff options
| -rw-r--r-- | Source/Concurrency/OwickiGries.cs | 2 | ||||
| -rw-r--r-- | Test/og/bar.bpl.expect | 8 | ||||
| -rw-r--r-- | Test/og/foo.bpl.expect | 4 | ||||
| -rw-r--r-- | Test/og/parallel1.bpl.expect | 4 | ||||
| -rw-r--r-- | Test/og/parallel4.bpl.expect | 2 | ||||
| -rw-r--r-- | Test/og/t1.bpl.expect | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/Source/Concurrency/OwickiGries.cs b/Source/Concurrency/OwickiGries.cs index 036d2543..e5201809 100644 --- a/Source/Concurrency/OwickiGries.cs +++ b/Source/Concurrency/OwickiGries.cs @@ -838,7 +838,7 @@ namespace Microsoft.Boogie impl.LocVars.AddRange(oldPcs);
impl.LocVars.AddRange(oldOks);
- //UnifyCallsToYieldProc(impl, ogOldGlobalMap, domainNameToLocalVar);
+ UnifyCallsToYieldProc(impl, ogOldGlobalMap, domainNameToLocalVar);
}
private void UnifyCallsToYieldProc(Implementation impl, Dictionary<Variable, Variable> ogOldGlobalMap, Dictionary<string, Variable> domainNameToLocalVar)
diff --git a/Test/og/bar.bpl.expect b/Test/og/bar.bpl.expect index 4bd6cc8c..8999ae7f 100644 --- a/Test/og/bar.bpl.expect +++ b/Test/og/bar.bpl.expect @@ -1,13 +1,13 @@ bar.bpl(28,3): Error: Non-interference check failed
Execution trace:
bar.bpl(7,3): anon0
- bar.bpl(7,3): anon0$1
+ (0,0): anon00
bar.bpl(14,3): inline$Incr_1$0$this_A
- (0,0): inline$Impl_YieldChecker_PC_1$1$L0
+ (0,0): inline$Impl_YieldChecker_PC_1$0$L0
bar.bpl(28,3): Error: Non-interference check failed
Execution trace:
bar.bpl(38,3): anon0
- bar.bpl(38,3): anon0$1
- (0,0): inline$Impl_YieldChecker_PC_1$1$L0
+ (0,0): anon00
+ (0,0): inline$Impl_YieldChecker_PC_1$0$L0
Boogie program verifier finished with 3 verified, 2 errors
diff --git a/Test/og/foo.bpl.expect b/Test/og/foo.bpl.expect index 287c2b4f..0d9de9db 100644 --- a/Test/og/foo.bpl.expect +++ b/Test/og/foo.bpl.expect @@ -1,8 +1,8 @@ foo.bpl(30,3): Error: Non-interference check failed
Execution trace:
foo.bpl(7,3): anon0
- foo.bpl(7,3): anon0$1
+ (0,0): anon00
foo.bpl(14,3): inline$Incr_1$0$this_A
- (0,0): inline$Impl_YieldChecker_PC_1$1$L0
+ (0,0): inline$Impl_YieldChecker_PC_1$0$L0
Boogie program verifier finished with 4 verified, 1 error
diff --git a/Test/og/parallel1.bpl.expect b/Test/og/parallel1.bpl.expect index 1e0545a9..588c9c5b 100644 --- a/Test/og/parallel1.bpl.expect +++ b/Test/og/parallel1.bpl.expect @@ -1,8 +1,8 @@ parallel1.bpl(30,3): Error: Non-interference check failed
Execution trace:
parallel1.bpl(7,3): anon0
- parallel1.bpl(7,3): anon0$1
+ (0,0): anon00
parallel1.bpl(14,3): inline$Incr_1$0$this_A
- (0,0): inline$Impl_YieldChecker_PC_1$1$L0
+ (0,0): inline$Impl_YieldChecker_PC_1$0$L0
Boogie program verifier finished with 3 verified, 1 error
diff --git a/Test/og/parallel4.bpl.expect b/Test/og/parallel4.bpl.expect index 771d5de9..0bef8d9e 100644 --- a/Test/og/parallel4.bpl.expect +++ b/Test/og/parallel4.bpl.expect @@ -1,6 +1,6 @@ parallel4.bpl(26,3): Error BP5001: This assertion might not hold.
Execution trace:
(0,0): og_init
- parallel4.bpl(24,5): anon0$1
+ (0,0): anon01
Boogie program verifier finished with 2 verified, 1 error
diff --git a/Test/og/t1.bpl.expect b/Test/og/t1.bpl.expect index 0fd3fde5..7877cfd1 100644 --- a/Test/og/t1.bpl.expect +++ b/Test/og/t1.bpl.expect @@ -2,9 +2,9 @@ t1.bpl(60,5): Error: Non-interference check failed Execution trace:
(0,0): og_init
t1.bpl(80,13): anon0
- t1.bpl(80,13): anon0$1
+ (0,0): anon05
(0,0): inline$SetG_1$0$Entry
- t1.bpl(80,13): anon0$2
- (0,0): inline$Impl_YieldChecker_A_1$1$L2
+ t1.bpl(34,21): inline$SetG_1$0$this_A
+ (0,0): inline$Impl_YieldChecker_A_1$0$L2
Boogie program verifier finished with 2 verified, 1 error
|