wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid assert when collecting vtables

This commit is contained in:
Andrew Noyes 2019-06-29 11:20:33 -07:00 committed by Alex Miller
parent d06b961a4a
commit 4c5ebd7609
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdbrpc/fdbrpc.h
View File

@ -425,7 +425,10 @@ struct serializable_traits<RequestStream<T>> : std::true_type {
} else {
const auto& ep = stream.getEndpoint();
serializer(ar, ep);
UNSTOPPABLE_ASSERT(ep.getPrimaryAddress().isValid()); // No serializing PromiseStreams on a client with no public address
if constexpr (Archiver::isSerializing) { // Don't assert this when collecting vtable for flatbuffers
UNSTOPPABLE_ASSERT(ep.getPrimaryAddress()
.isValid()); // No serializing PromiseStreams on a client with no public address
}
}
}
};

4
flow/flat_buffers.h
View File

@ -542,6 +542,7 @@ private:
struct InsertVTableLambda {
static constexpr bool isDeserializing = false;
static constexpr bool isSerializing = false;
static constexpr bool is_fb_visitor = true;
std::set<const VTable*>& vtables;
std::set<std::type_index>& known_types;
@ -665,6 +666,7 @@ private:
template <class Writer>
struct SaveVisitorLambda {
static constexpr bool isDeserializing = false;
static constexpr bool isSerializing = true;
static constexpr bool is_fb_visitor = true;
const VTableSet* vtableset;
Writer& writer;
@ -738,6 +740,7 @@ struct SaveVisitorLambda {
template <class Context>
struct LoadMember {
static constexpr bool isDeserializing = true;
static constexpr bool isSerializing = false;
const uint16_t* const vtable;
const uint8_t* const message;
const uint16_t vtable_length;
@ -852,6 +855,7 @@ struct LoadSaveHelper {
template <class Context>
struct SerializeFun {
static constexpr bool isDeserializing = true;
static constexpr bool isSerializing = false;
static constexpr bool is_fb_visitor = true;
const uint16_t* vtable;

4
flow/serialize.h
View File

@ -317,6 +317,7 @@ inline _Unversioned Unversioned() { return _Unversioned(); }
class BinaryWriter : NonCopyable {
public:
static const int isDeserializing = 0;
static constexpr bool isSerializing = true;
typedef BinaryWriter WRITER;
void serializeBytes( StringRef bytes ) {
@ -518,6 +519,7 @@ private:
class ArenaReader {
public:
static const int isDeserializing = 1;
static constexpr bool isSerializing = false;
typedef ArenaReader READER;
const void* readBytes( int bytes ) {
@ -583,6 +585,7 @@ private:
class BinaryReader {
public:
static const int isDeserializing = 1;
static constexpr bool isSerializing = false;
typedef BinaryReader READER;
const void* readBytes( int bytes );
@ -682,6 +685,7 @@ struct PacketBuffer : SendBuffer, FastAllocated<PacketBuffer> {
struct PacketWriter {
static const int isDeserializing = 0;
static constexpr bool isSerializing = 1;
typedef PacketWriter WRITER;
PacketBuffer* buffer;