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

[ConstraintSystem] Minor refactor to avoid creating scopes we don't need.

Browse Source 
This probably won't hit much, and shouldn't change behavior in any way
outside of statistics we generate about the number of scopes that get
opened.
This commit is contained in:
Mark Lacey
2018-08-29 18:32:48 -07:00
parent 1ec8b33efe
commit 026d41556d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/CSSolver.cpp
View File

@@ -623,16 +623,15 @@ bool ConstraintSystem::tryTypeVariableBindings(
<< "\n";
}
// If we were able to solve this without considering
// default literals, don't bother looking at default literals.
if (anySolved && binding.DefaultedProtocol && !sawFirstLiteralConstraint)
break;
// Try to solve the system with typeVar := type
ConstraintSystem::SolverScope scope(*this);
if (binding.DefaultedProtocol) {
// If we were able to solve this without considering
// default literals, don't bother looking at default literals.
if (!sawFirstLiteralConstraint) {
sawFirstLiteralConstraint = true;
if (anySolved)
break;
}
sawFirstLiteralConstraint = true;
type = openUnboundGenericType(type, typeVar->getImpl().getLocator());
type = type->reconstituteSugar(/*recursive=*/false);
} else if (binding.BindingSource == ConstraintKind::ArgumentConversion &&