@@ -801,8 +801,8 @@ class MetadataReader {
801801 // Non-inline (box'ed) representation.
802802 // The first word of the container stores the address to the box.
803803 RemoteAddress BoxAddress;
804- if (!Reader->readRemoteAddress <StoredPointer>(ExistentialAddress,
805- BoxAddress))
804+ if (!Reader->template readRemoteAddress <StoredPointer>(ExistentialAddress,
805+ BoxAddress))
806806 return std::nullopt ;
807807
808808 auto AlignmentMask = VWT->getAlignmentMask ();
@@ -1694,7 +1694,7 @@ class MetadataReader {
16941694 StoredPointer tag) -> std::optional<RemoteAddress> {
16951695 RemoteAddress addr = base + tag * sizeof (StoredPointer);
16961696 RemoteAddress isa;
1697- if (!Reader->readRemoteAddress <StoredPointer>(addr, isa))
1697+ if (!Reader->template readRemoteAddress <StoredPointer>(addr, isa))
16981698 return std::nullopt ;
16991699 return isa;
17001700 };
@@ -1724,7 +1724,7 @@ class MetadataReader {
17241724 return readMetadataFromTaggedPointer (objectAddress);
17251725
17261726 RemoteAddress isa;
1727- if (!Reader->readRemoteAddress <StoredPointer>(objectAddress, isa))
1727+ if (!Reader->template readRemoteAddress <StoredPointer>(objectAddress, isa))
17281728 return std::nullopt ;
17291729
17301730 switch (getIsaEncoding ()) {
@@ -1773,8 +1773,8 @@ class MetadataReader {
17731773 RemoteAddress (IndexedClassesPointer
17741774 + classIndex * sizeof (StoredPointer));
17751775 RemoteAddress metadataPointer;
1776- if (!Reader->readRemoteAddress <StoredPointer>(eltPointer,
1777- metadataPointer))
1776+ if (!Reader->template readRemoteAddress <StoredPointer>(eltPointer,
1777+ metadataPointer))
17781778 return std::nullopt ;
17791779
17801780 return metadataPointer;
@@ -1922,7 +1922,7 @@ class MetadataReader {
19221922
19231923 case TypeReferenceKind::IndirectObjCClass: {
19241924 RemoteAddress classRef;
1925- if (!Reader->readRemoteAddress <StoredPointer>(ref, classRef))
1925+ if (!Reader->template readRemoteAddress <StoredPointer>(ref, classRef))
19261926 return std::nullopt ;
19271927
19281928 auto metadata = readMetadata (classRef);
@@ -1970,8 +1970,8 @@ class MetadataReader {
19701970 return std::nullopt ;
19711971
19721972 RemoteAddress genericArgAddress;
1973- if (!Reader->readRemoteAddress <StoredPointer>(addressOfGenericArgAddress,
1974- genericArgAddress))
1973+ if (!Reader->template readRemoteAddress <StoredPointer>(
1974+ addressOfGenericArgAddress, genericArgAddress))
19751975 return std::nullopt ;
19761976
19771977 return genericArgAddress;
@@ -2107,8 +2107,8 @@ class MetadataReader {
21072107
21082108 // Read the name pointer.
21092109 RemoteAddress namePtr;
2110- if (!Reader->readRemoteAddress <StoredPointer>(roDataPtr + OffsetToName,
2111- namePtr))
2110+ if (!Reader->template readRemoteAddress <StoredPointer>(
2111+ roDataPtr + OffsetToName, namePtr))
21122112 return false ;
21132113
21142114 // If the name pointer is null, treat that as an error.
@@ -2172,8 +2172,8 @@ class MetadataReader {
21722172 // the generalization arguments are.
21732173 RemoteAddress shapeAddress = address + sizeof (StoredPointer);
21742174 RemoteAddress signedShapePtr;
2175- if (!Reader->readRemoteAddress <StoredPointer>(shapeAddress,
2176- signedShapePtr))
2175+ if (!Reader->template readRemoteAddress <StoredPointer>(shapeAddress,
2176+ signedShapePtr))
21772177 return nullptr ;
21782178 auto shapePtr = stripSignedPointer (signedShapePtr);
21792179
@@ -2637,8 +2637,8 @@ class MetadataReader {
26372637 // Low bit set in the offset indicates that the offset leads to the absolute
26382638 // address in memory.
26392639 if (indirect) {
2640- if (!Reader->readRemoteAddress <StoredPointer>(resultAddress,
2641- resultAddress))
2640+ if (!Reader->template readRemoteAddress <StoredPointer>(resultAddress,
2641+ resultAddress))
26422642 return RemoteAddress ();
26432643 }
26442644
@@ -3152,7 +3152,8 @@ class MetadataReader {
31523152 --numGenericArgs;
31533153
31543154 RemoteAddress arg;
3155- if (!Reader->readRemoteAddress <StoredPointer>(genericArgsAddr, arg)) {
3155+ if (!Reader->template readRemoteAddress <StoredPointer>(
3156+ genericArgsAddr, arg)) {
31563157 return {};
31573158 }
31583159 genericArgsAddr += sizeof (StoredPointer);
@@ -3281,7 +3282,7 @@ class MetadataReader {
32813282
32823283#if SWIFT_OBJC_INTEROP
32833284 RemoteAddress dataPtr;
3284- if (!Reader->readRemoteAddress <StoredPointer>(
3285+ if (!Reader->template readRemoteAddress <StoredPointer>(
32853286 classAddress + TargetClassMetadataObjCInterop::offsetToData (),
32863287 dataPtr))
32873288 return RemoteAddress ();
0 commit comments