Skip to content

[Runtime] Fix AbsoluteFuncPtr to allow template parameter inference #70878

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
Jan 12, 2024
Merged

[Runtime] Fix AbsoluteFuncPtr to allow template parameter inference #70878

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/swift/ABI/CompactFunctionPointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace swift {
/// integer.
/// As a trade-off compared to relative pointers, this has load-time overhead in PIC
/// and is only available on 32-bit targets.
template <typename T>
template <typename T, bool Nullable = false, typename Offset = int32_t>
class AbsoluteFunctionPointer {
T *Pointer;
static_assert(sizeof(T *) == sizeof(int32_t),
Expand Down
2 changes: 1 addition & 1 deletion include/swift/ABI/TargetLayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ struct InProcess {

template <typename T, bool Nullable = true, typename Offset = int32_t>
#if SWIFT_COMPACT_ABSOLUTE_FUNCTION_POINTER
using CompactFunctionPointer = AbsoluteFunctionPointer<T>;
using CompactFunctionPointer = AbsoluteFunctionPointer<T, Nullable, Offset>;
#else
using CompactFunctionPointer =
swift::RelativeDirectPointer<T, Nullable, Offset>;
Expand Down