nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ORC-RT] Fix void function handling in the WrapperFunction utility.

Browse Source 
Handlers returning void previously caused compile errors. Fix that by
substituting SPSEmpty placeholder values.
This commit is contained in:
Lang Hames
2021-06-15 11:56:37 +10:00
parent 5e92cbddb9
commit 68c161090e
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
compiler-rt/lib/orc/wrapper_function_utils.h
View File

@@ -128,6 +128,25 @@ serializeViaSPSToWrapperFunctionResult(const ArgTs &...Args) {
return Result;
}
template <typename RetT> class WrapperFunctionHandlerCaller {
public:
template <typename HandlerT, typename ArgTupleT, std::size_t... I>
static decltype(auto) call(HandlerT &&H, ArgTupleT &Args,
std::index_sequence<I...>) {
return std::forward<HandlerT>(H)(std::get<I>(Args)...);
}
};
template <> class WrapperFunctionHandlerCaller<void> {
public:
template <typename HandlerT, typename ArgTupleT, std::size_t... I>
static SPSEmpty call(HandlerT &&H, ArgTupleT &Args,
std::index_sequence<I...>) {
std::forward<HandlerT>(H)(std::get<I>(Args)...);
return SPSEmpty();
}
};
template <typename WrapperFunctionImplT,
template <typename> class ResultSerializer, typename... SPSTagTs>
class WrapperFunctionHandlerHelper
@@ -151,8 +170,11 @@ public:
return WrapperFunctionResult::createOutOfBandError(
"Could not deserialize arguments for wrapper function call");
if (auto Result = ResultSerializer<RetT>::serialize(
call(std::forward<HandlerT>(H), Args, ArgIndices{})))
auto HandlerResult = WrapperFunctionHandlerCaller<RetT>::call(
std::forward<HandlerT>(H), Args, ArgIndices{});
if (auto Result = ResultSerializer<decltype(HandlerResult)>::serialize(
std::move(HandlerResult)))
return std::move(*Result);
else
return WrapperFunctionResult::createOutOfBandError(
@@ -167,11 +189,6 @@ private:
return SPSArgList<SPSTagTs...>::deserialize(IB, std::get<I>(Args)...);
}
template <typename HandlerT, std::size_t... I>
static decltype(auto) call(HandlerT &&H, ArgTuple &Args,
std::index_sequence<I...>) {
return std::forward<HandlerT>(H)(std::get<I>(Args)...);
}
};
// Map function references to function types.