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

Sema: Increase score of collection conversions.

Browse Source 
Collection conversion should be avoided in favor of non-collection-converting solutions.
This commit is contained in:
Joe Groff
2016-07-25 15:05:10 -07:00
parent 3998041ca5
commit 3e4f7c2f29
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSSimplify.cpp
View File

@@ -3779,6 +3779,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
Type baseType2 = getBaseTypeForArrayType(t2); Type baseType2 = getBaseTypeForArrayType(t2);
if (TC.getLangOpts().EnableExperimentalCollectionCasts) { if (TC.getLangOpts().EnableExperimentalCollectionCasts) {
increaseScore(SK_CollectionUpcastConversion);
return matchTypes(baseType1, return matchTypes(baseType1,
baseType2, baseType2,
matchKind, matchKind,
@@ -3841,15 +3842,17 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
std::tie(key2, value2) = *isDictionaryType(t2); std::tie(key2, value2) = *isDictionaryType(t2);
if (TC.getLangOpts().EnableExperimentalCollectionCasts) { if (TC.getLangOpts().EnableExperimentalCollectionCasts) {
auto subMatchKind = matchKind; // TODO: Restrict this?
increaseScore(SK_CollectionUpcastConversion);
// The source key and value types must be subtypes of the destination // The source key and value types must be subtypes of the destination
// key and value types, respectively. // key and value types, respectively.
auto result = matchTypes(key1, key2, matchKind, subFlags, auto result = matchTypes(key1, key2, subMatchKind, subFlags,
locator.withPathElement( locator.withPathElement(
ConstraintLocator::PathElement::getGenericArgument(0))); ConstraintLocator::PathElement::getGenericArgument(0)));
if (result == SolutionKind::Error) if (result == SolutionKind::Error)
return result; return result;
switch (matchTypes(value1, value2, matchKind, subFlags, switch (matchTypes(value1, value2, subMatchKind, subFlags,
locator.withPathElement( locator.withPathElement(
ConstraintLocator::PathElement::getGenericArgument(1)))) { ConstraintLocator::PathElement::getGenericArgument(1)))) {
case SolutionKind::Solved: case SolutionKind::Solved:
@@ -3970,6 +3973,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
Type baseType2 = getBaseTypeForSetType(t2); Type baseType2 = getBaseTypeForSetType(t2);
if (TC.getLangOpts().EnableExperimentalCollectionCasts) { if (TC.getLangOpts().EnableExperimentalCollectionCasts) {
increaseScore(SK_CollectionUpcastConversion);
return matchTypes(baseType1, return matchTypes(baseType1,
baseType2, baseType2,
matchKind, matchKind,