[ConstraintSolver] Avoid unnecessarily increasing score when matching function types #12593
Conversation
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
|
@swift-ci please test source compatibility |
|
@rudkx WDYT? |
test/Constraints/rdar35142121.swift
Outdated
| } | ||
|
|
||
| let result = foo({ (a: Int) -> Int in a + 1 }) | ||
| assert(result == 42) |
There was a problem hiding this comment.
This doesn't really need to be an executable test. You could do -emit-sil and match by mangled name on the actual function that's getting called.
There was a problem hiding this comment.
Thanks for the suggestion! I'll try that right away.
| @@ -1,4 +1,4 @@ | |||
| // RUN: %scale-test --invert-result --begin 2 --end 7 --step 1 --select incrementScopeCounter %s | |||
| // RUN: %scale-test --begin 2 --end 10 --step 1 --select incrementScopeCounter %s | |||
There was a problem hiding this comment.
It's a bit surprising that this would have a real effect on whether this is fast or slow. Are you confident this is a real improvement, or was this perhaps not really slow before (e.g. it was slow over that range but wasn't truly exponential?).
There was a problem hiding this comment.
It's a real improvement because this triggers logic in the solveSimplified where solver is not going to look at generic overloads if it could find non-generic one with the same score, since we are not increasing the score here some of the cases are going to behave better than before.
… function types Remove function-to-function type match score increase, which should only happen contextually in presence of other restrictions, this used to fix the case related to matching of arrays of functions with and w/e `throws` as function parameters which used to be ambigious, and now handled by collection-upcast conversion score. Resolves: rdar://problem/35142121
|
@swift-ci please smoke test |
| } | ||
|
|
||
| // CHECK: function_ref @_T012rdar351421213fooS3icF : $@convention(thin) (@owned @noescape @callee_owned (Int) -> Int) -> Int | ||
| let _ = foo({ (a: Int) -> Int in a + 1 }) |
There was a problem hiding this comment.
@rudkx Does this look better?
|
LGTM! |
|
@swift-ci please test source compatibility |
Remove function-to-function type match score increase, which should only
happen contextually in presence of other restrictions, this used to fix
the case related to matching of arrays of functions with and w/e
throwsas function parameters which used to be ambigious, and now handled by
collection-upcast conversion score.
Resolves: rdar://problem/35142121