-
Notifications
You must be signed in to change notification settings - Fork 334
Make sure suspended blocks are evaluated only once #14530
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
Open
JaroslavTulach
wants to merge
1
commit into
develop
Choose a base branch
from
wip/jtulach/MemoizeResultOfLazyBlock14474
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+138
−35
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
87 changes: 87 additions & 0 deletions
87
engine/runtime/src/main/java/org/enso/interpreter/node/scope/LazyAssignmentNode.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package org.enso.interpreter.node.scope; | ||
|
|
||
| import com.oracle.truffle.api.dsl.Fallback; | ||
| import com.oracle.truffle.api.dsl.NodeChild; | ||
| import com.oracle.truffle.api.dsl.Specialization; | ||
| import com.oracle.truffle.api.frame.Frame; | ||
| import com.oracle.truffle.api.frame.FrameSlotKind; | ||
| import com.oracle.truffle.api.frame.MaterializedFrame; | ||
| import com.oracle.truffle.api.frame.VirtualFrame; | ||
| import com.oracle.truffle.api.nodes.NodeInfo; | ||
| import org.enso.interpreter.node.ExpressionNode; | ||
| import org.enso.interpreter.runtime.callable.function.Function; | ||
|
|
||
| /** This node represents an assignment to a variable in a given scope. */ | ||
| @NodeInfo(shortName = "=", description = "Lazily assigns expression result to a variable.") | ||
| @NodeChild(value = "rhsNode", type = ExpressionNode.class) | ||
| public abstract class LazyAssignmentNode extends ExpressionNode { | ||
|
|
||
| private final int parentLevel; | ||
| private final int frameSlotIdx; | ||
|
|
||
| LazyAssignmentNode(int parentLevel, int frameSlotIdx) { | ||
| this.parentLevel = parentLevel; | ||
| this.frameSlotIdx = frameSlotIdx; | ||
| } | ||
|
|
||
| /** | ||
| * Creates an instance of this node. | ||
| * | ||
| * @param expression the expression being assigned | ||
| * @param frameSlotIdx the slot index to which {@code expression} is being assigned | ||
| * @return a node representing an assignment | ||
| */ | ||
| public static LazyAssignmentNode build( | ||
| ExpressionNode expression, int parentLevel, int frameSlotIdx) { | ||
| return LazyAssignmentNodeGen.create(parentLevel, frameSlotIdx, expression); | ||
| } | ||
|
|
||
| /** | ||
| * Writes a long value into the provided frame. | ||
| * | ||
| * @param frame the frame to write to | ||
| * @param value the value to write | ||
| * @return the unit type | ||
| */ | ||
| @Specialization(guards = "isLongOrIllegal(frame)") | ||
| protected Object writeLong(VirtualFrame frame, long value) { | ||
| var realFrame = getParentFrame(frame); | ||
| realFrame.getFrameDescriptor().setSlotKind(frameSlotIdx, FrameSlotKind.Long); | ||
| realFrame.setLong(frameSlotIdx, value); | ||
| return value; | ||
| } | ||
|
|
||
| /** | ||
| * Writes an object value into the provided frame. | ||
| * | ||
| * @param frame the frame to write to | ||
| * @param value the value to write | ||
| * @return the unit type | ||
| */ | ||
| @Fallback | ||
| protected Object writeObject(VirtualFrame frame, Object value) { | ||
| var realFrame = getParentFrame(frame); | ||
| realFrame.getFrameDescriptor().setSlotKind(frameSlotIdx, FrameSlotKind.Object); | ||
| realFrame.setObject(frameSlotIdx, value); | ||
|
|
||
| return value; | ||
| } | ||
|
|
||
| boolean isLongOrIllegal(VirtualFrame frame) { | ||
| var realFrame = getParentFrame(frame); | ||
| FrameSlotKind kind = realFrame.getFrameDescriptor().getSlotKind(frameSlotIdx); | ||
| return kind == FrameSlotKind.Long || kind == FrameSlotKind.Illegal; | ||
| } | ||
|
|
||
| private MaterializedFrame getParentFrame(Frame frame) { | ||
| return Function.ArgumentsHelper.getLocalScope(frame.getArguments()); | ||
| } | ||
|
|
||
| private MaterializedFrame getProperFrame(Frame frame) { | ||
| MaterializedFrame currentFrame = getParentFrame(frame); | ||
| for (int i = 1; i < parentLevel; i++) { | ||
| currentFrame = getParentFrame(currentFrame); | ||
| } | ||
| return currentFrame; | ||
| } | ||
| } |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
block.suspendedcheck