maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ORC][ORC-RT] Consistently use pointed-to type as template arg to wrap/unwrap. 

Saves wrap/unwrap implementers from having to use std::remove_pointer_t to get
at the pointed-to type.
This commit is contained in:
Lang Hames 2022-09-01 16:07:38 -07:00
parent cbb2141f7f
commit 6ca9f42189
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/orc/executor_address.h
View File

@ -40,7 +40,7 @@ private:
class ExecutorAddr {
public:
/// A wrap/unwrap function that leaves pointers unmodified.
template <typename T> using rawPtr = __orc_rt::identity<T>;
template <typename T> using rawPtr = __orc_rt::identity<T *>;
/// Default wrap function to use on this host.
template <typename T> using defaultWrap = rawPtr<T>;
@ -82,14 +82,14 @@ public:
explicit ExecutorAddr(uint64_t Addr) : Addr(Addr) {}
/// Create an ExecutorAddr from the given pointer.
template <typename T, typename UnwrapFn = defaultUnwrap<T *>>
template <typename T, typename UnwrapFn = defaultUnwrap<T>>
static ExecutorAddr fromPtr(T *Ptr, UnwrapFn &&Unwrap = UnwrapFn()) {
return ExecutorAddr(
static_cast<uint64_t>(reinterpret_cast<uintptr_t>(Unwrap(Ptr))));
}
/// Cast this ExecutorAddr to a pointer of the given type.
template <typename T, typename WrapFn = defaultWrap<T>>
template <typename T, typename WrapFn = defaultWrap<std::remove_pointer_t<T>>>
std::enable_if_t<std::is_pointer<T>::value, T>
toPtr(WrapFn &&Wrap = WrapFn()) const {
uintptr_t IntPtr = static_cast<uintptr_t>(Addr);
@ -98,7 +98,7 @@ public:
}
/// Cast this ExecutorAddr to a pointer of the given function type.
template <typename T, typename WrapFn = defaultWrap<T *>>
template <typename T, typename WrapFn = defaultWrap<T>>
std::enable_if_t<std::is_function<T>::value, T *>
toPtr(WrapFn &&Wrap = WrapFn()) const {
uintptr_t IntPtr = static_cast<uintptr_t>(Addr);

8
llvm/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h
View File

@ -31,7 +31,7 @@ using ExecutorAddrDiff = uint64_t;
class ExecutorAddr {
public:
/// A wrap/unwrap function that leaves pointers unmodified.
template <typename T> using rawPtr = llvm::identity<T>;
template <typename T> using rawPtr = llvm::identity<T *>;
/// Default wrap function to use on this host.
template <typename T> using defaultWrap = rawPtr<T>;
@ -76,7 +76,7 @@ public:
/// Create an ExecutorAddr from the given pointer.
/// Warning: This should only be used when JITing in-process.
template <typename T, typename UnwrapFn = defaultUnwrap<T *>>
template <typename T, typename UnwrapFn = defaultUnwrap<T>>
static ExecutorAddr fromPtr(T *Ptr, UnwrapFn &&Unwrap = UnwrapFn()) {
return ExecutorAddr(
static_cast<uint64_t>(reinterpret_cast<uintptr_t>(Unwrap(Ptr))));
@ -84,7 +84,7 @@ public:
/// Cast this ExecutorAddr to a pointer of the given type.
/// Warning: This should only be used when JITing in-process.
template <typename T, typename WrapFn = defaultWrap<T>>
template <typename T, typename WrapFn = defaultWrap<std::remove_pointer_t<T>>>
std::enable_if_t<std::is_pointer<T>::value, T>
toPtr(WrapFn &&Wrap = WrapFn()) const {
uintptr_t IntPtr = static_cast<uintptr_t>(Addr);
@ -94,7 +94,7 @@ public:
/// Cast this ExecutorAddr to a pointer of the given function type.
/// Warning: This should only be used when JITing in-process.
template <typename T, typename WrapFn = defaultWrap<T *>>
template <typename T, typename WrapFn = defaultWrap<T>>
std::enable_if_t<std::is_function<T>::value, T *>
toPtr(WrapFn &&Wrap = WrapFn()) const {
uintptr_t IntPtr = static_cast<uintptr_t>(Addr);