diff options
| author |  qunyanm <qunyanm@hotmail.com> | 2015-11-16 11:03:28 -0800 |
|---|---|---|
| committer |  Dan Liew <daniel.liew@imperial.ac.uk> | 2015-12-02 09:22:24 +0000 |
| commit | f97656456a74564cdf96633c3f46223d39e2c6f2 (patch) | |
| tree | f3c0b415cd624a8732fb8d5d162778c2c1648ef7 | |
| parent | e172da3b4ac7f8d352d366d81f1c7c3184426033 (diff) | |
Use the EndCurly token when creating the ReturnCmd for unifiedExit
When there are more than one exit blocks, an unified exit block is
created which includes a ReturnCmd. However, the ReturnCmd is created
with NoToken. This causes the line/column number reported for a failed
postcondition to be (0,0). The right token should be the EndCurly since
the ReturnCmd is in the exit block.
| -rw-r--r-- | Source/VCGeneration/ConditionGeneration.cs | 3 | ||||
| -rw-r--r-- | Test/test2/BadLineNumber.bpl | 15 | ||||
| -rw-r--r-- | Test/test2/BadLineNumber.bpl.expect | 7 |
3 files changed, 24 insertions, 1 deletions
diff --git a/Source/VCGeneration/ConditionGeneration.cs b/Source/VCGeneration/ConditionGeneration.cs index 6a2eec29..19438924 100644 --- a/Source/VCGeneration/ConditionGeneration.cs +++ b/Source/VCGeneration/ConditionGeneration.cs @@ -1133,7 +1133,8 @@ namespace VC { } if (returnBlocks > 1) { string unifiedExitLabel = "GeneratedUnifiedExit"; - Block unifiedExit = new Block(new Token(-17, -4), unifiedExitLabel, new List<Cmd>(), new ReturnCmd(Token.NoToken)); + Block unifiedExit; + unifiedExit = new Block(new Token(-17, -4), unifiedExitLabel, new List<Cmd>(), new ReturnCmd(impl.StructuredStmts != null ? impl.StructuredStmts.EndCurly : Token.NoToken)); Contract.Assert(unifiedExit != null); foreach (Block b in impl.Blocks) { if (b.TransferCmd is ReturnCmd) { diff --git a/Test/test2/BadLineNumber.bpl b/Test/test2/BadLineNumber.bpl new file mode 100644 index 00000000..b8776a4e --- /dev/null +++ b/Test/test2/BadLineNumber.bpl @@ -0,0 +1,15 @@ +// RUN: %boogie "%s" > "%t" +// RUN: %diff "%s.expect" "%t" + +procedure p(); + ensures false; + +implementation p() +{ + if (*) + { + } + else + { + } +}
\ No newline at end of file diff --git a/Test/test2/BadLineNumber.bpl.expect b/Test/test2/BadLineNumber.bpl.expect new file mode 100644 index 00000000..bc5d1984 --- /dev/null +++ b/Test/test2/BadLineNumber.bpl.expect @@ -0,0 +1,7 @@ +BadLineNumber.bpl(15,1): Error BP5003: A postcondition might not hold on this return path. +BadLineNumber.bpl(5,3): Related location: This is the postcondition that might not hold. +Execution trace: + BadLineNumber.bpl(9,5): anon0 + BadLineNumber.bpl(14,5): anon3_Else + +Boogie program verifier finished with 0 verified, 1 error |