[Serialization] Store offset of decls in .swiftsourceinfo #37105
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 |
benlangmuir
reviewed
Apr 28, 2021
bnbarham
force-pushed
the
serialize-offsets
branch
from
3e69121 to
67f9578
Compare
|
@swift-ci please test |
benlangmuir
approved these changes
Apr 28, 2021
bnbarham
force-pushed
the
serialize-offsets
branch
from
67f9578 to
ff28009
Compare
|
@swift-ci please test |
|
Build failed |
The locations stored in .swiftsourceinfo included the presumed file, line, and column. When a location is requested it would read these, open the external file, create a line map, and find the offset corresponding to that line/column. The offset is known during serialization though, so output it as well to avoid having to read the file and generate the line map. Since the serialized location is returned from `Decl::getLoc()`, it should not be the presumed location. Instead, also output the line directives so that the presumed location can be built as per normal locations. Finally, move the cache out of `Decl` and into `ASTContext`, since very few declarations will actually have their locations deserialized. Make sure to actually write to that cache so it's used - the old cache was never written to.
bnbarham
force-pushed
the
serialize-offsets
branch
from
ff28009 to
c763ab5
Compare
|
Forgot to up the .swiftsourceinfo version, have done so now. The .swiftsourceinfo will currently be ignored if the version doesn't match. (This wasn't the failure, which looks to be unrelated and will likely fail again...) @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 locations stored in .swiftsourceinfo included the presumed file,
line, and column. When a location is requested it would read these, open
the external file, create a line map, and find the offset corresponding
to that line/column.
The offset is known during serialization though, so output it as well to
avoid having to read the file and generate the line map.
Since the serialized location is returned from
Decl::getLoc(), itshould not be the presumed location. Instead, also output the line
directives so that the presumed location can be built as per normal
locations.
Finally, move the cache out of
Decland intoASTContext, since veryfew declarations will actually have their locations deserialized. Make
sure to actually write to that cache so it's used - the old cache was
never written to.