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

Jump to bottom
Merged
merged 9 commits into from
Mar 28, 2022
Merged

ConformanceChecker: Minor diagnostics QoI improvements #41074

merged 9 commits into from
Mar 28, 2022

Conversation

AnthonyLatsis
Copy link
Collaborator

@AnthonyLatsis AnthonyLatsis commented Jan 28, 2022 •
edited
Loading

This fixes a few issues with ensureRequirementsAreSatisfied:

  • We forgot to diagnose a conformance failure on all requirement check recovery paths (decoupling checkGenericArguments and requirement failure diagnosis allows for emitting the conformance failure before we diagnose the requirement failure).
  • The location for the failed requirement specification note was off.

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test macOS

slavapestov
slavapestov reviewed Jan 29, 2022
View reviewed changes
Copy link
Contributor

@slavapestov slavapestov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea of splitting off diagnostics from checkGenericArguments()!

lib/Sema/TypeChecker.h Outdated
/// Return the result of checking the given generic parameter substitutions
/// against the given requirements.
CheckGenericArgumentsResult
checkGenericArgumentsInformative(ModuleDecl *module,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe something more like checkAndDiagnoseGenericArguments()?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then how about checkGenericArgumentsAndDiagnose, or checkGenericArgumentsForDiagnostics? I think these versions make for a slightly better hint that the function returns data for diagnostics rather than performing them in place.

Copy link
Collaborator Author

@AnthonyLatsis AnthonyLatsis Feb 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went with checkGenericArgumentsAndDiagnose checkGenericArgumentsForDiagnostics.

AnthonyLatsis
AnthonyLatsis commented Jan 29, 2022
View reviewed changes
@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test macOS

@AnthonyLatsis
Copy link
Collaborator Author

@slavapestov Addressed all your comments; could you have another look? Thanks in advance.

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@slavapestov ping

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@slavapestov ping

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
[NFC] TypeChecker: Allow to pass SubstOptions to the non-diagnosing '…
5fc282d 
…checkGenericArguments'
@AnthonyLatsis
[NFC] TypeChecker: Use the non-diagnosing 'checkGenericArguments' in …
0b3ac2b 
…more places
@AnthonyLatsis
TypeChecker: Introduce an alternative 'checkGenericArguments' for out…
d2751bf 
…-of-place diagnostics
@AnthonyLatsis
[NFC] TypeChecker: Extract requirement failure diagnosis from 'checkG…
6450dc2 
…enericArguments' into a dedicated routine
@AnthonyLatsis
TypeChecker: Replace calls to the old 'checkGenericArguments' with 'c…
f39464b 
…heckGenericArgumentsForDiagnostics'
@AnthonyLatsis
[NFC] TypeChecker: Make gatherGenericParamBindingsText static and pla…
bfbdbf6 
…ce it closer to its sole client
@AnthonyLatsis
[NFC] TypeChecker: Remove the old diagnosing 'checkGenericArguments'
3f37b7c
@AnthonyLatsis
[NFC] Supplant RequirementCheckResult with CheckGenericArgumentsResul…
4bbad02 
…t::Kind
@AnthonyLatsis
ConformanceChecker: Always diagnose a conformance failure if the requ…
ba7f301 
…irement check fails in 'ensureRequirementsAreSatisfied'
@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@slavapestov Thanks!

@AnthonyLatsis AnthonyLatsis merged commit 2d6e5b8 into swiftlang:main Mar 28, 2022
@AnthonyLatsis AnthonyLatsis deleted the miss-conf-error branch March 28, 2022 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavapestov slavapestov slavapestov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AnthonyLatsis @slavapestov