Skip to content

Commit 8a689bb

Browse files
authored
Merge pull request #82982 from augusto2112/templ-read-remote-addr
[NFC][RemoteMirrors] Add "template" in front of calls to readRemoteAddress
2 parents 4b9ef8c + 16591e4 commit 8a689bb

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

include/swift/Remote/MetadataReader.h

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -797,8 +797,8 @@ class MetadataReader {
797797
// Non-inline (box'ed) representation.
798798
// The first word of the container stores the address to the box.
799799
RemoteAddress BoxAddress;
800-
if (!Reader->readRemoteAddress<StoredPointer>(ExistentialAddress,
801-
BoxAddress))
800+
if (!Reader->template readRemoteAddress<StoredPointer>(ExistentialAddress,
801+
BoxAddress))
802802
return std::nullopt;
803803

804804
auto AlignmentMask = VWT->getAlignmentMask();
@@ -1690,7 +1690,7 @@ class MetadataReader {
16901690
StoredPointer tag) -> std::optional<RemoteAddress> {
16911691
RemoteAddress addr = base + tag * sizeof(StoredPointer);
16921692
RemoteAddress isa;
1693-
if (!Reader->readRemoteAddress<StoredPointer>(addr, isa))
1693+
if (!Reader->template readRemoteAddress<StoredPointer>(addr, isa))
16941694
return std::nullopt;
16951695
return isa;
16961696
};
@@ -1720,7 +1720,7 @@ class MetadataReader {
17201720
return readMetadataFromTaggedPointer(objectAddress);
17211721

17221722
RemoteAddress isa;
1723-
if (!Reader->readRemoteAddress<StoredPointer>(objectAddress, isa))
1723+
if (!Reader->template readRemoteAddress<StoredPointer>(objectAddress, isa))
17241724
return std::nullopt;
17251725

17261726
switch (getIsaEncoding()) {
@@ -1769,8 +1769,8 @@ class MetadataReader {
17691769
RemoteAddress(IndexedClassesPointer
17701770
+ classIndex * sizeof(StoredPointer));
17711771
RemoteAddress metadataPointer;
1772-
if (!Reader->readRemoteAddress<StoredPointer>(eltPointer,
1773-
metadataPointer))
1772+
if (!Reader->template readRemoteAddress<StoredPointer>(eltPointer,
1773+
metadataPointer))
17741774
return std::nullopt;
17751775

17761776
return metadataPointer;
@@ -1918,7 +1918,7 @@ class MetadataReader {
19181918

19191919
case TypeReferenceKind::IndirectObjCClass: {
19201920
RemoteAddress classRef;
1921-
if (!Reader->readRemoteAddress<StoredPointer>(ref, classRef))
1921+
if (!Reader->template readRemoteAddress<StoredPointer>(ref, classRef))
19221922
return std::nullopt;
19231923

19241924
auto metadata = readMetadata(classRef);
@@ -1966,8 +1966,8 @@ class MetadataReader {
19661966
return std::nullopt;
19671967

19681968
RemoteAddress genericArgAddress;
1969-
if (!Reader->readRemoteAddress<StoredPointer>(addressOfGenericArgAddress,
1970-
genericArgAddress))
1969+
if (!Reader->template readRemoteAddress<StoredPointer>(
1970+
addressOfGenericArgAddress, genericArgAddress))
19711971
return std::nullopt;
19721972

19731973
return genericArgAddress;
@@ -2103,8 +2103,8 @@ class MetadataReader {
21032103

21042104
// Read the name pointer.
21052105
RemoteAddress namePtr;
2106-
if (!Reader->readRemoteAddress<StoredPointer>(roDataPtr + OffsetToName,
2107-
namePtr))
2106+
if (!Reader->template readRemoteAddress<StoredPointer>(
2107+
roDataPtr + OffsetToName, namePtr))
21082108
return false;
21092109

21102110
// If the name pointer is null, treat that as an error.
@@ -2168,8 +2168,8 @@ class MetadataReader {
21682168
// the generalization arguments are.
21692169
RemoteAddress shapeAddress = address + sizeof(StoredPointer);
21702170
RemoteAddress signedShapePtr;
2171-
if (!Reader->readRemoteAddress<StoredPointer>(shapeAddress,
2172-
signedShapePtr))
2171+
if (!Reader->template readRemoteAddress<StoredPointer>(shapeAddress,
2172+
signedShapePtr))
21732173
return nullptr;
21742174
auto shapePtr = stripSignedPointer(signedShapePtr);
21752175

@@ -2633,8 +2633,8 @@ class MetadataReader {
26332633
// Low bit set in the offset indicates that the offset leads to the absolute
26342634
// address in memory.
26352635
if (indirect) {
2636-
if (!Reader->readRemoteAddress<StoredPointer>(resultAddress,
2637-
resultAddress))
2636+
if (!Reader->template readRemoteAddress<StoredPointer>(resultAddress,
2637+
resultAddress))
26382638
return RemoteAddress();
26392639
}
26402640

@@ -3148,7 +3148,8 @@ class MetadataReader {
31483148
--numGenericArgs;
31493149

31503150
RemoteAddress arg;
3151-
if (!Reader->readRemoteAddress<StoredPointer>(genericArgsAddr, arg)) {
3151+
if (!Reader->template readRemoteAddress<StoredPointer>(
3152+
genericArgsAddr, arg)) {
31523153
return {};
31533154
}
31543155
genericArgsAddr += sizeof(StoredPointer);
@@ -3277,7 +3278,7 @@ class MetadataReader {
32773278

32783279
#if SWIFT_OBJC_INTEROP
32793280
RemoteAddress dataPtr;
3280-
if (!Reader->readRemoteAddress<StoredPointer>(
3281+
if (!Reader->template readRemoteAddress<StoredPointer>(
32813282
classAddress + TargetClassMetadataObjCInterop::offsetToData(),
32823283
dataPtr))
32833284
return RemoteAddress();

0 commit comments

Comments
 (0)