Merge pull request swiftlang#81874 from mikeash/remote-mirror-strip-protocol-pointers

mikeash · web-flow · commit 47e5edeb3e2c · 2025-06-03T14:49:58.000-04:00
[RemoteMirror] Strip protocol descriptor pointers when reading the conformance cache.
diff --git a/include/swift/RemoteInspection/ReflectionContext.h b/include/swift/RemoteInspection/ReflectionContext.h
@@ -1389,7 +1389,7 @@ class ReflectionContext
 
     for (StoredSize i = 0; i < Count; i++) {
       auto &Element = ElementsData[i];
-      Call(Element.Type, Element.Proto);
+      Call(Element.Type, stripSignedPointer(Element.Proto));
     }
   }
 
diff --git a/include/swift/RemoteInspection/RuntimeInternals.h b/include/swift/RemoteInspection/RuntimeInternals.h
@@ -58,7 +58,7 @@ template <typename Runtime> struct ConcurrentHashMap {
 
 template <typename Runtime> struct ConformanceCacheEntry {
   typename Runtime::StoredPointer Type;
-  typename Runtime::StoredPointer Proto;
+  typename Runtime::StoredSignedPointer Proto;
   typename Runtime::StoredPointer Witness;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1389,7 +1389,7 @@ class ReflectionContext`
`1389`	`1389`
`1390`	`1390`	`for (StoredSize i = 0; i < Count; i++) {`
`1391`	`1391`	`auto &Element = ElementsData[i];`
`1392`		`- Call(Element.Type, Element.Proto);`
	`1392`	`+ Call(Element.Type, stripSignedPointer(Element.Proto));`
`1393`	`1393`	`}`
`1394`	`1394`	`}`
`1395`	`1395`