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

[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

4
include/swift/Reflection/ReflectionContext.h
View File

@@ -162,7 +162,7 @@ public:
}
case MetadataKind::ErrorObject:
// ErrorProtocol boxed existential on non-Objective-C runtime target
// Error boxed existential on non-Objective-C runtime target
return nullptr;
default:
@@ -301,7 +301,7 @@ public:
return false;
// Now we need to skip over the instance metadata pointer and instance's
// conformance pointer for Swift.ErrorProtocol.
// conformance pointer for Swift.Error.
StoredPointer InstanceAddress = InstanceMetadataAddressAddress +
2 * sizeof(StoredPointer);

4
include/swift/Reflection/TypeRef.h
View File

@@ -390,8 +390,8 @@ public:
return MangledName == "Ps9AnyObject_";
}
bool isErrorProtocol() const {
return MangledName == "Ps13ErrorProtocol_";
bool isError() const {
return MangledName == "Ps5Error_";
}
const std::string &getMangledName() const {