Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

include/swift/Remote/MetadataReader.h

@@ -797,8 +797,8 @@ class MetadataReader {
     // Non-inline (box'ed) representation.
     // The first word of the container stores the address to the box.
     RemoteAddress BoxAddress;
-    if (!Reader->readRemoteAddress<StoredPointer>(ExistentialAddress,
-                                                  BoxAddress))
+    if (!Reader->template readRemoteAddress<StoredPointer>(ExistentialAddress,
+                                                           BoxAddress))
       return std::nullopt;
 
     auto AlignmentMask = VWT->getAlignmentMask();
@@ -1690,7 +1690,7 @@ class MetadataReader {
             StoredPointer tag) -> std::optional<RemoteAddress> {
       RemoteAddress addr = base + tag * sizeof(StoredPointer);
       RemoteAddress isa;
-      if (!Reader->readRemoteAddress<StoredPointer>(addr, isa))
+      if (!Reader->template readRemoteAddress<StoredPointer>(addr, isa))
         return std::nullopt;
       return isa;
     };
@@ -1720,7 +1720,7 @@ class MetadataReader {
       return readMetadataFromTaggedPointer(objectAddress);
 
     RemoteAddress isa;
-    if (!Reader->readRemoteAddress<StoredPointer>(objectAddress, isa))
+    if (!Reader->template readRemoteAddress<StoredPointer>(objectAddress, isa))
       return std::nullopt;
 
     switch (getIsaEncoding()) {
@@ -1769,8 +1769,8 @@ class MetadataReader {
         RemoteAddress(IndexedClassesPointer
                         + classIndex * sizeof(StoredPointer));
       RemoteAddress metadataPointer;
-      if (!Reader->readRemoteAddress<StoredPointer>(eltPointer,
-                                                    metadataPointer))
+      if (!Reader->template readRemoteAddress<StoredPointer>(eltPointer,
+                                                             metadataPointer))
         return std::nullopt;
 
       return metadataPointer;
@@ -1918,7 +1918,7 @@ class MetadataReader {
 
     case TypeReferenceKind::IndirectObjCClass: {
       RemoteAddress classRef;
-      if (!Reader->readRemoteAddress<StoredPointer>(ref, classRef))
+      if (!Reader->template readRemoteAddress<StoredPointer>(ref, classRef))
         return std::nullopt;
 
       auto metadata = readMetadata(classRef);
@@ -1966,8 +1966,8 @@ class MetadataReader {
       return std::nullopt;
 
     RemoteAddress genericArgAddress;
-    if (!Reader->readRemoteAddress<StoredPointer>(addressOfGenericArgAddress,
-                                                  genericArgAddress))
+    if (!Reader->template readRemoteAddress<StoredPointer>(
+            addressOfGenericArgAddress, genericArgAddress))
       return std::nullopt;
 
     return genericArgAddress;
@@ -2103,8 +2103,8 @@ class MetadataReader {
 
     // Read the name pointer.
     RemoteAddress namePtr;
-    if (!Reader->readRemoteAddress<StoredPointer>(roDataPtr + OffsetToName,
-                                                  namePtr))
+    if (!Reader->template readRemoteAddress<StoredPointer>(
+            roDataPtr + OffsetToName, namePtr))
       return false;
 
     // If the name pointer is null, treat that as an error.
@@ -2168,8 +2168,8 @@ class MetadataReader {
         // the generalization arguments are.
         RemoteAddress shapeAddress = address + sizeof(StoredPointer);
         RemoteAddress signedShapePtr;
-        if (!Reader->readRemoteAddress<StoredPointer>(shapeAddress,
-                                                      signedShapePtr))
+        if (!Reader->template readRemoteAddress<StoredPointer>(shapeAddress,
+                                                               signedShapePtr))
           return nullptr;
         auto shapePtr = stripSignedPointer(signedShapePtr);
 
@@ -2633,8 +2633,8 @@ class MetadataReader {
     // Low bit set in the offset indicates that the offset leads to the absolute
     // address in memory.
     if (indirect) {
-      if (!Reader->readRemoteAddress<StoredPointer>(resultAddress,
-                                                    resultAddress))
+      if (!Reader->template readRemoteAddress<StoredPointer>(resultAddress,
+                                                             resultAddress))
         return RemoteAddress();
     }
 
@@ -3148,7 +3148,8 @@ class MetadataReader {
           --numGenericArgs;
 
           RemoteAddress arg;
-          if (!Reader->readRemoteAddress<StoredPointer>(genericArgsAddr, arg)) {
+          if (!Reader->template readRemoteAddress<StoredPointer>(
+                  genericArgsAddr, arg)) {
             return {};
           }
           genericArgsAddr += sizeof(StoredPointer);
@@ -3277,7 +3278,7 @@ class MetadataReader {
 
 #if SWIFT_OBJC_INTEROP
     RemoteAddress dataPtr;
-    if (!Reader->readRemoteAddress<StoredPointer>(
+    if (!Reader->template readRemoteAddress<StoredPointer>(
             classAddress + TargetClassMetadataObjCInterop::offsetToData(),
             dataPtr))
       return RemoteAddress();