[Sema] Fix rdar://75200446 #36494
Closed
[Sema] Fix rdar://75200446 #36494
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
It appears like the simplification in 9d3c8ca was a little over-optimistic to declare the code path unreachable and causes a crash in the test case added by this commit. Restore the old code code path. Fixes rdar://75200446
xedin
reviewed
Mar 18, 2021
| @@ -7577,7 +7577,11 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType, | |||
| // FIXME: handle unwrapping everywhere else | |||
| assert(!unwrapResult); | |||
|
|
|||
| assert(!cs.getType(fn)->is<UnresolvedType>()); | |||
| // If this is an UnresolvedType in the system, preserve it. | |||
| if (cs.getType(fn)->is<UnresolvedType>()) { | |||
There was a problem hiding this comment.
@slavapestov It looks like some of the recently removed code paths are still used by the code completion. Maybe we should revert #36028?
There was a problem hiding this comment.
Is code completion still submitting UnresolvedType ASTs for type checking?
There was a problem hiding this comment.
@xedin could we do this with holes?
There was a problem hiding this comment.
Not all of the code completion requests has been ported to use typeCheckForCodeCompletion yet, but the plan is to avoid having to apply solution and use holes everywhere. Meanwhile I think the most sensible thing would be to revert #36028.
|
@swift-ci Please smoke test |
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.
Similar to #36493, I don’t actually know what I’m changing here, but #36028 appears to have been to optimistic to declare the restored branch as unreachable, which causes a crash in the added test case. I’m just restoring the old behavior to prevent the crash. Please let me know if you think the code path should really be unreachable and we need to fix a deeper issue the way code completion sets up the constraint system.
Fixes rdar://75200446 [SR-14318]