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

[SE-0112] Rename ErrorProtocol to Error.

Browse Source 
This is bullet (5) of the proposed solution in SE-0112, and the last
major piece to be implemented.
This commit is contained in:
Doug Gregor
2016-07-08 13:53:49 -07:00
parent fcd5d07c20
commit 823c24b355
257 changed files with 1416 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SIL/DynamicCasts.cpp
View File

@@ -169,10 +169,10 @@ bool swift::isObjectiveCBridgeable(Module *M, CanType Ty) {
}
/// Check if a given type conforms to _Error protocol.
bool swift::isErrorProtocol(Module *M, CanType Ty) {
// Retrieve the ErrorProtocol protocol.
bool swift::isError(Module *M, CanType Ty) {
// Retrieve the Error protocol.
auto errorTypeProto =
M->getASTContext().getProtocol(KnownProtocolKind::ErrorProtocol);
M->getASTContext().getProtocol(KnownProtocolKind::Error);
if (errorTypeProto) {
// Find the conformance of the value type to _BridgedToObjectiveC.
@@ -467,7 +467,7 @@ swift::classifyDynamicCast(Module *M,
}
// Check if it is a cast between bridged error types.
if (isErrorProtocol(M, source) && isErrorProtocol(M, target)) {
if (isError(M, source) && isError(M, target)) {
// TODO: Cast to NSError succeeds always.
return DynamicCastFeasibility::MaySucceed;
}
@@ -904,7 +904,7 @@ bool swift::canUseScalarCheckedCastInstructions(SILModule &M,
objectType = type;
// Casting to NSError needs to go through the indirect-cast case,
// since it may conform to ErrorProtocol and require ErrorProtocol-to-NSError
// since it may conform to Error and require Error-to-NSError
// bridging, unless we can statically see that the source type inherits
// NSError.