[ConstraintSystem] Form argument constraints instead of using `matchT… #19699
+60
−25
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
…ypes` directly Forming constraints instead of using `matchTypes` while matching argument/parameter types makes sure that `failedConstraint` points to failed argument conversion instead of `applicable function` constraint, which is better for diagnostics.
|
@swift-ci please smoke test |
slavapestov
reviewed
Oct 4, 2018
| @@ -56,7 +57,7 @@ func takesNoEscapeClosure(_ fn : () -> Int) { | |||
| takesGenericClosure(4) { fn() } // ok. | |||
|
|
|||
| _ = [fn] // expected-error {{converting non-escaping value to 'Element' may allow it to escape}} | |||
| _ = [doesEscape(fn)] // expected-error {{'(() -> Int) -> ()' is not convertible to '(@escaping () -> Int) -> ()'}} | |||
| _ = [doesEscape(fn)] // expected-error {{passing non-escaping parameter 'fn' to function expecting an @escaping closure}} | |||
slavapestov
reviewed
Oct 4, 2018
| @@ -848,9 +844,7 @@ ConstraintSystem::TypeMatchResult constraints::matchCallArguments( | |||
| getApplyArgToParam(argIdx, | |||
| paramIdx)); | |||
| auto argTy = argsWithLabels[argIdx].getOldType(); | |||
There was a problem hiding this comment.
A possible next step here: if this is an InOutType, the argument conversion immediately simplifies down to a BindParam. You could instead directly emit a BindParam here, bypassing the existence of InOutType altogether. This allows you to replace the getOldType() call with getPlainType()
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.
…ypes` directly
Forming constraints instead of using
matchTypeswhile matching argument/parametertypes makes sure that
failedConstraintpoints to failed argument conversioninstead of
applicable functionconstraint, which is better for diagnostics.