From 3d19b9ca700a5937139d874ba839c3bc7a29a797 Mon Sep 17 00:00:00 2001
From: Augusto Noronha <anoronha@apple.com>
Date: Mon, 14 Jul 2025 10:22:16 -0700
Subject: [PATCH] [NFC][RemoteInspection] Subtracting remote addresses should
 return int

---
 include/swift/Remote/RemoteAddress.h            | 8 ++++----
 include/swift/RemoteInspection/TypeRefBuilder.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/swift/Remote/RemoteAddress.h b/include/swift/Remote/RemoteAddress.h
index 91313cbd31b92..6a66a1376a37a 100644
--- a/include/swift/Remote/RemoteAddress.h
+++ b/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>
diff --git a/include/swift/RemoteInspection/TypeRefBuilder.h b/include/swift/RemoteInspection/TypeRefBuilder.h
index f2174133cdcd9..e1e35fa7533ec 100644
--- a/include/swift/RemoteInspection/TypeRefBuilder.h
+++ b/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);
   }