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

[RemoteMirrors] Fix losing the remote address on StaticMirror

Browse Source 
The Offset field of a DynamicRelocation is either an offset or a remote
address, but was being treated only as a remote address on
getDynamicSymbol.
This commit is contained in:
Augusto Noronha
2025-07-11 16:33:19 -07:00
parent bfb026cb9e
commit 9e85b88d9d
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/StaticMirror/ObjectFileContext.h
View File

@@ -39,8 +39,12 @@ private:
uint64_t HeaderAddress;
std::vector<Segment> Segments;
struct DynamicRelocation {
/// The symbol name that the pointer refers to. Empty if only an absolute
/// address is available.
StringRef Symbol;
uint64_t Offset;
// The offset (if the symbol is available), or the resolved remote address
// if the symbol is empty.
uint64_t OffsetOrAddress;
};
llvm::DenseMap<uint64_t, DynamicRelocation> DynamicRelocations;

10
lib/StaticMirror/ObjectFileContext.cpp
View File

@@ -332,9 +332,13 @@ remote::RemoteAbsolutePointer Image::getDynamicSymbol(uint64_t Addr) const {
auto found = DynamicRelocations.find(Addr);
if (found == DynamicRelocations.end())
return nullptr;
return remote::RemoteAbsolutePointer(found->second.Symbol,
found->second.Offset,
remote::RemoteAddress((uint64_t)0));
if (!found->second.Symbol.empty())
return remote::RemoteAbsolutePointer(found->second.Symbol,
found->second.OffsetOrAddress,
remote::RemoteAddress());
return remote::RemoteAbsolutePointer(
remote::RemoteAddress(found->second.OffsetOrAddress,
remote::RemoteAddress::DefaultAddressSpace));
}
std::pair<const Image *, uint64_t>