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 #14242 from rudkx/rdar36913150

Browse Source 
Allow inout arguments that differ in optionality than the expected pa…
This commit is contained in:
Mark Lacey
2018-01-29 16:56:17 -08:00
committed by GitHub
parent 4fa9325441 8685ee01a1
commit f19c6a1417
6 changed files with 106 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Sema/CSSimplify.cpp
View File

@@ -1863,16 +1863,32 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
locator.withPathElement(
ConstraintLocator::ArrayElementType));
case TypeKind::InOut:
case TypeKind::InOut: {
// If the RHS is an inout type, the LHS must be an @lvalue type.
if (kind == ConstraintKind::BindParam ||
kind >= ConstraintKind::OperatorArgumentConversion)
return getTypeMatchFailure(locator);
return matchTypes(cast<InOutType>(desugar1)->getObjectType(),
cast<InOutType>(desugar2)->getObjectType(),
ConstraintKind::Equal, subflags,
locator.withPathElement(ConstraintLocator::ArrayElementType));
auto inoutObjTy1 = cast<InOutType>(desugar1)->getObjectType();
auto inoutObjTy2 = cast<InOutType>(desugar2)->getObjectType();
OptionalTypeKind OTK1;
OptionalTypeKind OTK2;
auto optionalObjTy1 = inoutObjTy1->getAnyOptionalObjectType(OTK1);
auto optionalObjTy2 = inoutObjTy2->getAnyOptionalObjectType(OTK2);
if (OTK1 != OTK2 && optionalObjTy1 && optionalObjTy2) {
increaseScore(ScoreKind::SK_InOutOptionalityConversion);
return matchTypes(inoutObjTy1,
inoutObjTy2,
ConstraintKind::ArgumentConversion, subflags,
locator.withPathElement(ConstraintLocator::ArrayElementType));
} else {
return matchTypes(inoutObjTy1,
inoutObjTy2,
ConstraintKind::Equal, subflags,
locator.withPathElement(ConstraintLocator::ArrayElementType));
}
}
case TypeKind::UnboundGeneric:
llvm_unreachable("Unbound generic type should have been opened");