Cell swap (#2) #1461
Merged
Cell swap (#2) #1461
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the new feature to support mutable swap operation on Cell
mario-bucev
reviewed
Oct 30, 2023
There was a problem hiding this comment.
Looks good 👍 ! Just minor details :)
There is also a missing case for CellSwap in AntiAliasing#doNormalize:
case swp @ CellSwap(cell1, cell2) =>
val (ctxCell1, normCell1) = normalizeForTarget(cell1)
val (ctxCell2, normCell2) = normalizeForTarget(cell2)
(ctxCell1 compose ctxCell2, CellSwap(normCell1, normCell2).copiedFrom(swp))
Comment on lines
505
to
521
| val cellClassDef = symbols.lookup.get[ClassDef]("stainless.lang.Cell").get | ||
| val vFieldId = cellClassDef.fields.head.id | ||
|
|
||
| val temp = ValDef.fresh("temp", base).setPos(cellSwap) | ||
| val targets1 = getDirectTargetsDealiased(cell1, ClassFieldAccessor(vFieldId), env) | ||
| .getOrElse(throw MalformedStainlessCode(cellSwap, "Unsupported cellSwap (first cell)")) | ||
| val targets2 = getDirectTargetsDealiased(cell2, ClassFieldAccessor(vFieldId), env) | ||
| .getOrElse(throw MalformedStainlessCode(cellSwap, "Unsupported cellSwap (second cell)")) | ||
|
|
||
| val updates1 = updatedTargetsAndAliases(targets2, ClassSelector(cell1, vFieldId).setPos(cellSwap), env, cellSwap.getPos) | ||
| val updates2 = updatedTargetsAndAliases(targets1, temp.toVariable, env, cellSwap.getPos) | ||
| val updates = updates1 ++ updates2 | ||
| if (updates.isEmpty) UnitLiteral().setPos(cellSwap) | ||
| else | ||
| Let(temp, transform(ClassSelector(cell2, vFieldId).setPos(cellSwap), env), | ||
| Block(updates.init, updates.last).setPos(cellSwap) | ||
| ).setPos(cellSwap) |
There was a problem hiding this comment.
recCell1 and recCell2 should be used here
There was a problem hiding this comment.
whoops, fixed! Thanks :)
| val tmpId = rec(FreshIdentifier("tmp")) | ||
| val tmpVd = CIR.ValDef(tmpId, rec(cellBaseType), false) | ||
| val tmp = CIR.Binding(tmpVd) | ||
| throw new Exception(f"CellSwap to IR phase: cellBase type = $cellBaseType; vField Id = $vFieldId") |
|
Closes #1356 |
Whoops, I added it! |
|
@mario-bucev I applied the fixes according to your comments! |
|
Awesome! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a new
Cellfeature with aswapto support more mutability, notably swapping 2 variables.This adds a new
Cellclass in the library, and aswapfunction exchanging their values:These can be used as follows: