Skip to content

[MetadataReader] Adapt to newer Objective-C class_rw_t #27847

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
Oct 23, 2019
Merged

[MetadataReader] Adapt to newer Objective-C class_rw_t #27847

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
7 changes: 7 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 @@ -2432,6 +2432,13 @@ class MetadataReader {
if (!Reader->readInteger(RemoteAddress(dataPtr + OffsetToROPtr), &dataPtr))
return StoredPointer();

// Newer Objective-C runtimes implement a size optimization where the RO
// field is a tagged union. If the low-bit is set, then the pointer needs
// to be dereferenced once more to yield the real class_ro_t pointer.
if (dataPtr & 1)
if (!Reader->readInteger(RemoteAddress(dataPtr^1), &dataPtr))
return StoredPointer();

return dataPtr;
}

Expand Down