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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2023-02-18 06:58:04 -08:00
parent 1c15b96277 c82189dc02
commit 7c9fd4dc12
8 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Sema/CSSyntacticElement.cpp
View File

@@ -529,6 +529,9 @@ public:
void visitCaseItem(CaseLabelItem *caseItem, ContextualTypeInfo contextInfo) {
assert(contextInfo.purpose == CTP_CaseStmt);
auto *DC = context.getAsDeclContext();
auto &ctx = DC->getASTContext();
// Resolve the pattern.
auto *pattern = caseItem->getPattern();
if (!caseItem->isPatternResolved()) {
@@ -554,11 +557,15 @@ public:
// Generate constraints for `where` clause (if any).
if (guardExpr) {
guardExpr = cs.generateConstraints(guardExpr, context.getAsDeclContext());
if (!guardExpr) {
SolutionApplicationTarget guardTarget(
guardExpr, DC, CTP_Condition, ctx.getBoolType(), /*discarded*/ false);
if (cs.generateConstraints(guardTarget)) {
hadError = true;
return;
}
guardExpr = guardTarget.getAsExpr();
cs.setSolutionApplicationTarget(guardExpr, guardTarget);
}
// Save information about case item so it could be referenced during
@@ -580,7 +587,7 @@ private:
forEachStmt, context.getAsDeclContext(),
/*bindTypeVarsOneWay=*/false);
if (cs.generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
if (cs.generateConstraints(target)) {
hadError = true;
return;
}
@@ -734,7 +741,7 @@ private:
if (isPlaceholderVar(patternBinding))
return;
if (cs.generateConstraints(*target, FreeTypeVariableBinding::Disallow)) {
if (cs.generateConstraints(*target)) {
hadError = true;
return;
}
@@ -1128,7 +1135,7 @@ private:
contextualResultInfo.getType(),
/*isDiscarded=*/false);
if (cs.generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
if (cs.generateConstraints(target)) {
hadError = true;
return;
}
@@ -1430,7 +1437,7 @@ ConstraintSystem::simplifySyntacticElementConstraint(
contextInfo.purpose, contextInfo.getType(),
contextualTypeLoc, isDiscarded);
if (generateConstraints(target, FreeTypeVariableBinding::Disallow))
if (generateConstraints(target))
return SolutionKind::Error;
setSolutionApplicationTarget(expr, target);