diff options
| author |  wuestholz <unknown> | 2014-12-28 14:28:50 +0100 |
|---|---|---|
| committer | wuestholz <unknown> | 2014-12-28 14:28:50 +0100 |
| commit | d3662f29ba04d5d36cce49bd90b937c0d3d29a44 (patch) | |
| tree | 64ab5ae16a44c43866797754464b8d949d97ec4e /Source/VCGeneration | |
| parent | e0d28208a911c851d0f043311c3c3119f4b530d3 (diff) | |
Worked on more native support for partially-verified assertions.
Diffstat (limited to 'Source/VCGeneration')
| -rw-r--r-- | Source/VCGeneration/ConditionGeneration.cs | 3 | ||||
| -rw-r--r-- | Source/VCGeneration/Wlp.cs | 30 |
2 files changed, 29 insertions, 4 deletions
diff --git a/Source/VCGeneration/ConditionGeneration.cs b/Source/VCGeneration/ConditionGeneration.cs index aca9d3f8..3311e6b4 100644 --- a/Source/VCGeneration/ConditionGeneration.cs +++ b/Source/VCGeneration/ConditionGeneration.cs @@ -1587,6 +1587,9 @@ namespace VC { passiveCmds.Add(new AssumeCmd(Token.NoToken, LiteralExpr.Eq(identExpr, copy)));
copy = identExpr;
passiveCmds.Add(new AssumeCmd(Token.NoToken, LiteralExpr.Imp(assmVars, identExpr)));
+
+ // TODO(wuestholz): Try to use this instead:
+ // ac.MarkAsVerifiedUnder(assmVars);
}
else
{
diff --git a/Source/VCGeneration/Wlp.cs b/Source/VCGeneration/Wlp.cs index c6cebdab..24c36e3b 100644 --- a/Source/VCGeneration/Wlp.cs +++ b/Source/VCGeneration/Wlp.cs @@ -26,6 +26,13 @@ namespace VC { public int AssertionCount; // counts the number of assertions for which Wlp has been computed
public bool isPositiveContext;
+ int letBindingCount;
+ public string FreshLetBindingName()
+ {
+ var c = System.Threading.Interlocked.Increment(ref letBindingCount);
+ return string.Format("v##let##{0}", c);
+ }
+
public VCContext(Dictionary<int, Absy> label2absy, ProverContext ctxt, bool isPositiveContext = true)
{
Contract.Requires(ctxt != null);
@@ -100,8 +107,20 @@ namespace VC { ctxt.Ctxt.BoogieExprTranslator.isPositiveContext = !ctxt.Ctxt.BoogieExprTranslator.isPositiveContext;
VCExpr C = ctxt.Ctxt.BoogieExprTranslator.Translate(ac.Expr);
ctxt.Ctxt.BoogieExprTranslator.isPositiveContext = !ctxt.Ctxt.BoogieExprTranslator.isPositiveContext;
+
+ VCExprLetBinding LB = null;
+ VCExpr A = null;
+ if (ac.VerifiedUnder != null)
+ {
+ var V = gen.Variable(ctxt.FreshLetBindingName(), Microsoft.Boogie.Type.Bool);
+ LB = gen.LetBinding(V, C);
+ C = V;
+ A = gen.ImpliesSimp(ctxt.Ctxt.BoogieExprTranslator.Translate(ac.VerifiedUnder), V);
+ }
+
if (CommandLineOptions.Clo.vcVariety == CommandLineOptions.VCVariety.Doomed) {
- return gen.Implies(C, N);
+ var res = gen.Implies(C, N);
+ return A != null ? gen.Let(gen.ImpliesSimp(A, res), LB) : res;
} else {
int id = ac.UniqueId;
if (ctxt.Label2absy != null) {
@@ -131,15 +150,18 @@ namespace VC { ctxt.AssertionCount++;
if (ctxt.ControlFlowVariableExpr == null) {
Contract.Assert(ctxt.Label2absy != null);
- return gen.AndSimp(gen.LabelNeg(cce.NonNull(id.ToString()), C), N);
+ var res = gen.AndSimp(gen.LabelNeg(cce.NonNull(id.ToString()), C), N);
+ return A != null ? gen.Let(gen.ImpliesSimp(A, res), LB) : res;
} else {
VCExpr controlFlowFunctionAppl = gen.ControlFlowFunctionApplication(ctxt.ControlFlowVariableExpr, gen.Integer(BigNum.FromInt(b.UniqueId)));
Contract.Assert(controlFlowFunctionAppl != null);
VCExpr assertFailure = gen.Eq(controlFlowFunctionAppl, gen.Integer(BigNum.FromInt(-ac.UniqueId)));
if (ctxt.Label2absy == null) {
- return gen.AndSimp(gen.Implies(assertFailure, C), N);
+ var res = gen.AndSimp(gen.Implies(assertFailure, C), N);
+ return A != null ? gen.Let(gen.ImpliesSimp(A, res), LB) : res;
} else {
- return gen.AndSimp(gen.LabelNeg(cce.NonNull(id.ToString()), gen.Implies(assertFailure, C)), N);
+ var res = gen.AndSimp(gen.LabelNeg(cce.NonNull(id.ToString()), gen.Implies(assertFailure, C)), N);
+ return A != null ? gen.Let(gen.ImpliesSimp(A, res), LB) : res;
}
}
}
|