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

Add support for clear field in upbc.

Browse Source 
Add support for setting extension field value.

PiperOrigin-RevId: 439365359
pull/13171/head
Protobuf Team 3 years ago committed by Copybara-Service
parent 7ff1662f97
commit bef53686ec
4 changed files with 528 additions and 1 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. 7
      BUILD
  2. 4
      upb/msg_internal.h
  3. 399
      upb/test_generated_code.cc
  4. 119
      upbc/protoc-gen-upb.cc

7
BUILD
Unescape View File

@ -299,6 +299,7 @@ cc_test(
srcs = ["upb/test_generated_code.cc"],
deps = [
":empty_upbdefs_proto",
":test_messages_proto2_proto_upb",
":test_messages_proto3_proto_upb",
":test_upb_proto",
":upb",
@ -329,6 +330,12 @@ upb_proto_reflection_library(
deps = [":empty_proto"],
)
upb_proto_library(
name = "test_messages_proto2_proto_upb",
testonly = 1,
deps = ["@com_google_protobuf//:test_messages_proto2_proto"],
)
upb_proto_library(
name = "test_messages_proto3_proto_upb",
testonly = 1,

4
upb/msg_internal.h
Unescape View File

@ -482,6 +482,10 @@ UPB_INLINE bool _upb_Array_Resize(upb_Array* arr, size_t size,
return true;
}
UPB_INLINE void _upb_array_detach(const void* msg, size_t ofs) {
*UPB_PTR_AT(msg, ofs, upb_Array*) = NULL;
}
UPB_INLINE const void* _upb_array_accessor(const void* msg, size_t ofs,
size_t* size) {
const upb_Array* arr = *UPB_PTR_AT(msg, ofs, const upb_Array*);

399
upb/test_generated_code.cc
Unescape View File

@ -31,6 +31,7 @@
*/
#include "gtest/gtest.h"
#include "src/google/protobuf/test_messages_proto2.upb.h"
#include "src/google/protobuf/test_messages_proto3.upb.h"
#include "upb/test.upb.h"
#include "upb/upb.hpp"
@ -54,7 +55,7 @@ const int32_t test_int32_2 = -20;
const int32_t test_int32_3 = 30;
const int32_t test_int32_4 = -40;
TEST(GeneratedCode, Scalars) {
TEST(GeneratedCode, ScalarsProto3) {
upb_Arena* arena = upb_Arena_New();
protobuf_test_messages_proto3_TestAllTypesProto3* msg =
protobuf_test_messages_proto3_TestAllTypesProto3_new(arena);
@ -62,6 +63,7 @@ TEST(GeneratedCode, Scalars) {
upb_StringView serialized;
upb_StringView val;
// Test serialization.
protobuf_test_messages_proto3_TestAllTypesProto3_set_optional_int32(msg, 10);
protobuf_test_messages_proto3_TestAllTypesProto3_set_optional_int64(msg, 20);
protobuf_test_messages_proto3_TestAllTypesProto3_set_optional_uint32(msg, 30);
@ -102,6 +104,401 @@ TEST(GeneratedCode, Scalars) {
val = protobuf_test_messages_proto3_TestAllTypesProto3_optional_string(msg2);
EXPECT_TRUE(upb_StringView_IsEqual(val, test_str_view));
// Test clear.
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_int32(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int32(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_int64(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_uint32(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint32(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_uint64(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_float(msg);
EXPECT_EQ(
0.0f,
protobuf_test_messages_proto3_TestAllTypesProto3_optional_float(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_double(msg);
EXPECT_EQ(
0.0,
protobuf_test_messages_proto3_TestAllTypesProto3_optional_double(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_bool(msg);
EXPECT_EQ(
false,
protobuf_test_messages_proto3_TestAllTypesProto3_optional_bool(msg));
protobuf_test_messages_proto3_TestAllTypesProto3_clear_optional_string(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_string(msg)
.size);
upb_Arena_Free(arena);
}
TEST(GeneratedCode, ScalarsProto2) {
upb_Arena* arena = upb_Arena_New();
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
protobuf_test_messages_proto2_TestAllTypesProto2* msg2;
upb_StringView serialized;
// Test hazzer and serialization.
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int32(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_int32(msg, 10);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int32(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int64(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_int64(msg, 20);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int64(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint32(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_uint32(msg, 30);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint32(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint64(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_uint64(msg, 40);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint64(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sint32(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_sint32(msg, 50);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sint32(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sint64(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_sint64(msg, 60);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sint64(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_fixed32(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_fixed32(msg,
70);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_fixed32(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_fixed64(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_fixed64(msg,
80);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_fixed64(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sfixed32(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_sfixed32(msg,
90);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sfixed32(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sfixed64(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_sfixed64(msg,
100);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_sfixed64(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_float(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_float(msg,
50.5);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_float(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_double(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_double(msg,
60.6);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_double(
msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bool(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_bool(msg, 1);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bool(msg));
serialized.data = protobuf_test_messages_proto2_TestAllTypesProto2_serialize(
msg, arena, &serialized.size);
msg2 = protobuf_test_messages_proto2_TestAllTypesProto2_parse(
serialized.data, serialized.size, arena);
EXPECT_EQ(10, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(
msg2));
EXPECT_EQ(20, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int64(
msg2));
EXPECT_EQ(
30,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg2));
EXPECT_EQ(
40,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint64(msg2));
EXPECT_EQ(
50,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_sint32(msg2));
EXPECT_EQ(
60,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_sint64(msg2));
EXPECT_EQ(
70,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_fixed32(msg2));
EXPECT_EQ(
80,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_fixed64(msg2));
EXPECT_EQ(
90,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_sfixed32(msg2));
EXPECT_EQ(
100,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_sfixed64(msg2));
EXPECT_EQ(
50.5,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_float(msg2));
EXPECT_EQ(
60.6,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_double(msg2));
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_bool(msg2));
// Test clear.
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_int32(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int32(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_int64(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int64(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_int64(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_uint32(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint32(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_uint64(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint64(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_uint64(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_float(msg);
EXPECT_EQ(
0.0f,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_float(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_float(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_double(msg);
EXPECT_EQ(
0.0,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_double(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_double(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_bool(msg);
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_bool(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bool(msg));
upb_Arena_Free(arena);
}
TEST(GeneratedCode, Bytes) {
upb_Arena* arena = upb_Arena_New();
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
protobuf_test_messages_proto2_TestAllTypesProto2* msg2;
upb_StringView serialized;
const char data[] = "ABCDEF";
upb_StringView bytes = upb_StringView_FromString(data);
upb_StringView val;
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bytes(msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_bytes(msg,
bytes);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bytes(msg));
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_string(
msg, test_str_view);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string(
msg));
serialized.data = protobuf_test_messages_proto2_TestAllTypesProto2_serialize(
msg, arena, &serialized.size);
msg2 = protobuf_test_messages_proto2_TestAllTypesProto2_parse(
serialized.data, serialized.size, arena);
EXPECT_EQ(bytes.size,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_bytes(msg)
.size);
EXPECT_EQ(
0, memcmp(bytes.data,
protobuf_test_messages_proto2_TestAllTypesProto2_optional_bytes(
msg)
.data,
bytes.size));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_bytes(msg);
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_bytes(msg));
val = protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg2);
EXPECT_TRUE(upb_StringView_IsEqual(val, test_str_view));
protobuf_test_messages_proto2_TestAllTypesProto2_clear_optional_string(msg);
EXPECT_EQ(
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg)
.size);
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string(
msg));
upb_Arena_Free(arena);
}
TEST(GeneratedCode, Extension) {
upb_Arena* arena = upb_Arena_New();
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect* msg =
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect_new(
arena);
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect* msg2;
upb_StringView serialized;
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_has_message_set_extension(
msg));
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2* ext =
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_new(
arena);
EXPECT_EQ(
0,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_i(
ext));
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_set_i(
ext, 5);
EXPECT_EQ(
5,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_i(
ext));
// Test setter/hazzer.
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_set_message_set_extension(
msg, ext, arena);
EXPECT_EQ(
true,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_has_message_set_extension(
msg));
// Test serialize.
serialized.data =
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect_serialize(
msg, arena, &serialized.size);
msg2 =
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect_parse(
serialized.data, serialized.size, arena);
const protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2*
ext2 =
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_message_set_extension(
msg);
EXPECT_EQ(
5,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_i(
ext2));
// Test Clear.
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_clear_message_set_extension(
msg);
EXPECT_EQ(
false,
protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrectExtension2_has_message_set_extension(
msg));
upb_Arena_Free(arena);
}
TEST(GeneratedCode, RepeatedClear) {
upb_Arena* arena = upb_Arena_New();
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
size_t len = 0;
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(msg, &len);
EXPECT_EQ(0, len);
protobuf_test_messages_proto2_TestAllTypesProto2_add_repeated_int32(msg, 2,
arena);
protobuf_test_messages_proto2_TestAllTypesProto2_add_repeated_int32(msg, 3,
arena);
protobuf_test_messages_proto2_TestAllTypesProto2_add_repeated_int32(msg, 4,
arena);
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(msg, &len);
EXPECT_EQ(3, len);
protobuf_test_messages_proto2_TestAllTypesProto2_clear_repeated_int32(msg);
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(msg, &len);
EXPECT_EQ(0, len);
upb_Arena_Free(arena);
}

119
upbc/protoc-gen-upb.cc
Unescape View File

@ -708,6 +708,15 @@ void GenerateExtensionInHeader(const protobuf::FieldDescriptor* ext,
ExtensionIdentBase(ext), ext->name(), MessageName(ext->containing_type()),
ExtensionLayout(ext));
output(
R"cc(
UPB_INLINE void $0_clear_$1(struct $2* msg) {
_upb_Message_Clearext(msg, &$3);
}
)cc",
ExtensionIdentBase(ext), ext->name(), MessageName(ext->containing_type()),
ExtensionLayout(ext));
if (ext->is_repeated()) {
} else if (ext->message_type()) {
output(
@ -721,7 +730,20 @@ void GenerateExtensionInHeader(const protobuf::FieldDescriptor* ext,
CTypeConst(ext), ExtensionIdentBase(ext), ext->name(),
MessageName(ext->containing_type()), ExtensionLayout(ext),
FieldDefault(ext));
output(
R"cc(
UPB_INLINE void $1_set_$2(struct $3* msg, $0 ext, upb_Arena* arena) {
const upb_Message_Extension* msg_ext =
_upb_Message_Getorcreateext(msg, &$4, arena);
UPB_ASSERT(msg_ext);
*UPB_PTR_AT(&msg_ext->data, 0, $0) = ext;
}
)cc",
CTypeConst(ext), ExtensionIdentBase(ext), ext->name(),
MessageName(ext->containing_type()), ExtensionLayout(ext),
FieldDefault(ext));
} else {
// Returns default if extension field is not a message.
output(
R"cc(
UPB_INLINE $0 $1_$2(const struct $3* msg) {
@ -826,6 +848,98 @@ void GenerateHazzer(const protobuf::FieldDescriptor* field,
}
}
void GenerateClear(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
if (field == field->containing_type()->map_key() ||
field == field->containing_type()->map_value()) {
// Cannot be cleared.
return;
}
if (field->real_containing_oneof()) {
const protobuf::OneofDescriptor* oneof = field->real_containing_oneof();
std::string oneof_fullname = ToCIdent(oneof->full_name());
std::string default_value =
field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING
? "upb_StringView_FromDataAndSize(NULL, 0)"
: "0";
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
UPB_WRITE_ONEOF(msg, $2, $3, $7, $4, $6_NOT_SET);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
layout.GetOneofCaseOffset(field->real_containing_oneof()),
field->number(), oneof_fullname, default_value);
} else {
if (field->message_type()) {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
*UPB_PTR_AT(msg, $2, const upb_Message*) = NULL;
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
} else if (layout.HasHasbit(field)) {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
*UPB_PTR_AT(msg, $3, $2) = upb_StringView_FromDataAndSize(NULL, 0);
_upb_clearhas(msg, $4);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
} else {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
*UPB_PTR_AT(msg, $3, $2) = 0;
_upb_clearhas(msg, $4);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
}
} else {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
*UPB_PTR_AT(msg, $3, $2) = upb_StringView_FromDataAndSize(NULL, 0);
}
)cc",
msg_name, field->name(), CType(field),
layout.GetFieldOffset(field));
} else {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
*UPB_PTR_AT(msg, $3, $2) = 0;
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
}
}
}
}
void GenerateRepeatedClear(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
output(
R"cc(
UPB_INLINE void $0_clear_$1(const $0* msg) {
_upb_array_detach(msg, $2);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
}
void GenerateMapGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
@ -1116,6 +1230,11 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message,
for (auto field : FieldNumberOrder(message)) {
GenerateHazzer(field, layout, msg_name, output);
if (field->is_repeated()) {
GenerateRepeatedClear(field, layout, msg_name, output);
} else {
GenerateClear(field, layout, msg_name, output);
}
GenerateGetters(field, layout, msg_name, output);
}

Write Preview
Loading…
Cancel
Save