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] Use autoclosure information from CSApply to compute

Browse Source 
`VarDecl::getPropertyWrapperInitValueInterfaceType`.
This commit is contained in:
Holly Borla
2020-07-13 16:23:31 -07:00
parent bf47403162
commit a6c33a9611
18 changed files with 137 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/ConstraintSystem.cpp
View File

@@ -4539,8 +4539,9 @@ SolutionApplicationTarget::SolutionApplicationTarget(
expression.contextualPurpose = contextualPurpose;
expression.convertType = convertType;
expression.pattern = nullptr;
expression.wrappedVar = nullptr;
expression.innermostWrappedValueInit = nullptr;
expression.propertyWrapper.wrappedVar = nullptr;
expression.propertyWrapper.innermostWrappedValueInit = nullptr;
expression.propertyWrapper.hasInitialWrappedValue = false;
expression.isDiscarded = isDiscarded;
expression.bindPatternVarsOneWay = false;
expression.initialization.patternBinding = nullptr;
@@ -4564,11 +4565,14 @@ void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
auto outermostWrapperAttr = wrapperAttrs.front();
Expr *backingInitializer;
if (Expr *initializer = expression.expression) {
if (!isa<PropertyWrapperValuePlaceholderExpr>(initializer)) {
expression.propertyWrapper.hasInitialWrappedValue = true;
}
// Form init(wrappedValue:) call(s).
Expr *wrappedInitializer = buildPropertyWrapperWrappedValueCall(
singleVar, Type(), initializer, /*ignoreAttributeArgs=*/false,
[&](ApplyExpr *innermostInit) {
expression.innermostWrappedValueInit = innermostInit;
expression.propertyWrapper.innermostWrappedValueInit = innermostInit;
});
if (!wrappedInitializer)
return;
@@ -4609,7 +4613,7 @@ void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
// Note that we have applied to property wrapper, so we can adjust
// the initializer type later.
expression.wrappedVar = singleVar;
expression.propertyWrapper.wrappedVar = singleVar;
expression.expression = backingInitializer;
expression.convertType = {outermostWrapperAttr->getTypeRepr(),
outermostWrapperAttr->getType()};