Move AbsoluteSyntaxInfo to "edge" SyntaxData information #659
Conversation
This file contains hidden or 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
|
@swift-ci Please test |
rintaro
force-pushed
the
syntaxdata-indirect-edge
branch
from
3255377 to
96d70de
Compare
|
@swift-ci Please test |
Merged
ahoppen
approved these changes
Sep 2, 2022
Sources/SwiftSyntax/SyntaxData.swift
Outdated
| init(_ value: Syntax) { | ||
| self.value = value | ||
| // For non-root nodes. | ||
| struct Edge { |
There was a problem hiding this comment.
I don’t like the term edge here. To me the edge would be information that’s related to the parent-child relationship between two nodes. But absoluteInfo is information about this node in the entire tree.
It’s not a great name but NonRoot would make me stumble a lot less.
|
rdar://99492992 |
The root node doesn't need to hold its `AbsoluteSyntaxInfo` because
it's always zero. Move this information to "edge" data so only non-root
nodes hold the "absolute info". Introduce an "edge" info struct, and use
it with `indirect` enum case instead of `SyntaxBox`.
Previously the structure of `SyntaxData` was:
* AbsoluteRawSyntax
* RawSyntax
* AbsoluteSyntaxInfo
* Tagged union of
* SyntaxArena
* SyntaxBox
* Parent SyntaxData
Now:
* RawSyntax node
* Tagged union of:
* SyntaxData.Info.Root
* SyntaxArena
* SyntaxData.Info.Edge (indirect case)
* Parent SyntaxData
* AbsoluteSyntaxInfo
This reduces the size of `SyntaxData` to 2 words.
Also `SyntaxData.parent` now returns `SyntaxData` instead of `Syntax`.
`SyntaxData` should not rely on `Syntax` API at all.
rintaro
force-pushed
the
syntaxdata-indirect-edge
branch
from
96d70de to
53d91e8
Compare
|
@swift-ci Please test |
1 similar comment
|
@swift-ci Please test |
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.
The root node doesn't need to hold its
AbsoluteSyntaxInfobecause it's always zero. Move this information to "edge" data so only non-root nodes hold the "absolute info". Introduce an "edge" info struct, and use it withindirectenum case instead ofSyntaxBox.Previously the structure of
SyntaxDatawas:Now:
This reduces the size of
SyntaxDatato 2 words.Also
SyntaxData.parentnow returnsSyntaxDatainstead ofSyntax.SyntaxDatashould not rely onSyntaxAPI at all.As for the performance, compared to pre #635, this improves
testEmptyAnyVistorPerformance/testEmptyRewriterPerformance/testEmptyVisitorPerformanceby 5-10%.