Merge pull request #83040 from augusto2112/sub-remote-addr

[NFC][RemoteInspection] Subtracting remote addresses should return int

Author: augusto2112

include/swift/Remote/RemoteAddress.h

@@ -117,10 +117,10 @@ class RemoteAddress {
     return RemoteAddress(Data - rhs, getAddressSpace());
   }
 
-  RemoteAddress operator-(const RemoteAddress &rhs) const {
-    if (AddressSpace != rhs.AddressSpace)
-      return RemoteAddress();
-    return RemoteAddress(Data - rhs.Data, getAddressSpace());
+  uint64_t operator-(const RemoteAddress &rhs) const {
+    assert(AddressSpace == rhs.AddressSpace &&
+           "Comparing remote addresses of different address spaces");
+    return Data - rhs.Data;
   }
 
   template <typename IntegerType>

include/swift/RemoteInspection/TypeRefBuilder.h

@@ -77,7 +77,7 @@ class ReflectionSection {
   RemoteRef<U> getRemoteRef(remote::RemoteAddress remoteAddr) const {
     assert(containsRemoteAddress(remoteAddr, sizeof(U)));
     auto localAddr = (uint64_t)(uintptr_t)Start.getLocalBuffer() +
-                     (remoteAddr - Start.getRemoteAddress()).getRawAddress();
+                     (remoteAddr - Start.getRemoteAddress());
 
     return RemoteRef<U>(remoteAddr, (const U *)localAddr);
   }