Skip to content

Fixing issue #773 #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoeilers merged 2 commits into from
Nov 10, 2023
Merged

Fixing issue #773 #774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e734925
Moving check of out-edge condition well-definedness for loop head blo…
marcoeilers Nov 10, 2023
9da0777
Merge branch 'master' into meilers_fix_773
marcoeilers Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/main/scala/rules/Executor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,8 @@ object executor extends ExecutionRules {
phase1data = phase1data :+ (s1,
v1.decider.pcs.after(mark),
v1.decider.freshFunctions /* [BRANCH-PARALLELISATION] */)
v1.decider.prover.comment("Loop head block: Check well-definedness of edge conditions")
edgeConditions.foldLeft(Success(): VerificationResult) {
case (result, _) if !result.continueVerification => result
case (intermediateResult, eCond) =>
intermediateResult combine executionFlowController.locally(s1, v1)((s2, v2) => {
eval(s2, eCond, WhileFailed(eCond), v2)((_, _, _) =>
Success())})}})})
Success()
})})
combine executionFlowController.locally(s, v)((s0, v0) => {
v0.decider.prover.comment("Loop head block: Establish invariant")
consumes(s0, invs, LoopInvariantNotEstablished, v0)((sLeftover, _, v1) => {
Expand All @@ -276,8 +271,19 @@ object executor extends ExecutionRules {
Success()
else {
execs(s3, stmts, v2)((s4, v3) => {
val edgeCondWelldefinedness = {
v1.decider.prover.comment("Loop head block: Check well-definedness of edge conditions")
edgeConditions.foldLeft(Success(): VerificationResult) {
case (result, _) if !result.continueVerification => result
case (intermediateResult, eCond) =>
intermediateResult combine executionFlowController.locally(s4, v3)((s5, v4) => {
eval(s5, eCond, WhileFailed(eCond), v4)((_, _, _) =>
Success())
})
}
}
v3.decider.prover.comment("Loop head block: Follow loop-internal edges")
follows(s4, sortedEdges, WhileFailed, v3, joinPoint)(Q)})}})}})}))
edgeCondWelldefinedness combine follows(s4, sortedEdges, WhileFailed, v3, joinPoint)(Q)})}})}})}))

case _ =>
/* We've reached a loop head block via an edge other than an in-edge: a normal edge or
Expand Down
⚡