Skip to content

[stdlib][NFC] Resolve relative address in consistent way #34631

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
Nov 10, 2020
Merged

[stdlib][NFC] Resolve relative address in consistent way #34631

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
4 changes: 2 additions & 2 deletions stdlib/public/core/KeyPath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3351,7 +3351,7 @@ internal struct InstantiateKeyPathBuffer: KeyPathPatternVisitor {

case .pointer:
// Resolve the sign-extended relative reference.
var absoluteID: UnsafeRawPointer? = idValueBase + Int(idValue)
var absoluteID: UnsafeRawPointer? = _resolveRelativeAddress(idValueBase, idValue)

// If the pointer ID is unresolved, then it needs work to get to
// the final value.
Expand Down Expand Up @@ -3456,7 +3456,7 @@ internal struct InstantiateKeyPathBuffer: KeyPathPatternVisitor {
for i in externalArgs.indices {
let base = externalArgs.baseAddress.unsafelyUnwrapped + i
let offset = base.pointee
let metadataRef = UnsafeRawPointer(base) + Int(offset)
let metadataRef = _resolveRelativeAddress(UnsafeRawPointer(base), offset)
let result = _resolveKeyPathGenericArgReference(
metadataRef,
genericEnvironment: genericEnvironment,
Expand Down