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.

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

Heapster bugfixes for tcCFG #1414

Merged
merged 6 commits into from
Aug 10, 2021
Merged

Heapster bugfixes for tcCFG #1414

merged 6 commits into from
Aug 10, 2021

Conversation

eddywestbrook
Copy link
Contributor

Fixed two bugs in the top-level type-checker for CFGs, tcCFG:

  1. deleteEntryCallees was keeping the call sites it was supposed to delete
  2. tcCFG was limited to 5 iterations that allow widening before we have to stop, to avoid an infinite loop

I also changed the Show method for TypedBlockID and TypedEntryID so that the block numbers are printed the same as the corresponding standard Crucible block numbers.

@eddywestbrook eddywestbrook added the subsystem: heapster Issues specifically related to memory verification using Heapster label Aug 9, 2021
buildBlockIDMap (viewAssign -> AssignExtend asgn _) =
Ctx.extend (fmapFC extendBlockIDTrans $ buildBlockIDMap asgn)
(BlockIDTrans Member_Base)
buildBlockIDMap blks =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not critical, but since this only uses the size of the incoming assignment, it might be nice to take the Size directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooh, yes, good suggestion!

heapster-saw/src/Verifier/SAW/Heapster/TypedCrucible.hs Outdated Show resolved Hide resolved
@eddywestbrook eddywestbrook added the PR: ready to merge Magic flag for pull requests to ask Mergify to merge given an approval and a successful CI run label Aug 10, 2021
@eddywestbrook
Copy link
Contributor Author

I am merging this manually because I have run the CI locally and confirmed that everything works correctly, and because the github CI does not seem to be running...?

@eddywestbrook eddywestbrook merged commit 92cbd4b into master Aug 10, 2021
@mergify mergify bot deleted the heapster-bugfixes-tccfg branch August 10, 2021 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: ready to merge Magic flag for pull requests to ask Mergify to merge given an approval and a successful CI run subsystem: heapster Issues specifically related to memory verification using Heapster
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants