Skip to content

Merge new QP chunks, assuming bounds and non-aliasing early. #835

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 1 commit into from
Apr 25, 2024
Merged

Merge new QP chunks, assuming bounds and non-aliasing early. #835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions src/main/scala/rules/QuantifiedChunkSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,19 +903,19 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
val interpreter = new QuantifiedPropertyInterpreter
resourceDescription.instanceProperties.foreach (property => {
v.decider.prover.comment(property.description)
v.decider.assume(interpreter.buildPathConditionForChunk(
val pcsForChunk = interpreter.buildPathConditionForChunk(
chunk = ch,
property = property,
qvars = effectiveTriggersQVars,
args = tArgs,
perms = gain,
condition = tCond,
triggers = effectiveTriggers,
qidPrefix = qid)
qidPrefix = qid
)
v.decider.assume(pcsForChunk)
})

val h1 = s.h + ch
val (fr1, h1) = v.stateConsolidator(s).merge(s.functionRecorder, s.h, Heap(Seq(ch)), v)

val resourceIdentifier = resource match {
case wand: ast.MagicWand => MagicWandIdentifier(wand, s.program)
Expand Down Expand Up @@ -947,7 +947,7 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
}
val s1 =
s.copy(h = h1,
functionRecorder = s.functionRecorder.recordFieldInv(inv),
functionRecorder = fr1.recordFieldInv(inv),
conservedPcs = conservedPcs,
smCache = smCache1)
Q(s1, v)
Expand Down Expand Up @@ -976,7 +976,7 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
if (s.recordPcs) (s.conservedPcs.head :+ v.decider.pcs.after(definitionalAxiomMark)) +: s.conservedPcs.tail
else s.conservedPcs
val ch = quantifiedChunkSupporter.createSingletonQuantifiedChunk(formalQVars, resource, tArgs, tPerm, sm, s.program)
val h1 = s.h + ch
val (fr1, h1) = v.stateConsolidator(s).merge(s.functionRecorder, s.h, Heap(Seq(ch)), v)

val interpreter = new NonQuantifiedPropertyInterpreter(h1.values, v)
val resourceDescription = Resources.resourceDescriptions(ch.resourceID)
Expand All @@ -1003,7 +1003,7 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
val smDef2 = SnapshotMapDefinition(resource, sm, Seq(smValueDef), Seq())
val s1 = s.copy(h = h1,
conservedPcs = conservedPcs,
functionRecorder = s.functionRecorder.recordFvfAndDomain(smDef2),
functionRecorder = fr1.recordFvfAndDomain(smDef2),
smCache = smCache1)
Q(s1, v)
}
Expand Down Expand Up @@ -1429,8 +1429,14 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
val chunkDepleted = v.decider.check(depletedCheck, Verifier.config.splitTimeout())

if (!chunkDepleted) {
remainingChunks =
remainingChunks :+ ithChunk.withPerm(PermMinus(ithChunk.perm, ithPTaken))
val unusedCheck = Forall(codomainQVars, ithPTaken === NoPerm, Nil)
val chunkUnused = v.decider.check(unusedCheck, Verifier.config.checkTimeout())
if (chunkUnused) {
remainingChunks = remainingChunks :+ ithChunk
} else {
remainingChunks =
remainingChunks :+ ithChunk.withPerm(PermMinus(ithChunk.perm, ithPTaken))
}
}
}

Expand Down
⚡