Skip to content

Avoid making unnecessary summaries for individual quantified chunks #839

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 4 commits into from
May 5, 2024
Merged

Avoid making unnecessary summaries for individual quantified chunks #839

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a6b64d
Avoid making unnecessary summaries for individual quantified chunks
marcoeilers May 4, 2024
ab106d9
Merge branch 'master' into meilers_avoid_summarizing_single_chunk
marcoeilers May 5, 2024
f51ca59
Added missing field trigger assumption
marcoeilers May 5, 2024
4dedba8
Merge branch 'master' into meilers_avoid_summarizing_single_chunk
marcoeilers May 5, 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
85 changes: 56 additions & 29 deletions src/main/scala/rules/Evaluator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,36 +228,63 @@ object evaluator extends EvaluationRules {
Q(s2, fvfLookup, v1)}
}
case _ =>
val (s2, smDef1, pmDef1) =
quantifiedChunkSupporter.heapSummarisingMaps(
s = s1,
resource = fa.field,
codomainQVars = Seq(`?r`),
relevantChunks = relevantChunks,
optSmDomainDefinitionCondition = None,
optQVarsInstantiations = None,
v = v1)
if (s2.heapDependentTriggers.contains(fa.field)){
val trigger = FieldTrigger(fa.field.name, smDef1.sm, tRcvr)
v1.decider.assume(trigger)
}
val permCheck =
if (s2.triggerExp) {
True
} else {
val totalPermissions = PermLookup(fa.field.name, pmDef1.pm, tRcvr)
IsPositive(totalPermissions)
if (relevantChunks.size == 1) {
// No need to create a summary since there is only one chunk to look at.
if (s1.heapDependentTriggers.contains(fa.field)) {
val trigger = FieldTrigger(fa.field.name, relevantChunks.head.fvf, tRcvr)
v1.decider.assume(trigger)
}
v1.decider.assert(permCheck) {
case false =>
createFailure(pve dueTo InsufficientPermission(fa), v1, s2)
case true =>
val smLookup = Lookup(fa.field.name, smDef1.sm, tRcvr)
val fr2 =
s2.functionRecorder.recordSnapshot(fa, v1.decider.pcs.branchConditions, smLookup)
.recordFvfAndDomain(smDef1)
val s3 = s2.copy(functionRecorder = fr2)
Q(s3, smLookup, v1)}
val permCheck =
if (s1.triggerExp) {
True
} else {
val permVal = relevantChunks.head.perm
val totalPermissions = permVal.replace(relevantChunks.head.quantifiedVars, Seq(tRcvr))
IsPositive(totalPermissions)
}
v1.decider.assert(permCheck) {
case false =>
createFailure(pve dueTo InsufficientPermission(fa), v1, s1)
case true =>
val smLookup = Lookup(fa.field.name, relevantChunks.head.fvf, tRcvr)
val fr2 =
s1.functionRecorder.recordSnapshot(fa, v1.decider.pcs.branchConditions, smLookup)
val s2 = s1.copy(functionRecorder = fr2)
Q(s2, smLookup, v1)
}
} else {
val (s2, smDef1, pmDef1) =
quantifiedChunkSupporter.heapSummarisingMaps(
s = s1,
resource = fa.field,
codomainQVars = Seq(`?r`),
relevantChunks = relevantChunks,
optSmDomainDefinitionCondition = None,
optQVarsInstantiations = None,
v = v1)
if (s2.heapDependentTriggers.contains(fa.field)) {
val trigger = FieldTrigger(fa.field.name, smDef1.sm, tRcvr)
v1.decider.assume(trigger)
}
val permCheck =
if (s2.triggerExp) {
True
} else {
val totalPermissions = PermLookup(fa.field.name, pmDef1.pm, tRcvr)
IsPositive(totalPermissions)
}
v1.decider.assert(permCheck) {
case false =>
createFailure(pve dueTo InsufficientPermission(fa), v1, s2)
case true =>
val smLookup = Lookup(fa.field.name, smDef1.sm, tRcvr)
val fr2 =
s2.functionRecorder.recordSnapshot(fa, v1.decider.pcs.branchConditions, smLookup)
.recordFvfAndDomain(smDef1)
val s3 = s2.copy(functionRecorder = fr2)
Q(s3, smLookup, v1)
}
}
}})

case fa: ast.FieldAccess =>
Expand Down
⚡