[SerializeDoc] Don't crash in module-merging with a group info file #27867
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
Group info works by matching source filenames with groups, but in module merging the decls in the module no longer have associated SourceFiles. Long-term, maybe we should switch this to working on filenames directly (using the new support provided by swiftsourceinfo files), but for now just don't crash. rdar://problem/56592085
|
@swift-ci Please smoke test |
|
Actually, the regression might have come from the swiftsourceinfo changes anyway, since now the SourceLoc is valid even though it's not from a SourceFile. I wonder where else in the compiler we've conflated those two. :-/ |
nkcsgexi
reviewed
Oct 24, 2019
| @@ -153,8 +153,16 @@ class DeclGroupNameContext { | |||
| // We need the file path, so there has to be a location. | |||
| if (VD->getLoc().isInvalid()) | |||
There was a problem hiding this comment.
VD->getLoc(false) works too.
There was a problem hiding this comment.
Oh yeah. I guess I'll leave it this way because eventually we'll want group info to work in non-single-frontend mode anyway.
nkcsgexi
approved these changes
Oct 24, 2019
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.
Group info works by matching source filenames with groups, but in module merging the decls in the module no longer have associated SourceFiles. Long-term, maybe we should switch this to working on filenames directly (using the new support provided by swiftsourceinfo files), but for now just don't crash.
Fixes a bug I introduced in #26734.
rdar://problem/56592085