Skip to content

[orc-rt] Enable transparent SPS conversion for Expected<T*>. #162073

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 7, 2025
Merged

[orc-rt] Enable transparent SPS conversion for Expected<T*>. #162073

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
15 changes: 15 additions & 0 deletions orc-rt/include/orc-rt/SPSWrapperFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ template <typename... SPSArgTs> struct WFSPSHelper {
}
};

template <typename T> struct Serializable<Expected<T *>> {
typedef SPSSerializableExpected<ExecutorAddr> serializable_type;
static SPSSerializableExpected<ExecutorAddr> to(Expected<T *> Val) {
return SPSSerializableExpected<ExecutorAddr>(
Val ? Expected<ExecutorAddr>(ExecutorAddr::fromPtr(*Val))
: Expected<ExecutorAddr>(Val.takeError()));
}
static Expected<T *> from(SPSSerializableExpected<ExecutorAddr> Val) {
if (auto Tmp = Val.toExpected())
return Tmp->toPtr<T *>();
else
return Tmp.takeError();
}
};

template <typename... Ts> struct DeserializableTuple;

template <typename... Ts> struct DeserializableTuple<std::tuple<Ts...>> {
Expand Down
24 changes: 24 additions & 0 deletions orc-rt/unittests/SPSWrapperFunctionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,30 @@ TEST(SPSWrapperFunctionUtilsTest, TransparentSerializationPointers) {
EXPECT_EQ(P, &X);
}

static void
expected_int_pointer_sps_wrapper(orc_rt_SessionRef Session, void *CallCtx,
orc_rt_WrapperFunctionReturn Return,
orc_rt_WrapperFunctionBuffer ArgBytes) {
SPSWrapperFunction<SPSExpected<SPSExecutorAddr>(SPSExecutorAddr)>::handle(
Session, CallCtx, Return, ArgBytes,
[](move_only_function<void(Expected<int32_t *>)> Return, int32_t *P) {
Return(P);
});
}

TEST(SPSWrapperFunctionUtilsTest, TransparentSerializationExpectedPointers) {
int X = 42;
int *P = nullptr;
SPSWrapperFunction<SPSExpected<SPSExecutorAddr>(SPSExecutorAddr)>::call(
DirectCaller(nullptr, expected_int_pointer_sps_wrapper),
[&](Expected<Expected<int32_t *>> R) {
P = cantFail(cantFail(std::move(R)));
},
&X);

EXPECT_EQ(P, &X);
}

template <size_t N> struct SPSOpCounter {};

namespace orc_rt {
Expand Down
Loading