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

[Property Wrappers] Add new contextual type purposes for property wrappers

Browse Source 
to produce better diagnostics when there's a 'wrappedValue' type mismatch.
This commit is contained in:
Holly Borla
2020-07-01 19:42:01 -07:00
parent 238637408c
commit f555bfefc9
8 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSGen.cpp
View File

@@ -3893,8 +3893,10 @@ static Type generateWrappedPropertyTypeConstraints(
auto *locator =
cs.getConstraintLocator(typeRepr, LocatorPathElt::ContextualType());
wrapperType = cs.openUnboundGenericTypes(rawWrapperType, locator);
cs.addConstraint(ConstraintKind::Equal, wrappedValueType, wrapperType,
cs.addConstraint(ConstraintKind::Equal, wrapperType, wrappedValueType,
locator);
cs.setContextualType(typeRepr, TypeLoc::withoutLoc(wrappedValueType),
CTP_ComposedPropertyWrapper);
}
wrappedValueType = wrapperType->getTypeOfMember(
@@ -4184,6 +4186,8 @@ bool ConstraintSystem::generateConstraints(
addConstraint(ConstraintKind::Equal, propertyType, wrappedValueType,
getConstraintLocator(wrappedVar, LocatorPathElt::ContextualType()));
setContextualType(wrappedVar, TypeLoc::withoutLoc(wrappedValueType),
CTP_WrappedProperty);
return false;
}
}