@@ -798,8 +798,8 @@ class MetadataReader {
798
798
// Non-inline (box'ed) representation.
799
799
// The first word of the container stores the address to the box.
800
800
RemoteAddress BoxAddress;
801
- if (!Reader->readRemoteAddress <StoredPointer>(ExistentialAddress,
802
- BoxAddress))
801
+ if (!Reader->template readRemoteAddress <StoredPointer>(ExistentialAddress,
802
+ BoxAddress))
803
803
return std::nullopt;
804
804
805
805
auto AlignmentMask = VWT->getAlignmentMask ();
@@ -1691,7 +1691,7 @@ class MetadataReader {
1691
1691
StoredPointer tag) -> std::optional<RemoteAddress> {
1692
1692
RemoteAddress addr = base + tag * sizeof (StoredPointer);
1693
1693
RemoteAddress isa;
1694
- if (!Reader->readRemoteAddress <StoredPointer>(addr, isa))
1694
+ if (!Reader->template readRemoteAddress <StoredPointer>(addr, isa))
1695
1695
return std::nullopt;
1696
1696
return isa;
1697
1697
};
@@ -1721,7 +1721,7 @@ class MetadataReader {
1721
1721
return readMetadataFromTaggedPointer (objectAddress);
1722
1722
1723
1723
RemoteAddress isa;
1724
- if (!Reader->readRemoteAddress <StoredPointer>(objectAddress, isa))
1724
+ if (!Reader->template readRemoteAddress <StoredPointer>(objectAddress, isa))
1725
1725
return std::nullopt;
1726
1726
1727
1727
switch (getIsaEncoding ()) {
@@ -1770,8 +1770,8 @@ class MetadataReader {
1770
1770
RemoteAddress (IndexedClassesPointer
1771
1771
+ classIndex * sizeof (StoredPointer));
1772
1772
RemoteAddress metadataPointer;
1773
- if (!Reader->readRemoteAddress <StoredPointer>(eltPointer,
1774
- metadataPointer))
1773
+ if (!Reader->template readRemoteAddress <StoredPointer>(eltPointer,
1774
+ metadataPointer))
1775
1775
return std::nullopt;
1776
1776
1777
1777
return metadataPointer;
@@ -1919,7 +1919,7 @@ class MetadataReader {
1919
1919
1920
1920
case TypeReferenceKind::IndirectObjCClass: {
1921
1921
RemoteAddress classRef;
1922
- if (!Reader->readRemoteAddress <StoredPointer>(ref, classRef))
1922
+ if (!Reader->template readRemoteAddress <StoredPointer>(ref, classRef))
1923
1923
return std::nullopt;
1924
1924
1925
1925
auto metadata = readMetadata (classRef);
@@ -1967,8 +1967,8 @@ class MetadataReader {
1967
1967
return std::nullopt;
1968
1968
1969
1969
RemoteAddress genericArgAddress;
1970
- if (!Reader->readRemoteAddress <StoredPointer>(addressOfGenericArgAddress,
1971
- genericArgAddress))
1970
+ if (!Reader->template readRemoteAddress <StoredPointer>(
1971
+ addressOfGenericArgAddress, genericArgAddress))
1972
1972
return std::nullopt;
1973
1973
1974
1974
return genericArgAddress;
@@ -2104,8 +2104,8 @@ class MetadataReader {
2104
2104
2105
2105
// Read the name pointer.
2106
2106
RemoteAddress namePtr;
2107
- if (!Reader->readRemoteAddress <StoredPointer>(roDataPtr + OffsetToName,
2108
- namePtr))
2107
+ if (!Reader->template readRemoteAddress <StoredPointer>(
2108
+ roDataPtr + OffsetToName, namePtr))
2109
2109
return false ;
2110
2110
2111
2111
// If the name pointer is null, treat that as an error.
@@ -2169,8 +2169,8 @@ class MetadataReader {
2169
2169
// the generalization arguments are.
2170
2170
RemoteAddress shapeAddress = address + sizeof (StoredPointer);
2171
2171
RemoteAddress signedShapePtr;
2172
- if (!Reader->readRemoteAddress <StoredPointer>(shapeAddress,
2173
- signedShapePtr))
2172
+ if (!Reader->template readRemoteAddress <StoredPointer>(shapeAddress,
2173
+ signedShapePtr))
2174
2174
return nullptr ;
2175
2175
auto shapePtr = stripSignedPointer (signedShapePtr);
2176
2176
@@ -2634,8 +2634,8 @@ class MetadataReader {
2634
2634
// Low bit set in the offset indicates that the offset leads to the absolute
2635
2635
// address in memory.
2636
2636
if (indirect) {
2637
- if (!Reader->readRemoteAddress <StoredPointer>(resultAddress,
2638
- resultAddress))
2637
+ if (!Reader->template readRemoteAddress <StoredPointer>(resultAddress,
2638
+ resultAddress))
2639
2639
return RemoteAddress ();
2640
2640
}
2641
2641
@@ -3149,7 +3149,8 @@ class MetadataReader {
3149
3149
--numGenericArgs;
3150
3150
3151
3151
RemoteAddress arg;
3152
- if (!Reader->readRemoteAddress <StoredPointer>(genericArgsAddr, arg)) {
3152
+ if (!Reader->template readRemoteAddress <StoredPointer>(
3153
+ genericArgsAddr, arg)) {
3153
3154
return {};
3154
3155
}
3155
3156
genericArgsAddr += sizeof (StoredPointer);
@@ -3278,7 +3279,7 @@ class MetadataReader {
3278
3279
3279
3280
#if SWIFT_OBJC_INTEROP
3280
3281
RemoteAddress dataPtr;
3281
- if (!Reader->readRemoteAddress <StoredPointer>(
3282
+ if (!Reader->template readRemoteAddress <StoredPointer>(
3282
3283
classAddress + TargetClassMetadataObjCInterop::offsetToData (),
3283
3284
dataPtr))
3284
3285
return RemoteAddress ();
0 commit comments