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