[Macros] Cache SourceLocationConverter in ExportedSourceFile
#70415
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
ahoppen
force-pushed
the
ahoppen/cache-source-loc-converter
branch
from
19a9cd7 to
67f04d9
Compare
|
@swift-ci Please smoke test |
bnbarham
approved these changes
Dec 13, 2023
ahoppen
force-pushed
the
ahoppen/cache-source-loc-converter
branch
from
67f04d9 to
cc378e4
Compare
ahoppen
force-pushed
the
ahoppen/cache-source-loc-converter
branch
from
cc378e4 to
ede70fa
Compare
|
@bnbarham Running test uncovered that I wasn’t handling the file path mode properly in |
|
@swift-ci Please smoke test |
bnbarham
reviewed
Dec 14, 2023
| if adjustedFile == exportedSourceFile.fileName { | ||
| adjustedFile = fileID | ||
| } | ||
| var adjustePresumedFile = location.presumedFile |
There was a problem hiding this comment.
Suggested change
| var adjustePresumedFile = location.presumedFile | |
| var adjustedPresumedFile = location.presumedFile |
| let fileID = "\(exportedSourceFile.moduleName)/\(exportedSourceFile.fileName.basename)" | ||
| var adjustedFile = location.file | ||
| if adjustedFile == exportedSourceFile.fileName { | ||
| adjustedFile = fileID |
There was a problem hiding this comment.
What does it mean if they aren't equal? I thought that would be the presumed file case, but apparently not?
There was a problem hiding this comment.
AFAIK it can only happen for the presumed file. I can change it to an assertion that adjustedFile == exportedSourceFile.fileName. Don’t have strong opinions here. Just thought that it would be better to recover instead of crashing/asserting.
We need a `SourceLocationConverter` every time we create a `PluginMessage.Syntax` to know the source location of that syntax node within the source file. This means that we needed to re-build the line table of the entire source file multiple times for every macro that we expand. Cache it to improve performance. rdar://119047550
ahoppen
force-pushed
the
ahoppen/cache-source-loc-converter
branch
from
ede70fa to
8da0754
Compare
hamishknight
approved these changes
Dec 15, 2023
|
@swift-ci Please test |
|
@swift-ci please test |
rintaro
approved these changes
Jan 8, 2024
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.
We need a
SourceLocationConverterevery time we create aPluginMessage.Syntaxto know the source location of that syntax node within the source file. This means that we needed to re-build the line table of the entire source file multiple times for every macro that we expand. Cache it to improve performance.rdar://119047550