Fix interception of return statements in closures #100
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
dwnusbaum
commented
Dec 8, 2022
| @@ -498,10 +498,13 @@ private Expression innerTransform(Expression exp) { | |||
| } | |||
| boolean old = visitingClosureBody; | |||
| visitingClosureBody = true; | |||
| ClassNode oldMethodReturnType = methodReturnType; | |||
| methodReturnType = ClassHelper.OBJECT_TYPE; | |||
Comment on lines
+1109
to
+1113
| "@groovy.transform.Field\n" + | ||
| "private static final field = [\n" + | ||
| " key: { x -> return x == 123 }\n" + | ||
| "]\n" + | ||
| "field.key(123)\n", |
There was a problem hiding this comment.
This script used to throw an NPE during compilation in the sandbox.
Comment on lines
+1119
to
+1127
| "File method() {\n" + | ||
| " def field = [\n" + | ||
| " key: { x -> return x }\n" + | ||
| " ]\n" + | ||
| " result = field.key(['secret.key'])\n" + | ||
| " null\n" + | ||
| "}\n" + | ||
| "method()\n" + | ||
| "result", |
There was a problem hiding this comment.
This script used to return an instance of File (and intercept the File constructor call) in the sandbox.
daniel-beck
approved these changes
Dec 8, 2022
6 tasks
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.
Fixes #99
The code related to intercepting implicit Groovy casts in method return values in 5202432 caused two related bugs for closure expressions with explicit return statements:
@Field) and have explicit return statements cause an NPE during compilation