[5.9] Fix two memory corruption bugs in SwiftSyntax #1719
Merged
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.
This is a slightly less risky version of #1708
SyntaxData.forRoottakes aRawSyntax, which holds a reference to itsSyntaxArenabutRawSyntaxdoesn’t retain its arena. We were already taking care of this in multiple places by adding awithExtendedLifetimefor the arena around it but missed a case inSyntaxData.replacingSelf. AddwithExtendedLifetimehere as well.replacingChildfunction took aRawSyntax, which again doesn’t retain its arena. When changing any syntax node’s child, we have avalue, which is aSyntaxnode but all we did in the setter was to passvalue.rawintoreplacingChild. This left an opportunity for the optimizer to deallocate theSyntaxnode (and thus it’s arena) before the call toreplacingChildbecause all we needed from hat node was theRawSyntax. To fix this, add another version ofreplacingChildthat takes aSyntaxData(which does retain the arena) and use that instead.SyntaxArena.rewritepassed a newSyntaxArenatoreplacingSelf, butreplacingSelfexpected to be passed the arena in whichrewrittenwas allocated.withExtendedLifetimecallsswift-formatdoesn’t regress in performance