averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[NFC][RemoteInspection] Subtracting remote addresses should return int
This commit is contained in:
Augusto Noronha
2025-07-24 14:32:27 -07:00
committed by GitHub
parent b1eea5edd0 3d19b9ca70
commit 2abdcc9db0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/swift/Remote/RemoteAddress.h
View File

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

2
include/swift/RemoteInspection/TypeRefBuilder.h
View File

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