Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 23 additions & 3 deletions orc-rt/include/orc-rt/SimplePackedSerialization.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define ORC_RT_SIMPLEPACKEDSERIALIZATION_H

#include "orc-rt/Error.h"
#include "orc-rt/ExecutorAddress.h"
#include "orc-rt/bit.h"
#include "orc-rt/span.h"

Expand Down Expand Up @@ -174,9 +175,6 @@ class SPSSerializationTraits<
/// Any empty placeholder suitable as a substitute for void when deserializing
class SPSEmpty {};

/// Represents an address in the executor.
class SPSExecutorAddr {};

/// SPS tag type for tuples.
///
/// A blob tuple should be serialized by serializing each of the elements in
Expand Down Expand Up @@ -511,9 +509,31 @@ template <> class SPSSerializationTraits<SPSString, std::string_view> {
}
};

/// Represents an address in the executor.
class SPSExecutorAddr {};

/// SPS tag type for errors.
class SPSError;

template <> class SPSSerializationTraits<SPSExecutorAddr, ExecutorAddr> {
public:
static size_t size(const ExecutorAddr &A) {
return SPSArgList<uint64_t>::size(A.getValue());
}

static bool serialize(SPSOutputBuffer &OB, const ExecutorAddr &A) {
return SPSArgList<uint64_t>::serialize(OB, A.getValue());
}

static bool deserialize(SPSInputBuffer &IB, ExecutorAddr &A) {
uint64_t Value;
if (!SPSArgList<uint64_t>::deserialize(IB, Value))
return false;
A = ExecutorAddr(Value);
return true;
}
};

/// Helper type for serializing Errors.
///
/// llvm::Errors are move-only, and not inspectable except by consuming them.
Expand Down
6 changes: 6 additions & 0 deletions orc-rt/unittests/SimplePackedSerializationTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ TEST(SimplePackedSerializationTest, SequenceSerialization) {
blobSerializationRoundTrip<SPSSequence<int32_t>, std::vector<int32_t>>(V);
}

TEST(SimplePackedSerializationTest, ExecutorAddr) {
int X = 42;
auto A = ExecutorAddr::fromPtr(&X);
blobSerializationRoundTrip<SPSExecutorAddr>(A);
}

TEST(SimplePackedSerializationTest, StringViewCharSequenceSerialization) {
const char *HW = "Hello, world!";
blobSerializationRoundTrip<SPSString, std::string_view>(std::string_view(HW));
Expand Down
Loading