Skip to content
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

Optional Snapshot Generation in Consume #879

Merged
merged 7 commits into from
Nov 29, 2024
Merged

Optional Snapshot Generation in Consume #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fd11b1
remove snapshot creation in consume for some satements
mlimbeck Nov 9, 2024
db94d3f
Merge remote-tracking branch 'sil/master' into mlimbeck-consume-snap-…
mlimbeck Nov 19, 2024
5f9ea43
return Snap after consume only optionally
mlimbeck Nov 19, 2024
e0b1373
bug fixes in exhaleExt
mlimbeck Nov 20, 2024
8033a59
summariseHeapAndAssertReadAccess() optionally returns a snapshot
mlimbeck Nov 26, 2024
12ed299
remove comments, revert unnecessary changes
mlimbeck Nov 26, 2024
77366a8
minor improvements and feedback
mlimbeck Nov 27, 2024
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
28 changes: 18 additions & 10 deletions src/main/scala/rules/ChunkSupporter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ trait ChunkSupportRules extends SymbolicExecutionRules {
argsExp: Option[Seq[ast.Exp]],
perms: Term,
permsExp: Option[ast.Exp],
returnSnap: Boolean,
ve: VerificationError,
v: Verifier,
description: String)
(Q: (State, Heap, Term, Verifier) => VerificationResult)
(Q: (State, Heap, Option[Term], Verifier) => VerificationResult)
: VerificationResult

def produce(s: State, h: Heap, ch: NonQuantifiedChunk, v: Verifier)
Expand Down Expand Up @@ -71,17 +72,18 @@ object chunkSupporter extends ChunkSupportRules {
argsExp: Option[Seq[ast.Exp]],
perms: Term,
permsExp: Option[ast.Exp],
returnSnap: Boolean,
ve: VerificationError,
v: Verifier,
description: String)
(Q: (State, Heap, Term, Verifier) => VerificationResult)
(Q: (State, Heap, Option[Term], Verifier) => VerificationResult)
: VerificationResult = {

consume2(s, h, resource, args, argsExp, perms, permsExp, ve, v)((s2, h2, optSnap, v2) =>
consume2(s, h, resource, args, argsExp, perms, permsExp, returnSnap, ve, v)((s2, h2, optSnap, v2) =>
optSnap match {
case Some(snap) =>
Q(s2, h2, snap.convert(sorts.Snap), v2)
case None =>
Q(s2, h2, Some(snap.convert(sorts.Snap)), v2)
case None if returnSnap =>
/* Not having consumed anything could mean that we are in an infeasible
* branch, or that the permission amount to consume was zero.
*
Expand All @@ -91,7 +93,8 @@ object chunkSupporter extends ChunkSupportRules {
*/
val fresh = v2.decider.fresh(sorts.Snap, Option.when(withExp)(PUnknown()))
val s3 = s2.copy(functionRecorder = s2.functionRecorder.recordFreshSnapshot(fresh.applicable))
Q(s3, h2, fresh, v2)
Q(s3, h2, Some(fresh), v2)
case None => Q(s2, h2, None, v2)
})
}

Expand All @@ -102,6 +105,7 @@ object chunkSupporter extends ChunkSupportRules {
argsExp: Option[Seq[ast.Exp]],
perms: Term,
permsExp: Option[ast.Exp],
returnSnap: Boolean,
ve: VerificationError,
v: Verifier)
(Q: (State, Heap, Option[Term], Verifier) => VerificationResult)
Expand All @@ -111,24 +115,28 @@ object chunkSupporter extends ChunkSupportRules {
if (s.exhaleExt) {
val failure = createFailure(ve, v, s, "chunk consume in package")
magicWandSupporter.transfer(s, perms, permsExp, failure, Seq(), v)(consumeGreedy(_, _, id, args, _, _, _))((s1, optCh, v1) =>
Q(s1, h, optCh.flatMap(ch => Some(ch.snap)), v1))
if (returnSnap){
Q(s1, h, optCh.flatMap(ch => Some(ch.snap)), v1)
} else {
Q(s1, h, None, v1)
})
} else {
executionFlowController.tryOrFail2[Heap, Option[Term]](s.copy(h = h), v)((s1, v1, QS) =>
if (s1.moreCompleteExhale) {
moreCompleteExhaleSupporter.consumeComplete(s1, s1.h, resource, args, argsExp, perms, permsExp, ve, v1)((s2, h2, snap2, v2) => {
moreCompleteExhaleSupporter.consumeComplete(s1, s1.h, resource, args, argsExp, perms, permsExp, returnSnap, ve, v1)((s2, h2, snap2, v2) => {
QS(s2.copy(h = s.h), h2, snap2, v2)
})
} else {
consumeGreedy(s1, s1.h, id, args, perms, permsExp, v1) match {
case (Complete(), s2, h2, optCh2) =>
val snap = optCh2 match {
case None => None
case Some(ch) =>
case Some(ch) if returnSnap =>
if (v1.decider.check(IsPositive(perms), Verifier.config.checkTimeout())) {
Some(ch.snap)
} else {
Some(Ite(IsPositive(perms), ch.snap.convert(sorts.Snap), Unit))
}
case _ => None
}
QS(s2.copy(h = s.h), h2, snap, v1)
case _ if v1.decider.checkSmoke(true) =>
Expand Down
Loading
Loading