[6.1][Concurrency/Diagnostics] A few fixes to diagnostic downgrades and tracking #79601
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
Unify `warn` + `limitBehavior` into a single call to make sure that diagnostic doesn't get downgraded multiple times because that could affect how diagnostics are tracked. (cherry picked from commit 1649b5e)
…t6Errors` statistic Since the diagnostic is not going to be emitted counting it in `Swift6Errors` statistics is going to be confusing to the users. Resolves: swiftlang#79291 Resolves: rdar://145341605 (cherry picked from commit 664c119)
|
@swift-ci please test |
hborla
approved these changes
Feb 25, 2025
|
@swift-ci please clean test macOS platform |
|
@swift-ci please test macOS platform |
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.
Cherry-pick of #79599
Explanation:
Fixes incorrect statistics reporting for Swift 6 errors when presence of
@preconcurrencydowngrades them into ignored state.Avoid downgrading diagnostics multiple times
Unify
warn+limitBehaviorinto a single call to make surethat diagnostic doesn't get downgraded multiple times because
that could affect how diagnostics are tracked.
Don't account ignored diagnostics in
Sema.NumSwift6ErrorsstatisticSince the diagnostic is not going to be emitted counting it in
Swift6Errorsstatistics is going to be confusing to the users.Main Branch PR: [Concurrency/Diagnostics] A few fixes to diagnostic downgrades and tracking #79599
Risk: Very low (only non-NFC part here is related to statistics which are not enabled by default).
Resolves: rdar://145341605
Reviewed By: @hborla
Testing: Non-NFC only for statistics