Skip to content

[6.3] [SourceKit] Always check buffer in SemanticAnnotator #85961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
hamishknight merged 1 commit into from
Dec 11, 2025
Merged

[6.3] [SourceKit] Always check buffer in SemanticAnnotator #85961

hamishknight merged 1 commit into from
Dec 11, 2025

Conversation

@hamishknight
Copy link
Contributor

@hamishknight hamishknight commented Dec 10, 2025

6.3 cherry-pick of part of #85952

  • Explanation: Fixes a SourceKit crash that could occur when attempting to retrieve the semantic tokens of a SourceFile that uses a body macro
  • Scope: Affects SourceKit semantic tokens
  • Issue: rdar://165420658, LSP crashes on file that uses attached macro #85705
  • Risk: Low, only affects SourceKit, and the fix applies existing logic in more cases
  • Testing: Added tests to test suite
  • Reviewer: TBD

@hamishknight
[SourceKit] Always check buffer in SemanticAnnotator
7c11824 
Make sure we don't ever try to record semantic tokens for a different
buffer. This works around an ASTWalker issue where it will walk macro
expanded bodies even in non-macro-expansion mode.

rdar://165420658
@hamishknight hamishknight requested a review from a team as a code owner December 10, 2025 20:51
@hamishknight hamishknight added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.3 labels Dec 10, 2025
@hamishknight
Copy link
Contributor Author

hamishknight commented Dec 10, 2025

@swift-ci please test

bnbarham
bnbarham approved these changes Dec 10, 2025
View reviewed changes
Copy link
Contributor

@bnbarham bnbarham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@hamishknight hamishknight merged commit 5ddeac2 into swiftlang:release/6.3 Dec 11, 2025
5 checks passed
@hamishknight hamishknight deleted the skip-body-macro-6.3 branch December 11, 2025 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bnbarham bnbarham bnbarham approved these changes

@hborla hborla Awaiting requested review from hborla

Assignees

No one assigned

Labels

🍒 release cherry pick Flag: Release branch cherry picks swift 6.3

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hamishknight @bnbarham