fix: crash when passing NimNode to static parameter #1449
Merged
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
The VM serialization logic already supports AST literals, but `mirgen` didn't let them through. Now it does.
`NimNode` values returned directly from VM execution were neither checked (for cycles), nor wrapped in a `nkNimNodeLit` tree, leaving them in an invalid state. The `vmcompilerserdes` handling for NimNodes is split into a separate procedure, which is then used by both `vmcompilerserdes` and `regToNode`.
The test covers both fixed issues, since the `newStmtList` call is fully evaluated first before it is passed to the macro (where it is then processed by `constDataToMir`).
The implementation relied on `regToNode` returning the the raw `PNode` for `NimNode` values. It no longer does, so the `opcRepr` logic is adjusted to manually handle the `NimNode` case.
zerbina
added
bug
saem
approved these changes
Sep 5, 2024
| @@ -2490,6 +2490,8 @@ proc constDataToMir*(env: var MirEnv, n: PNode): MirTree = | |||
| bu.use toFloatLiteral(env, n) | |||
| of nkStrLiterals: | |||
| bu.use strLiteral(env, n.strVal, typ) | |||
| of nkNimNodeLit: | |||
There was a problem hiding this comment.
Yay, nkNimNodeLit is becoming more pervasive, this means fewer places where AST is ambiguously passed around.
| newNodeIT(nkEmpty, info, formal), | ||
| PAstDiag(kind: adCyclicTree, cyclic: n)) | ||
| else: | ||
| result = newTreeIT(nkNimNodeLit, info, formal): n |
There was a problem hiding this comment.
Don't see this as an issue now, and probably ever, but it looks like we're going to treat nkNimNodeLit to mean either a literal/static AST value or dynamic AST value. Where the latter one is generated on the fly, at compile time.
|
/merge |
|
Merge requested by: @saem Contents after the first section break of the PR description has been removed and preserved below: |
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.
Summary
staticparameterNimNode-returning constantexpression
Details
There were two problems:
nkNimNodeLitwasn't handled in constant data expression bymirgenNimNodevalues returned directly from a VM invocation weren'twrapped in
nkNimNodeLittreesFor handling
NimNodevalues invm.regToNode, the existingdeserialization logic for
NimNodevalues invmcompilerserdesismoved to a separate procedure, so that it can be used by
regToNode.The
opcReprimplementation relied onregToNodealways returningan unwrapped
PNode-- it is adjusted to manually handleNimNodevalues.
A test covering both issues is added.
Fixes #1448.