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

Replace resolveCustomAttrType with a Request

Browse Source
This commit is contained in:
Robert Widmann
2020-06-10 16:04:03 -07:00
parent 426d930d10
commit fb8fdd9644
23 changed files with 153 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/ConstraintSystem.cpp
View File

@@ -4389,9 +4389,12 @@ void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
isImplicit = true;
}
auto typeExpr = TypeExpr::createImplicitHack(
outermostWrapperAttr->getTypeLoc().getLoc(),
outermostWrapperType, ctx);
SourceLoc typeLoc;
if (auto *repr = outermostWrapperAttr->getTypeRepr()) {
typeLoc = repr->getLoc();
}
auto typeExpr =
TypeExpr::createImplicitHack(typeLoc, outermostWrapperType, ctx);
backingInitializer = CallExpr::create(
ctx, typeExpr, outermostArg,
outermostWrapperAttr->getArgumentLabels(),
@@ -4405,7 +4408,8 @@ void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
// the initializer type later.
expression.wrappedVar = singleVar;
expression.expression = backingInitializer;
expression.convertType = outermostWrapperAttr->getTypeLoc();
expression.convertType = {outermostWrapperAttr->getTypeRepr(),
outermostWrapperAttr->getType()};
}
SolutionApplicationTarget SolutionApplicationTarget::forInitialization(