Skip to content

ConformanceChecker: Minor diagnostics QoI improvements #41074

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 9 commits into from
Mar 28, 2022
Merged

ConformanceChecker: Minor diagnostics QoI improvements #41074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5fc282d
[NFC] TypeChecker: Allow to pass SubstOptions to the non-diagnosing '…
AnthonyLatsis Jan 27, 2022
0b3ac2b
[NFC] TypeChecker: Use the non-diagnosing 'checkGenericArguments' in …
AnthonyLatsis Jan 27, 2022
d2751bf
TypeChecker: Introduce an alternative 'checkGenericArguments' for out…
AnthonyLatsis Jan 28, 2022
6450dc2
[NFC] TypeChecker: Extract requirement failure diagnosis from 'checkG…
AnthonyLatsis Jan 28, 2022
f39464b
TypeChecker: Replace calls to the old 'checkGenericArguments' with 'c…
AnthonyLatsis Jan 28, 2022
bfbdbf6
[NFC] TypeChecker: Make gatherGenericParamBindingsText static and pla…
AnthonyLatsis Jan 28, 2022
3f37b7c
[NFC] TypeChecker: Remove the old diagnosing 'checkGenericArguments'
AnthonyLatsis Jan 28, 2022
4bbad02
[NFC] Supplant RequirementCheckResult with CheckGenericArgumentsResul…
AnthonyLatsis Jan 28, 2022
ba7f301
ConformanceChecker: Always diagnose a conformance failure if the requ…
AnthonyLatsis Jan 28, 2022
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
2 changes: 1 addition & 1 deletion lib/Sema/CSStep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ bool IsDeclRefinementOfRequest::evaluate(Evaluator &evaluator,
genericSignatureB.getRequirements(),
QueryTypeSubstitutionMap{ substMap });

if (result != RequirementCheckResult::Success)
if (result != CheckGenericArgumentsResult::Success)
return false;

return substTypeA->isEqual(substTypeB);
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CodeSynthesis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ createDesignatedInitOverride(ClassDecl *classDecl,
return GenericEnvironment::mapTypeIntoContext(
genericEnv, substType);
});
if (checkResult != RequirementCheckResult::Success)
if (checkResult != CheckGenericArgumentsResult::Success)
return nullptr;
}

Expand Down
14 changes: 8 additions & 6 deletions lib/Sema/IDETypeCheckingRequests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,10 @@ static bool isExtensionAppliedInternal(const DeclContext *DC, Type BaseTy,
auto *module = DC->getParentModule();
SubstitutionMap substMap = BaseTy->getContextSubstitutionMap(
module, ED->getExtendedNominal());
return TypeChecker::checkGenericArguments(
module, genericSig.getRequirements(),
QuerySubstitutionMap{substMap}) == RequirementCheckResult::Success;
return TypeChecker::checkGenericArguments(module,
genericSig.getRequirements(),
QuerySubstitutionMap{substMap}) ==
CheckGenericArgumentsResult::Success;
}

static bool isMemberDeclAppliedInternal(const DeclContext *DC, Type BaseTy,
Expand Down Expand Up @@ -170,9 +171,10 @@ static bool isMemberDeclAppliedInternal(const DeclContext *DC, Type BaseTy,

// Note: we treat substitution failure as success, to avoid tripping
// up over generic parameters introduced by the declaration itself.
return TypeChecker::checkGenericArguments(
module, genericSig.getRequirements(),
QuerySubstitutionMap{substMap}) != RequirementCheckResult::Failure;
return TypeChecker::checkGenericArguments(module,
genericSig.getRequirements(),
QuerySubstitutionMap{substMap}) !=
CheckGenericArgumentsResult::RequirementFailure;
}

bool
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/TypeCheckAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2999,7 +2999,7 @@ TypeEraserHasViableInitRequest::evaluate(Evaluator &evaluator,
return getSubstitution(type);
});

if (result != RequirementCheckResult::Success) {
if (result != CheckGenericArgumentsResult::Success) {
unviable.push_back(
std::make_tuple(init, UnviableReason::UnsatisfiedRequirements,
genericParamType));
Expand Down
Loading