[Coverage] Audit uses of getCurrentCounter() (SR-4453) #8584
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
We use getCurrentCounter() in one spot where there isn't guaranteed to be an active region: the `else' part of an IfExpr in a TopLevelCodeDecl. Fix this issue by assigning a pseudo-counter to the `else' part when the region stack is empty. This patch also adds crash tests which cover other code paths which rely on getCurrentCounter() when handling TopLevelCodeDecls. Fixes SR-4453. (cherry picked from commit 7094a64)
When handling ternary expressions, we check that an active region exists before attempting to access its counter. It's not necessary to check that the parent AST node is null, and also that the region stack is empty. The second check is stronger than the first one. (cherry picked from commit d060eef)
|
@swift-ci Please smoke test |
|
@swift-ci Please test Linux 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.
Fix a crash in swift code coverage when handling ternary expressions in top-level decls. This has already been committed to master.
rdar://problem/31383534