Variable capture: synchronize with aliases in nested scopes #14035
+41
−11
Conversation
This file contains 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
asgerf
changed the title
aschackmull
reviewed
Aug 24, 2023
| @@ -562,7 +583,7 @@ module Flow<InputSig Input> implements OutputSig<Input> { | |||
|
|
|||
| /** | |||
| * Holds if `access` is a reference to `ce` evaluated in the `i`th node of `bb`. | |||
| * The reference is restricted to be in the same callable as `ce` as a | |||
| * The reference is restricted to be nested within the same callable as `ce` as a | |||
There was a problem hiding this comment.
With this update, I'd like this predicate renamed from localClosureAccess to localOrNestedClosureAccess. Or something like this - the "local" prefix certainly is no longer true.
aschackmull
reviewed
Aug 24, 2023
| result = bb.getEnclosingCallable() and | ||
| // The reference to `ce` is allowed to occur in a more deeply nested context | ||
| closureExprGetEnclosingCallable(ce) = callableGetEnclosingCallable*(result) | ||
| ) |
There was a problem hiding this comment.
Could we merge closureExprGetAReferencingCallable and closureExprGetCallable into one predicate, please? I.e. add the following here:
Suggested change
| ) | |
| ) | |
| or | |
| result = closureExprGetEnclosingCallable(ce) |
aschackmull
reviewed
Aug 24, 2023
| @@ -391,16 +391,6 @@ module Flow<InputSig Input> implements OutputSig<Input> { | |||
| msg = "ClosureExpr has no body" and not ce.hasBody(_) | |||
| } | |||
|
|
|||
| query predicate closureAliasMustBeLocal(ClosureExpr ce, Expr access, string msg) { | |||
There was a problem hiding this comment.
Perhaps, instead of deleting this check, could we update it to check that all aliases are either local or in a nested scope? Since that's what we now rely on.
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.
When a variable refers to a closure, we emulate what would happen if that closure had been inlined at that point.