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

Suggest '&' when it is needed to pass an lvalue by reference.

Browse Source 
Fixes <rdar://problem/11592572>.

Swift SVN r16944
This commit is contained in:
Doug Gregor
2014-04-27 21:42:06 +00:00
parent 35eecfe835
commit beb43749f1
7 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Sema/CSSimplify.cpp
View File

@@ -1006,24 +1006,31 @@ commit_to_conversions:
// if there are no other possible solutions.
if (shouldAttemptFixes() && !typeVar1 && !typeVar2 &&
!(flags & TMF_ApplyingFix) && kind >= TypeMatchKind::Conversion) {
Type objectType1 = type1->getRValueObjectType();
// If the source type is a function type that could be applied with (),
// try it.
if (isFunctionTypeAcceptingNoArguments(type1->getRValueType())) {
if (isFunctionTypeAcceptingNoArguments(objectType1)) {
conversionsOrFixes.push_back(ExprFixKind::NullaryCall);
}
// If we have an optional type, try to force-unwrap it.
// FIXME: Should we also try '?'?
if (type1->getRValueType()->getOptionalObjectType()) {
if (objectType1->getOptionalObjectType()) {
conversionsOrFixes.push_back(ExprFixKind::ForceOptional);
}
// If we have a value of type AnyObject that we're trying to convert to
// a class, force a downcast.
if (type1->getRValueType()->isAnyObject() &&
if (objectType1->isAnyObject() &&
type2->getClassOrBoundGenericClass()) {
conversionsOrFixes.push_back(ExprFixKind::ForceDowncast);
}
// If we're converting an lvalue to an inout type, add the missing '&'.
if (type2->getRValueType()->is<InOutType>() && type1->is<LValueType>()) {
conversionsOrFixes.push_back(ExprFixKind::AddressOf);
}
}
if (conversionsOrFixes.empty()) {
@@ -2204,10 +2211,15 @@ ConstraintSystem::simplifyFixConstraint(ExprFixKind fix,
return matchTypes(type1->getRValueType()->getOptionalObjectType(), type2,
matchKind, subFlags, locator);
case ExprFixKind::ForceDowncast: {
case ExprFixKind::ForceDowncast:
// This one works whenever it is suggested.
return SolutionKind::Solved;
}
case ExprFixKind::AddressOf:
// Assume that '&' was applied to the first type, turning an lvalue into
// an inout.
return matchTypes(InOutType::get(type1->getRValueType()), type2,
matchKind, subFlags, locator);
}
}