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

Fixes from review

Browse Source
This commit is contained in:
gregomni
2018-09-24 09:43:43 -07:00
parent 6deb401cc6
commit c73048e4ee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Sema/CSBindings.cpp
View File

@@ -366,6 +366,11 @@ ConstraintSystem::getPotentialBindingForRelationalConstraint(
return None;
}
if (type->is<InOutType>() && !typeVar->getImpl().canBindToInOut())
type = LValueType::get(type->getInOutObjectType());
if (type->is<LValueType>() && !typeVar->getImpl().canBindToLValue())
type = type->getRValueType();
// BindParam constraints are not reflexive and must be treated specially.
if (constraint->getKind() == ConstraintKind::BindParam) {
if (kind == AllowedBindingKind::Subtypes) {
@@ -869,8 +874,6 @@ bool TypeVariableBinding::attempt(ConstraintSystem &cs) const {
type = cs.openUnboundGenericType(UGT, locator);
type = type->reconstituteSugar(/*recursive=*/false);
} else if (type->is<InOutType>() && !TypeVar->getImpl().canBindToInOut()) {
type = LValueType::get(type->getInOutObjectType());
}
// FIXME: We want the locator that indicates where the binding came