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

[NFC][RemoteMirrors] Add "template" in front of calls to readRemoteAddress

Browse Source 
(cherry picked from commit 16591e4d0e)
This commit is contained in:
Augusto Noronha
2025-07-10 17:48:11 -07:00
parent c9205fe649
commit ac62ffcbf8
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/swift/Remote/MetadataReader.h
View File

@@ -801,8 +801,8 @@ public:
// Non-inline (box'ed) representation. // Non-inline (box'ed) representation.
// The first word of the container stores the address to the box. // The first word of the container stores the address to the box.
RemoteAddress BoxAddress; RemoteAddress BoxAddress;
if (!Reader->readRemoteAddress<StoredPointer>(ExistentialAddress, if (!Reader->template readRemoteAddress<StoredPointer>(ExistentialAddress,
BoxAddress)) BoxAddress))
return std::nullopt; return std::nullopt;
auto AlignmentMask = VWT->getAlignmentMask(); auto AlignmentMask = VWT->getAlignmentMask();
@@ -1694,7 +1694,7 @@ public:
StoredPointer tag) -> std::optional<RemoteAddress> { StoredPointer tag) -> std::optional<RemoteAddress> {
RemoteAddress addr = base + tag * sizeof(StoredPointer); RemoteAddress addr = base + tag * sizeof(StoredPointer);
RemoteAddress isa; RemoteAddress isa;
if (!Reader->readRemoteAddress<StoredPointer>(addr, isa)) if (!Reader->template readRemoteAddress<StoredPointer>(addr, isa))
return std::nullopt; return std::nullopt;
return isa; return isa;
}; };
@@ -1724,7 +1724,7 @@ public:
return readMetadataFromTaggedPointer(objectAddress); return readMetadataFromTaggedPointer(objectAddress);
RemoteAddress isa; RemoteAddress isa;
if (!Reader->readRemoteAddress<StoredPointer>(objectAddress, isa)) if (!Reader->template readRemoteAddress<StoredPointer>(objectAddress, isa))
return std::nullopt; return std::nullopt;
switch (getIsaEncoding()) { switch (getIsaEncoding()) {
@@ -1773,8 +1773,8 @@ public:
RemoteAddress(IndexedClassesPointer RemoteAddress(IndexedClassesPointer
+ classIndex * sizeof(StoredPointer)); + classIndex * sizeof(StoredPointer));
RemoteAddress metadataPointer; RemoteAddress metadataPointer;
if (!Reader->readRemoteAddress<StoredPointer>(eltPointer, if (!Reader->template readRemoteAddress<StoredPointer>(eltPointer,
metadataPointer)) metadataPointer))
return std::nullopt; return std::nullopt;
return metadataPointer; return metadataPointer;
@@ -1922,7 +1922,7 @@ public:
case TypeReferenceKind::IndirectObjCClass: { case TypeReferenceKind::IndirectObjCClass: {
RemoteAddress classRef; RemoteAddress classRef;
if (!Reader->readRemoteAddress<StoredPointer>(ref, classRef)) if (!Reader->template readRemoteAddress<StoredPointer>(ref, classRef))
return std::nullopt; return std::nullopt;
auto metadata = readMetadata(classRef); auto metadata = readMetadata(classRef);
@@ -1970,8 +1970,8 @@ public:
return std::nullopt; return std::nullopt;
RemoteAddress genericArgAddress; RemoteAddress genericArgAddress;
if (!Reader->readRemoteAddress<StoredPointer>(addressOfGenericArgAddress, if (!Reader->template readRemoteAddress<StoredPointer>(
genericArgAddress)) addressOfGenericArgAddress, genericArgAddress))
return std::nullopt; return std::nullopt;
return genericArgAddress; return genericArgAddress;
@@ -2107,8 +2107,8 @@ protected:
// Read the name pointer. // Read the name pointer.
RemoteAddress namePtr; RemoteAddress namePtr;
if (!Reader->readRemoteAddress<StoredPointer>(roDataPtr + OffsetToName, if (!Reader->template readRemoteAddress<StoredPointer>(
namePtr)) roDataPtr + OffsetToName, namePtr))
return false; return false;
// If the name pointer is null, treat that as an error. // If the name pointer is null, treat that as an error.
@@ -2172,8 +2172,8 @@ protected:
// the generalization arguments are. // the generalization arguments are.
RemoteAddress shapeAddress = address + sizeof(StoredPointer); RemoteAddress shapeAddress = address + sizeof(StoredPointer);
RemoteAddress signedShapePtr; RemoteAddress signedShapePtr;
if (!Reader->readRemoteAddress<StoredPointer>(shapeAddress, if (!Reader->template readRemoteAddress<StoredPointer>(shapeAddress,
signedShapePtr)) signedShapePtr))
return nullptr; return nullptr;
auto shapePtr = stripSignedPointer(signedShapePtr); auto shapePtr = stripSignedPointer(signedShapePtr);
@@ -2637,8 +2637,8 @@ private:
// Low bit set in the offset indicates that the offset leads to the absolute // Low bit set in the offset indicates that the offset leads to the absolute
// address in memory. // address in memory.
if (indirect) { if (indirect) {
if (!Reader->readRemoteAddress<StoredPointer>(resultAddress, if (!Reader->template readRemoteAddress<StoredPointer>(resultAddress,
resultAddress)) resultAddress))
return RemoteAddress(); return RemoteAddress();
} }
@@ -3152,7 +3152,8 @@ private:
--numGenericArgs; --numGenericArgs;
RemoteAddress arg; RemoteAddress arg;
if (!Reader->readRemoteAddress<StoredPointer>(genericArgsAddr, arg)) { if (!Reader->template readRemoteAddress<StoredPointer>(
genericArgsAddr, arg)) {
return {}; return {};
} }
genericArgsAddr += sizeof(StoredPointer); genericArgsAddr += sizeof(StoredPointer);
@@ -3281,7 +3282,7 @@ private:
#if SWIFT_OBJC_INTEROP #if SWIFT_OBJC_INTEROP
RemoteAddress dataPtr; RemoteAddress dataPtr;
if (!Reader->readRemoteAddress<StoredPointer>( if (!Reader->template readRemoteAddress<StoredPointer>(
classAddress + TargetClassMetadataObjCInterop::offsetToData(), classAddress + TargetClassMetadataObjCInterop::offsetToData(),
dataPtr)) dataPtr))
return RemoteAddress(); return RemoteAddress();