@@ -798,8 +798,8 @@ class MetadataReader {
798798 // Non-inline (box'ed) representation.
799799 // The first word of the container stores the address to the box.
800800 RemoteAddress BoxAddress;
801- if (!Reader->readRemoteAddress <StoredPointer>(ExistentialAddress,
802- BoxAddress))
801+ if (!Reader->template readRemoteAddress <StoredPointer>(ExistentialAddress,
802+ BoxAddress))
803803 return std::nullopt ;
804804
805805 auto AlignmentMask = VWT->getAlignmentMask ();
@@ -1691,7 +1691,7 @@ class MetadataReader {
16911691 StoredPointer tag) -> std::optional<RemoteAddress> {
16921692 RemoteAddress addr = base + tag * sizeof (StoredPointer);
16931693 RemoteAddress isa;
1694- if (!Reader->readRemoteAddress <StoredPointer>(addr, isa))
1694+ if (!Reader->template readRemoteAddress <StoredPointer>(addr, isa))
16951695 return std::nullopt ;
16961696 return isa;
16971697 };
@@ -1721,7 +1721,7 @@ class MetadataReader {
17211721 return readMetadataFromTaggedPointer (objectAddress);
17221722
17231723 RemoteAddress isa;
1724- if (!Reader->readRemoteAddress <StoredPointer>(objectAddress, isa))
1724+ if (!Reader->template readRemoteAddress <StoredPointer>(objectAddress, isa))
17251725 return std::nullopt ;
17261726
17271727 switch (getIsaEncoding ()) {
@@ -1770,8 +1770,8 @@ class MetadataReader {
17701770 RemoteAddress (IndexedClassesPointer
17711771 + classIndex * sizeof (StoredPointer));
17721772 RemoteAddress metadataPointer;
1773- if (!Reader->readRemoteAddress <StoredPointer>(eltPointer,
1774- metadataPointer))
1773+ if (!Reader->template readRemoteAddress <StoredPointer>(eltPointer,
1774+ metadataPointer))
17751775 return std::nullopt ;
17761776
17771777 return metadataPointer;
@@ -1919,7 +1919,7 @@ class MetadataReader {
19191919
19201920 case TypeReferenceKind::IndirectObjCClass: {
19211921 RemoteAddress classRef;
1922- if (!Reader->readRemoteAddress <StoredPointer>(ref, classRef))
1922+ if (!Reader->template readRemoteAddress <StoredPointer>(ref, classRef))
19231923 return std::nullopt ;
19241924
19251925 auto metadata = readMetadata (classRef);
@@ -1967,8 +1967,8 @@ class MetadataReader {
19671967 return std::nullopt ;
19681968
19691969 RemoteAddress genericArgAddress;
1970- if (!Reader->readRemoteAddress <StoredPointer>(addressOfGenericArgAddress,
1971- genericArgAddress))
1970+ if (!Reader->template readRemoteAddress <StoredPointer>(
1971+ addressOfGenericArgAddress, genericArgAddress))
19721972 return std::nullopt ;
19731973
19741974 return genericArgAddress;
@@ -2104,8 +2104,8 @@ class MetadataReader {
21042104
21052105 // Read the name pointer.
21062106 RemoteAddress namePtr;
2107- if (!Reader->readRemoteAddress <StoredPointer>(roDataPtr + OffsetToName,
2108- namePtr))
2107+ if (!Reader->template readRemoteAddress <StoredPointer>(
2108+ roDataPtr + OffsetToName, namePtr))
21092109 return false ;
21102110
21112111 // If the name pointer is null, treat that as an error.
@@ -2169,8 +2169,8 @@ class MetadataReader {
21692169 // the generalization arguments are.
21702170 RemoteAddress shapeAddress = address + sizeof (StoredPointer);
21712171 RemoteAddress signedShapePtr;
2172- if (!Reader->readRemoteAddress <StoredPointer>(shapeAddress,
2173- signedShapePtr))
2172+ if (!Reader->template readRemoteAddress <StoredPointer>(shapeAddress,
2173+ signedShapePtr))
21742174 return nullptr ;
21752175 auto shapePtr = stripSignedPointer (signedShapePtr);
21762176
@@ -2634,8 +2634,8 @@ class MetadataReader {
26342634 // Low bit set in the offset indicates that the offset leads to the absolute
26352635 // address in memory.
26362636 if (indirect) {
2637- if (!Reader->readRemoteAddress <StoredPointer>(resultAddress,
2638- resultAddress))
2637+ if (!Reader->template readRemoteAddress <StoredPointer>(resultAddress,
2638+ resultAddress))
26392639 return RemoteAddress ();
26402640 }
26412641
@@ -3149,7 +3149,8 @@ class MetadataReader {
31493149 --numGenericArgs;
31503150
31513151 RemoteAddress arg;
3152- if (!Reader->readRemoteAddress <StoredPointer>(genericArgsAddr, arg)) {
3152+ if (!Reader->template readRemoteAddress <StoredPointer>(
3153+ genericArgsAddr, arg)) {
31533154 return {};
31543155 }
31553156 genericArgsAddr += sizeof (StoredPointer);
@@ -3278,7 +3279,7 @@ class MetadataReader {
32783279
32793280#if SWIFT_OBJC_INTEROP
32803281 RemoteAddress dataPtr;
3281- if (!Reader->readRemoteAddress <StoredPointer>(
3282+ if (!Reader->template readRemoteAddress <StoredPointer>(
32823283 classAddress + TargetClassMetadataObjCInterop::offsetToData (),
32833284 dataPtr))
32843285 return RemoteAddress ();
0 commit comments