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

[MetadataReader] Rename pointed to pointer for consistency.

Browse Source 
Pointed out by John McCall in a previous review (I just procrastinated
to do it, until today).
This commit is contained in:
Davide Italiano
2018-09-05 16:27:49 -07:00
parent 6f3b6182bc
commit 8d25db681b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/RemoteAST/RemoteAST.cpp
View File

@@ -1166,10 +1166,10 @@ public:
Result<std::pair<Type, RemoteAddress>>
getDynamicTypeAndAddressClassExistential(RemoteAddress object) {
auto pointed = Reader.readPointedValue(object.getAddressData());
if (!pointed)
auto pointerval = Reader.readPointerValue(object.getAddressData());
if (!pointerval)
return getFailure<std::pair<Type, RemoteAddress>>();
auto result = Reader.readMetadataFromInstance(*pointed);
auto result = Reader.readMetadataFromInstance(*pointerval);
if (!result)
return getFailure<std::pair<Type, RemoteAddress>>();
auto typeResult = Reader.readTypeFromMetadata(result.getValue());
@@ -1181,11 +1181,11 @@ public:
Result<std::pair<Type, RemoteAddress>>
getDynamicTypeAndAddressErrorExistential(RemoteAddress object) {
auto pointed = Reader.readPointedValue(object.getAddressData());
if (!pointed)
auto pointerval = Reader.readPointerValue(object.getAddressData());
if (!pointerval)
return getFailure<std::pair<Type, RemoteAddress>>();
auto result =
Reader.readMetadataAndValueErrorExistential(RemoteAddress(*pointed));
Reader.readMetadataAndValueErrorExistential(RemoteAddress(*pointerval));
if (!result)
return getFailure<std::pair<Type, RemoteAddress>>();
RemoteAddress metadataAddress = result->first;
@@ -1222,10 +1222,10 @@ public:
// 1) Loading a pointer from the input address
// 2) Reading it as metadata and resolving the type
// 3) Wrapping the resolved type in an existential metatype.
auto pointed = Reader.readPointedValue(object.getAddressData());
if (!pointed)
auto pointerval = Reader.readPointerValue(object.getAddressData());
if (!pointerval)
return getFailure<std::pair<Type, RemoteAddress>>();
auto typeResult = Reader.readTypeFromMetadata(*pointed);
auto typeResult = Reader.readTypeFromMetadata(*pointerval);
if (!typeResult)
return getFailure<std::pair<Type, RemoteAddress>>();
auto wrappedType = ExistentialMetatypeType::get(typeResult);