Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Automated rollback of commit bc94b4b8d0.

Browse Source 
PiperOrigin-RevId: 529528811
pull/12674/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 7714d57c91
commit 0ae328929e
5 changed files with 20 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/google/protobuf/compiler/cpp/parse_function_generator.cc
  2. 38
      src/google/protobuf/generated_message_tctable_decl.h
  3. 4
      src/google/protobuf/generated_message_tctable_impl.h
  4. 51
      src/google/protobuf/generated_message_tctable_lite.cc
  5. 18
      src/google/protobuf/message.cc

10
src/google/protobuf/compiler/cpp/parse_function_generator.cc
Unescape View File

@ -72,12 +72,6 @@ bool HasWeakFields(const Descriptor* descriptor) {
}
bool UseDirectTcParserTable(const FieldDescriptor* field,
const Options& options) {
if (options.opensource_runtime) {
// We can only use direct tables when the default instances are constant
// initialized. In OSS we support some compilers that do not provide this
// requirement, so disable the direct use.
return false;
}
if (field->cpp_type() != field->CPPTYPE_MESSAGE) return false;
auto* m = field->message_type();
return !m->options().message_set_wire_format() &&
@ -539,9 +533,7 @@ void ParseFunctionGenerator::GenerateTailCallTable(Formatter& format) {
format("{_fl::Offset{sizeof($classname$::Impl_::Split)}},\n");
break;
case TailCallTableInfo::kSubMessage:
format("{::_pbi::FieldAuxMessageCreator<$1$>{}, &$2$},\n",
QualifiedClassName(aux_entry.field->message_type(),
options_),
format("{::_pbi::FieldAuxDefaultMessage{}, &$1$},\n",
QualifiedDefaultInstanceName(
aux_entry.field->message_type(), options_));
break;

38
src/google/protobuf/generated_message_tctable_decl.h
Unescape View File

@ -165,30 +165,6 @@ struct Offset {
struct FieldAuxDefaultMessage {};
template <typename T>
struct FieldAuxMessageCreator {};
template <typename T>
MessageLite* NewImpl(Arena* arena) {
return Arena::CreateMessage<T>(arena);
}
#if defined(_MSC_VER)
// In some versions of MSVC the globals are not properly constant initialized
// unless they are marked `constexpr`, which the default instances are not.
// In that case, we can't use them during parse because we need to be able to
// parse during dynamic initialization.
template <typename = void>
constexpr std::false_type CanUseDefaultInstanceForNew() {
return {};
}
#else
template <typename = void>
constexpr std::true_type CanUseDefaultInstanceForNew() {
return {};
}
#endif
// Small type card used by mini parse to handle map entries.
// Map key/values are very limited, so we can encode the whole thing in a single
// byte.
@ -435,24 +411,13 @@ struct alignas(uint64_t) TcParseTableBase {
: enum_range{range_start, range_length} {}
constexpr FieldAux(const MessageLite* msg) : message_default_p(msg) {}
constexpr FieldAux(FieldAuxDefaultMessage, const void* msg)
: message_default_p(msg) {
ABSL_ASSERT(CanUseDefaultInstanceForNew());
}
template <typename T,
std::enable_if_t<CanUseDefaultInstanceForNew<T>(), int> = 0>
constexpr FieldAux(FieldAuxMessageCreator<T>, const void* msg)
: message_default_p(msg) {}
template <typename T,
std::enable_if_t<!CanUseDefaultInstanceForNew<T>(), int> = 0>
constexpr FieldAux(FieldAuxMessageCreator<T>, const void*)
: creator(&NewImpl<T>) {}
constexpr FieldAux(const TcParseTableBase* table) : table(table) {}
constexpr FieldAux(MapAuxInfo map_info) : map_info(map_info) {}
constexpr FieldAux(void (*create_in_arena)(Arena*, void*))
: create_in_arena(create_in_arena) {}
constexpr FieldAux(LazyEagerVerifyFnType verify_func)
: verify_func(verify_func) {}
bool (*enum_validator)(int);
struct {
int16_t start; // minimum enum number (if it fits)
@ -460,18 +425,15 @@ struct alignas(uint64_t) TcParseTableBase {
} enum_range;
uint32_t offset;
const void* message_default_p;
MessageLite* (*creator)(Arena* arena);
const TcParseTableBase* table;
MapAuxInfo map_info;
void (*create_in_arena)(Arena*, void*);
LazyEagerVerifyFnType verify_func;
const MessageLite* message_default() const {
ABSL_DCHECK(CanUseDefaultInstanceForNew());
return static_cast<const MessageLite*>(message_default_p);
}
const MessageLite* message_default_weak() const {
ABSL_DCHECK(CanUseDefaultInstanceForNew());
return *static_cast<const MessageLite* const*>(message_default_p);
}
};

4
src/google/protobuf/generated_message_tctable_impl.h
Unescape View File

@ -811,10 +811,6 @@ class PROTOBUF_EXPORT TcParser final {
const char* ptr, Arena* arena, SerialArena* serial_arena,
ParseContext* ctx, RepeatedPtrField<std::string>& field);
static MessageLite* NewMessage(Arena* arena, TcParseTableBase::FieldAux aux);
static MessageLite* AddMessage(RepeatedPtrFieldBase& field,
TcParseTableBase::FieldAux aux);
static void AddUnknownEnum(MessageLite* msg, const TcParseTableBase* table,
uint32_t tag, int32_t enum_value);

51
src/google/protobuf/generated_message_tctable_lite.cc
Unescape View File

@ -425,7 +425,6 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl(
if (aux_is_table) {
const auto* inner_table = table->field_aux(data.aux_idx())->table;
if (field == nullptr) {
ABSL_DCHECK(CanUseDefaultInstanceForNew());
field = inner_table->default_instance->New(msg->GetArenaForAllocation());
}
if (group_coding) {
@ -435,8 +434,9 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl(
return ctx->ParseMessage<TcParser>(field, ptr, inner_table);
} else {
if (field == nullptr) {
field = NewMessage(msg->GetArenaForAllocation(),
*table->field_aux(data.aux_idx()));
const MessageLite* default_instance =
table->field_aux(data.aux_idx())->message_default();
field = default_instance->New(msg->GetArenaForAllocation());
}
if (group_coding) {
return ctx->ParseGroup(field, ptr, FastDecodeTag(saved_tag));
@ -510,10 +510,9 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedParseMessageAuxImpl(
auto& field = RefAt<RepeatedPtrFieldBase>(msg, data.offset());
do {
ptr += sizeof(TagType);
MessageLite* submsg = field.Add<GenericTypeHandler<MessageLite>>(
aux_is_table ? aux.table->default_instance : aux.message_default());
if (aux_is_table) {
ABSL_DCHECK(CanUseDefaultInstanceForNew());
MessageLite* submsg = field.Add<GenericTypeHandler<MessageLite>>(
aux.table->default_instance);
if (group_coding) {
ptr = ctx->ParseGroup<TcParser>(submsg, ptr,
FastDecodeTag(expected_tag), aux.table);
@ -521,7 +520,6 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedParseMessageAuxImpl(
ptr = ctx->ParseMessage<TcParser>(submsg, ptr, aux.table);
}
} else {
MessageLite* submsg = AddMessage(field, aux);
if (group_coding) {
ptr = ctx->ParseGroup(submsg, ptr, FastDecodeTag(expected_tag));
} else {
@ -1743,7 +1741,6 @@ void* TcParser::MaybeGetSplitBase(MessageLite* msg, const bool is_split,
void* out = msg;
if (is_split) {
const uint32_t split_offset = GetSplitOffset(table);
ABSL_DCHECK(CanUseDefaultInstanceForNew());
void* default_split =
TcParser::RefAt<void*>(table->default_instance, split_offset);
void*& split = TcParser::RefAt<void*>(msg, split_offset);
@ -2113,27 +2110,6 @@ bool TcParser::MpVerifyUtf8(const absl::Cord& wire_bytes,
}
}
PROTOBUF_ALWAYS_INLINE MessageLite* TcParser::AddMessage(
RepeatedPtrFieldBase& field, TcParseTableBase::FieldAux aux) {
if (CanUseDefaultInstanceForNew()) {
return field.Add<GenericTypeHandler<MessageLite>>(aux.message_default());
} else {
MessageLite* value =
field.AddFromCleared<GenericTypeHandler<MessageLite>>();
if (value == nullptr) {
value = aux.creator(field.GetArena());
field.AddAllocated<GenericTypeHandler<MessageLite>>(value);
}
return value;
}
}
PROTOBUF_ALWAYS_INLINE MessageLite* TcParser::NewMessage(
Arena* arena, TcParseTableBase::FieldAux aux) {
return CanUseDefaultInstanceForNew() ? aux.message_default()->New(arena)
: aux.creator(arena);
}
template <bool is_split>
PROTOBUF_NOINLINE const char* TcParser::MpString(PROTOBUF_TC_PARAM_DECL) {
const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
@ -2334,7 +2310,6 @@ PROTOBUF_NOINLINE const char* TcParser::MpMessage(PROTOBUF_TC_PARAM_DECL) {
if ((type_card & field_layout::kTvMask) == field_layout::kTvTable) {
auto* inner_table = table->field_aux(&entry)->table;
if (need_init || field == nullptr) {
ABSL_DCHECK(CanUseDefaultInstanceForNew());
field = inner_table->default_instance->New(msg->GetArenaForAllocation());
}
if (is_group) {
@ -2343,15 +2318,15 @@ PROTOBUF_NOINLINE const char* TcParser::MpMessage(PROTOBUF_TC_PARAM_DECL) {
return ctx->ParseMessage<TcParser>(field, ptr, inner_table);
} else {
if (need_init || field == nullptr) {
const MessageLite* def;
if ((type_card & field_layout::kTvMask) == field_layout::kTvDefault) {
field =
NewMessage(msg->GetArenaForAllocation(), *table->field_aux(&entry));
def = table->field_aux(&entry)->message_default();
} else {
ABSL_DCHECK_EQ(type_card & field_layout::kTvMask,
+field_layout::kTvWeakPtr);
field = table->field_aux(&entry)->message_default_weak()->New(
msg->GetArenaForAllocation());
def = table->field_aux(&entry)->message_default_weak();
}
field = def->New(msg->GetArenaForAllocation());
}
if (is_group) {
return ctx->ParseGroup(field, ptr, decoded_tag);
@ -2400,15 +2375,15 @@ const char* TcParser::MpRepeatedMessage(PROTOBUF_TC_PARAM_DECL) {
}
return ctx->ParseMessage<TcParser>(value, ptr, inner_table);
} else {
MessageLite* value;
const MessageLite* def;
if ((type_card & field_layout::kTvMask) == field_layout::kTvDefault) {
value = AddMessage(field, aux);
def = aux.message_default();
} else {
ABSL_DCHECK_EQ(type_card & field_layout::kTvMask,
+field_layout::kTvWeakPtr);
value = field.Add<GenericTypeHandler<MessageLite>>(
aux.message_default_weak());
def = aux.message_default_weak();
}
MessageLite* value = field.Add<GenericTypeHandler<MessageLite>>(def);
if (is_group) {
return ctx->ParseGroup(value, ptr, decoded_tag);
}

18
src/google/protobuf/message.cc
Unescape View File

@ -162,20 +162,14 @@ void Message::DiscardUnknownFields() {
const char* Message::_InternalParse(const char* ptr,
internal::ParseContext* ctx) {
#if defined(PROTOBUF_USE_TABLE_PARSER_ON_REFLECTION)
// The reflection based TDP builder will use default instances. If we can't do
// it disable the whole thing and fallback to the reflection parser.
constexpr bool kUseTcParser = internal::CanUseDefaultInstanceForNew();
#else
constexpr bool kUseTcParser = false;
#endif
if (kUseTcParser) {
auto meta = GetMetadata();
ptr = internal::TcParser::ParseLoop(this, ptr, ctx,
meta.reflection->GetTcParseTable());
auto meta = GetMetadata();
ptr = internal::TcParser::ParseLoop(this, ptr, ctx,
meta.reflection->GetTcParseTable());
return ptr;
}
return ptr;
#else
return WireFormat::_InternalParse(this, ptr, ctx);
#endif
}
uint8_t* Message::_InternalSerialize(uint8_t* target,

Write Preview
Loading…
Cancel
Save