Skip to content

Fixing issue #845 #846

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
Jun 7, 2024
Merged

Fixing issue #845 #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd78305
Reusing more cached snapshot maps
marcoeilers Jun 7, 2024
3004d1f
Fixed the new, more permissive check
marcoeilers Jun 7, 2024
08b8544
Third attempt
marcoeilers Jun 7, 2024
16d5936
Fourth attempt
marcoeilers Jun 7, 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
4 changes: 2 additions & 2 deletions src/main/scala/rules/QuantifiedChunkSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
codomainQVars,
relevantChunks,
v1,
optSmDomainDefinitionCondition = if (s2.smDomainNeeded) Some(True) else None,
optSmDomainDefinitionCondition = None,
optQVarsInstantiations = Some(arguments))
val permsTaken = result match {
case Complete() => rPerm
Expand Down Expand Up @@ -1332,7 +1332,7 @@ object quantifiedChunkSupporter extends QuantifiedChunkSupport {
resource = resource,
codomainQVars = codomainQVars,
relevantChunks = relevantChunks,
optSmDomainDefinitionCondition = if (s1.smDomainNeeded) Some(True) else None,
optSmDomainDefinitionCondition = None,
optQVarsInstantiations = Some(arguments),
v = v)
val s2 = s1.copy(functionRecorder = s1.functionRecorder.recordFvfAndDomain(smDef1),
Expand Down
5 changes: 4 additions & 1 deletion src/main/scala/state/SnapshotMapCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ case class SnapshotMapCache private (
: Option[SnapshotMapCache.Value] = {

cache.get(key) match {
case Some((smDef, totalPermissions, `optSmDomainDefinitionCondition`)) =>
case Some((smDef, totalPermissions, cachedSmDomainDefinitionCondition))
if cachedSmDomainDefinitionCondition == optSmDomainDefinitionCondition || // defined under the same condition
(cachedSmDomainDefinitionCondition.contains(terms.True) && optSmDomainDefinitionCondition.isEmpty) // cached is always defined and we don't need a domain
=>
Some((smDef, totalPermissions))

case _ =>
Expand Down
⚡