averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70283 from DougGregor/typed-try-force-and-opt

Browse Source
This commit is contained in:
Doug Gregor
2023-12-06 21:26:50 -08:00
committed by GitHub
parent fbf945dd9f 00d7e41513
commit 12cb8becc6
11 changed files with 124 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/AST/Decl.cpp
View File

@@ -11701,14 +11701,34 @@ CatchNode::getThrownErrorTypeInContext(DeclContext *dc) const {
return llvm::None;
}
auto doCatch = get<DoCatchStmt *>();
if (auto thrownError = doCatch->getCaughtErrorType(dc)) {
if (thrownError->isNever())
return llvm::None;
if (auto doCatch = dyn_cast<DoCatchStmt *>()) {
if (auto thrownError = doCatch->getCaughtErrorType(dc)) {
if (thrownError->isNever())
return llvm::None;
return thrownError;
return thrownError;
}
// If we haven't computed the error type yet, return 'any Error'.
return dc->getASTContext().getErrorExistentialType();
}
// If we haven't computed the error type yet, do so now.
return dc->getASTContext().getErrorExistentialType();
auto tryExpr = get<AnyTryExpr *>();
if (auto forceTry = llvm::dyn_cast<ForceTryExpr>(tryExpr)) {
if (auto thrownError = forceTry->getThrownError())
return thrownError;
// If we haven't computed the error type yet, return 'any Error'.
return dc->getASTContext().getErrorExistentialType();
}
if (auto optTry = llvm::dyn_cast<OptionalTryExpr>(tryExpr)) {
if (auto thrownError = optTry->getThrownError())
return thrownError;
// If we haven't computed the error type yet, return 'any Error'.
return dc->getASTContext().getErrorExistentialType();
}
llvm_unreachable("Unhandled catch node kind");
}