averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31390 from CodaFi/tone-loc

Browse Source 
Strip Out More TypeLocs
This commit is contained in:
Robert Widmann
2020-04-29 16:46:00 -07:00
committed by GitHub
parent d30661dace 1319b53528
commit f9463922fd
18 changed files with 134 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/CSSimplify.cpp
View File

@@ -7083,14 +7083,11 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
closureType->getResult(),
getConstraintLocator(closure, LocatorPathElt::ClosureBody(hasReturn)));
} else if (!hasReturn) {
bool hasExplicitResult = closure->hasExplicitResultType() &&
closure->getExplicitResultTypeLoc().getType();
// If this closure has an empty body and no explicit result type
// let's bind result type to `Void` since that's the only type empty body
// can produce. Otherwise, if (multi-statement) closure doesn't have
// an explicit result (no `return` statements) let's default it to `Void`.
auto constraintKind = (closure->hasEmptyBody() && !hasExplicitResult)
auto constraintKind = (closure->hasEmptyBody() && !closure->hasExplicitResultType())
? ConstraintKind::Bind
: ConstraintKind::Defaultable;
addConstraint(