Skip to content

MetadataReader: Allow for an unresolved pointer to be returned by getSymbol #71692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2024
Merged

MetadataReader: Allow for an unresolved pointer to be returned by getSymbol #71692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions include/swift/Remote/MetadataReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,30 @@ class MetadataReader {
// 'resolved' points to a struct of two relative addresses.
// The second entry is a relative address to the mangled protocol
// without symbolic references.

// lldb might return an unresolved remote absolute pointer from its
// resolvePointerAsSymbol implementation -- workaround this.
if (!resolved.isResolved()) {
auto remoteAddr = RemoteAddress(remoteAddress);
resolved =
RemoteAbsolutePointer("", remoteAddr.getAddressData());
}

auto addr =
resolved.getResolvedAddress().getAddressData() + sizeof(int32_t);
int32_t offset;
Reader->readInteger(RemoteAddress(addr), &offset);
auto addrOfTypeRef = addr + offset;
resolved = Reader->getSymbol(RemoteAddress(addrOfTypeRef));

// lldb might return an unresolved remote absolute pointer from its
// resolvePointerAsSymbol implementation -- workaround this.
if (!resolved.isResolved()) {
auto remoteAddr = RemoteAddress(addrOfTypeRef);
resolved =
RemoteAbsolutePointer("", remoteAddr.getAddressData());
}

// Dig out the protocol from the protocol list.
auto protocolList = readMangledName(resolved.getResolvedAddress(),
MangledNameKind::Type, dem);
Expand Down