Skip to content

[6.2] [Refactoring] Handle argument count mismatches in renameLabelsLenient #82967

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
merged 1 commit into from
Jul 11, 2025
Merged

[6.2] [Refactoring] Handle argument count mismatches in renameLabelsLenient #82967

merged 1 commit into from
Jul 11, 2025
+110 −6

Conversation

@hamishknight
Copy link
Contributor

@hamishknight hamishknight commented Jul 10, 2025 •
edited
Loading

6.2 cherry-pick of #82966

  • Explanation: Fixes a crash that could occur when starting a rename of a function in cases where there are calls that have too many arguments, including in comments
  • Scope: Affects rename
  • Issue: rdar://155549979
  • Risk: Low, only affects rename, and the fix purely guards against cases that would otherwise crash
  • Testing: Added tests to test suite
  • Reviewer: Ben Barham

@hamishknight
[Refactoring] Handle argument count mismatches in renameLabelsLenient
e3c1dfc 
Make sure we bail if we don't have enough labels in the old name when
matching against a found reference.

rdar://155549979
@hamishknight hamishknight requested a review from bnbarham July 10, 2025 20:47
@hamishknight hamishknight requested a review from a team as a code owner July 10, 2025 20:47
@hamishknight hamishknight added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.2 labels Jul 10, 2025
@hamishknight
Copy link
Contributor Author

hamishknight commented Jul 10, 2025

@swift-ci please test

@hamishknight
Copy link
Contributor Author

hamishknight commented Jul 11, 2025

@swift-ci please test Windows

@hamishknight hamishknight enabled auto-merge July 11, 2025 09:10
@hamishknight hamishknight merged commit 9fb2e2f into swiftlang:release/6.2 Jul 11, 2025
5 checks passed
@hamishknight hamishknight deleted the len-check-6.2 branch July 11, 2025 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hborla hborla hborla approved these changes

@bnbarham bnbarham Awaiting requested review from bnbarham

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hamishknight @hborla