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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-02-19 10:19:28 -08:00
parent a99c0ebb21 e26b01ca38
commit 567dba0f85
11 changed files with 155 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSSolver.cpp
View File

@@ -1116,8 +1116,7 @@ static bool debugConstraintSolverForTarget(
/// diagnostic.
static void maybeProduceFallbackDiagnostic(
ConstraintSystem &cs, SolutionApplicationTarget target) {
if (cs.Options.contains(ConstraintSystemFlags::SubExpressionDiagnostics) ||
cs.Options.contains(ConstraintSystemFlags::SuppressDiagnostics))
if (cs.Options.contains(ConstraintSystemFlags::SuppressDiagnostics))
return;
// Before producing fatal error here, let's check if there are any "error"
@@ -2174,7 +2173,7 @@ void ConstraintSystem::partitionDisjunction(
if (!funcDecl)
return false;
if (!funcDecl->getAttrs().isUnavailable(getASTContext()))
if (!isDeclUnavailable(funcDecl, constraint->getLocator()))
return false;
unavailable.push_back(index);
@@ -2266,6 +2265,9 @@ Constraint *ConstraintSystem::selectDisjunction() {
}
bool DisjunctionChoice::attempt(ConstraintSystem &cs) const {
if (isUnavailable())
cs.increaseScore(SK_Unavailable);
cs.simplifyDisjunctionChoice(Choice);
if (ExplicitConversion)