Skip to content

[ConstraintSystem] Improvements to pattern binding checking #39079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2021
Merged

[ConstraintSystem] Improvements to pattern binding checking #39079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac485b0
[CSApply] Mark initializer as checked after it is set
xedin Aug 27, 2021
418e87e
[CSApply] Adjust flags for un-initialized pattern coercion
xedin Aug 27, 2021
de1dc0e
[TypeChecker] Only type-check default initializer when computing prop…
xedin Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/Sema/CSApply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8811,6 +8811,7 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {

if (patternBinding->getInit(index)) {
patternBinding->setInit(index, resultTarget->getAsExpr());
patternBinding->setInitializerChecked(index);
}
}

Expand All @@ -8830,11 +8831,9 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
auto contextualPattern = target.getContextualPattern();
auto patternType = target.getTypeOfUninitializedVar();

TypeResolutionOptions options = TypeResolverContext::PatternBindingDecl;
options |= TypeResolutionFlags::OverrideType;

if (auto coercedPattern = TypeChecker::coercePatternToType(
contextualPattern, patternType, options)) {
contextualPattern, patternType,
TypeResolverContext::PatternBindingDecl)) {
auto resultTarget = target;
resultTarget.setPattern(coercedPattern);
return resultTarget;
Expand Down
15 changes: 8 additions & 7 deletions lib/Sema/TypeCheckStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,16 +2873,17 @@ PropertyWrapperInitializerInfoRequest::evaluate(Evaluator &evaluator,
&& parentPBD->isDefaultInitializable(patternNumber)
&& !wrapperInfo.defaultInit) {
auto ty = parentPBD->getPattern(patternNumber)->getType();
if (auto defaultInit = TypeChecker::buildDefaultInitializer(ty))
parentPBD->setInit(patternNumber, defaultInit);
}

if (parentPBD->isInitialized(patternNumber) &&
!parentPBD->isInitializerChecked(patternNumber)) {
TypeChecker::typeCheckPatternBinding(parentPBD, patternNumber);
if (auto defaultInit = TypeChecker::buildDefaultInitializer(ty)) {
typeCheckSynthesizedWrapperInitializer(var, defaultInit);
parentPBD->setInit(0, defaultInit);
parentPBD->setInitializerChecked(0);
}
}

if ((initializer = parentPBD->getInit(patternNumber))) {
assert(parentPBD->isInitializerChecked(0) &&
"Initializer should to be type-checked");

pbd->setInit(0, initializer);
pbd->setInitializerChecked(0);
wrappedValue = findWrappedValuePlaceholder(initializer);
Expand Down