fix cyclic node flag getting added to sink call [backport:2.0] #24194
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
metagn
changed the title
|
Refactor it so that |
|
Done |
Araq
reviewed
Sep 29, 2024
| @@ -317,8 +317,9 @@ proc isCriticalLink(dest: PNode): bool {.inline.} = | |||
| ]# | |||
| result = dest.kind != nkSym | |||
|
|
|||
| proc finishCopy(c: var Con; result, dest: PNode; isFromSink: bool) = | |||
| if c.graph.config.selectedGC == gcOrc: | |||
| proc finishCopy(c: var Con; result, dest: PNode; flags: set[MoveOrCopyFlag]; isFromSink: bool) = | |||
There was a problem hiding this comment.
Eventually move the isFromSink to MoveOrCopyFlag.
|
Thanks for your hard work on this PR! Hint: mm: orc; opt: speed; options: -d:release |
narimiran
pushed a commit
that referenced
this pull request
Sep 30, 2024
Sorry I don't have a test case or issue for this. `injectdestructors` is supposed to add a final bool argument to `=copy` and `=dup` to mark cyclic types, as generated by `liftdestructors`. Hence this flag is added after every call to `genCopy`, but `genCopy` can generate a `=sink` call when passed the flag `IsExplicitSink` by `nkSinkAsgn`. This creates a codegen error, saying the sink received an extra argument. This is fixed by not adding the argument on the flag `IsExplicitSink`. This is a followup to #20585 which is on the 2.0 branch, hence this is marked backport. (cherry picked from commit 7974a22)
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.
Sorry I don't have a test case or issue for this.
injectdestructorsis supposed to add a final bool argument to=copyand=dupto mark cyclic types, as generated byliftdestructors. Hence this flag is added after every call togenCopy, butgenCopycan generate a=sinkcall when passed the flagIsExplicitSinkbynkSinkAsgn. This creates a codegen error, saying the sink received an extra argument. This is fixed by not adding the argument on the flagIsExplicitSink.This is a followup to #20585 which is on the 2.0 branch, hence this is marked backport.