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

[Constraint solver] Migrate for-each statement checking into SolutionApplicationTarget.

Browse Source 
Pull the entirety of type checking for for-each statement headers (i.e., not the
body) into the constraint system, using the normal SolutionApplicationTarget-based
constraint generation and application facilities. Most of this was already handled
in the constraint solver (although the `where` filtering condition was not), so
this is a smaller change than it looks like.
This commit is contained in:
Doug Gregor
2020-04-09 11:02:56 -07:00
parent 31e7873704
commit 87d86f3545
5 changed files with 384 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Sema/ConstraintSystem.cpp
View File

@@ -4161,8 +4161,8 @@ SolutionApplicationTarget::SolutionApplicationTarget(
expression.wrappedVar = nullptr;
expression.isDiscarded = isDiscarded;
expression.bindPatternVarsOneWay = false;
expression.patternBinding = nullptr;
expression.patternBindingIndex = 0;
expression.initialization.patternBinding = nullptr;
expression.initialization.patternBindingIndex = 0;
}
void SolutionApplicationTarget::maybeApplyPropertyWrapper() {
@@ -4259,18 +4259,35 @@ SolutionApplicationTarget SolutionApplicationTarget::forInitialization(
auto result = forInitialization(
initializer, dc, patternType,
patternBinding->getPattern(patternBindingIndex), bindPatternVarsOneWay);
result.expression.patternBinding = patternBinding;
result.expression.patternBindingIndex = patternBindingIndex;
result.expression.initialization.patternBinding = patternBinding;
result.expression.initialization.patternBindingIndex = patternBindingIndex;
return result;
}
SolutionApplicationTarget SolutionApplicationTarget::forForEachStmt(
ForEachStmt *stmt, ProtocolDecl *sequenceProto, DeclContext *dc,
bool bindPatternVarsOneWay) {
SolutionApplicationTarget target(
stmt->getSequence(), dc, CTP_ForEachStmt,
sequenceProto->getDeclaredType(), /*isDiscarded=*/false);
target.expression.pattern = stmt->getPattern();
target.expression.bindPatternVarsOneWay =
bindPatternVarsOneWay || (stmt->getWhere() != nullptr);
target.expression.forEachStmt.stmt = stmt;
target.expression.forEachStmt.whereExpr = stmt->getWhere();
return target;
}
ContextualPattern
SolutionApplicationTarget::getInitializationContextualPattern() const {
SolutionApplicationTarget::getContextualPattern() const {
assert(kind == Kind::expression);
assert(expression.contextualPurpose == CTP_Initialization);
if (expression.patternBinding) {
assert(expression.contextualPurpose == CTP_Initialization ||
expression.contextualPurpose == CTP_ForEachStmt);
if (expression.contextualPurpose == CTP_Initialization &&
expression.initialization.patternBinding) {
return ContextualPattern::forPatternBindingDecl(
expression.patternBinding, expression.patternBindingIndex);
expression.initialization.patternBinding,
expression.initialization.patternBindingIndex);
}
return ContextualPattern::forRawPattern(expression.pattern, expression.dc);