Merge pull request #69379 from DougGregor/typed-throws-convert-to-any-error

Author: DougGregor

lib/Sema/TypeCheckDecl.cpp

@@ -2639,11 +2639,11 @@ InterfaceTypeRequest::evaluate(Evaluator &eval, ValueDecl *D) const {
     Type thrownTy = AFD->getThrownInterfaceType();
     if (thrownTy) {
       thrownTy = AFD->getThrownInterfaceType();
-      ProtocolDecl *errorProto = Context.getErrorDecl();
-      if (thrownTy && errorProto) {
+      auto anyErrorType = Context.getErrorExistentialType();
+      if (thrownTy && anyErrorType) {
         Type thrownTyInContext = AFD->mapTypeIntoContext(thrownTy);
-        if (!TypeChecker::conformsToProtocol(
-                thrownTyInContext, errorProto, AFD->getParentModule())) {
+        if (!TypeChecker::isConvertibleTo(
+                thrownTyInContext, anyErrorType, AFD)) {
           SourceLoc loc;
           if (auto thrownTypeRepr = AFD->getThrownTypeRepr())
             loc = thrownTypeRepr->getLoc();

lib/Sema/TypeCheckType.cpp

@@ -3712,9 +3712,9 @@ NeverNullType TypeResolver::resolveASTFunctionType(
       thrownTy = Type();
     } else if (!options.contains(TypeResolutionFlags::SilenceErrors) &&
                !thrownTy->hasTypeParameter() &&
-               !TypeChecker::conformsToProtocol(
-                  thrownTy, ctx.getErrorDecl(),
-                  resolution.getDeclContext()->getParentModule())) {
+               !TypeChecker::isConvertibleTo(
+                   thrownTy, ctx.getErrorExistentialType(),
+                  resolution.getDeclContext())) {
       diagnoseInvalid(
           thrownTypeRepr, thrownTypeRepr->getLoc(), diag::thrown_type_not_error,
           thrownTy);

test/decl/func/typed_throws.swift

@@ -123,3 +123,5 @@ struct HasASubscript {
     }
   }
 }
+
+func throwCodableErrors() throws(any Codable & Error) { }