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

This commit is contained in:
Evan Wilde
2023-10-16 23:00:12 -07:00
93 changed files with 2109 additions and 766 deletions

View File

@@ -599,7 +599,7 @@ struct InferRequirementsWalker : public TypeWalker {
DifferentiabilityKind::Linear);
}
// Infer that the thrown error type conforms to Error.
// Infer that the thrown error type of a function type conforms to Error.
if (auto thrownError = fnTy->getThrownError()) {
if (auto errorProtocol = ctx.getErrorDecl()) {
addConformanceConstraint(thrownError, errorProtocol);