Skip to content

Commit 7f32a56

Browse files
protobuf-team-botprotobuf-team-bot
committed
Auto-generate files after cl/741268124
1 parent 4fd39a8 commit 7f32a56

File tree

11 files changed

+1534
-1183
lines changed

11 files changed

+1534
-1183
lines changed

‎csharp/src/Google.Protobuf.Test/testprotos.pb

392 Bytes
Binary file not shown.

‎csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs

+333-216
Large diffs are not rendered by default.

‎php/ext/google/protobuf/php-upb.c

+943-927
Large diffs are not rendered by default.

‎php/ext/google/protobuf/php-upb.h

+48-8
Original file line numberDiff line numberDiff line change
@@ -7291,19 +7291,19 @@ UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_proto
72917291
return ptr;
72927292
}
72937293
UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) {
7294-
const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
7294+
const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
72957295
upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
72967296
}
72977297
UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
72987298
upb_StringView default_val = upb_StringView_FromString("");
72997299
upb_StringView ret;
7300-
const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
7300+
const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
73017301
_upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
73027302
&default_val, &ret);
73037303
return ret;
73047304
}
73057305
UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
7306-
const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
7306+
const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
73077307
return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
73087308
}
73097309
UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) {
@@ -7600,9 +7600,25 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb
76007600
}
76017601
return arr;
76027602
}
7603+
UPB_INLINE void google_protobuf_DescriptorProto_clear_visibility(google_protobuf_DescriptorProto* msg) {
7604+
const upb_MiniTableField field = {11, UPB_SIZE(48, 12), 66, 8, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
7605+
upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
7606+
}
7607+
UPB_INLINE int32_t google_protobuf_DescriptorProto_visibility(const google_protobuf_DescriptorProto* msg) {
7608+
int32_t default_val = 0;
7609+
int32_t ret;
7610+
const upb_MiniTableField field = {11, UPB_SIZE(48, 12), 66, 8, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
7611+
_upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
7612+
&default_val, &ret);
7613+
return ret;
7614+
}
7615+
UPB_INLINE bool google_protobuf_DescriptorProto_has_visibility(const google_protobuf_DescriptorProto* msg) {
7616+
const upb_MiniTableField field = {11, UPB_SIZE(48, 12), 66, 8, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
7617+
return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
7618+
}
76037619

76047620
UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
7605-
const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
7621+
const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
76067622
upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
76077623
}
76087624
UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) {
@@ -7870,6 +7886,10 @@ UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobu
78707886
(arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val));
78717887
return true;
78727888
}
7889+
UPB_INLINE void google_protobuf_DescriptorProto_set_visibility(google_protobuf_DescriptorProto *msg, int32_t value) {
7890+
const upb_MiniTableField field = {11, UPB_SIZE(48, 12), 66, 8, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
7891+
upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
7892+
}
78737893

78747894
/* google.protobuf.DescriptorProto.ExtensionRange */
78757895

@@ -8810,19 +8830,19 @@ UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_p
88108830
return ptr;
88118831
}
88128832
UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) {
8813-
const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
8833+
const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
88148834
upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
88158835
}
88168836
UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
88178837
upb_StringView default_val = upb_StringView_FromString("");
88188838
upb_StringView ret;
8819-
const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
8839+
const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
88208840
_upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
88218841
&default_val, &ret);
88228842
return ret;
88238843
}
88248844
UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
8825-
const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
8845+
const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
88268846
return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
88278847
}
88288848
UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) {
@@ -8944,9 +8964,25 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable
89448964
}
89458965
return arr;
89468966
}
8967+
UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_visibility(google_protobuf_EnumDescriptorProto* msg) {
8968+
const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 66, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
8969+
upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
8970+
}
8971+
UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_visibility(const google_protobuf_EnumDescriptorProto* msg) {
8972+
int32_t default_val = 0;
8973+
int32_t ret;
8974+
const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 66, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
8975+
_upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
8976+
&default_val, &ret);
8977+
return ret;
8978+
}
8979+
UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_visibility(const google_protobuf_EnumDescriptorProto* msg) {
8980+
const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 66, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
8981+
return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
8982+
}
89478983

89488984
UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
8949-
const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
8985+
const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
89508986
upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
89518987
}
89528988
UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) {
@@ -9054,6 +9090,10 @@ UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_pro
90549090
(arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val));
90559091
return true;
90569092
}
9093+
UPB_INLINE void google_protobuf_EnumDescriptorProto_set_visibility(google_protobuf_EnumDescriptorProto *msg, int32_t value) {
9094+
const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 66, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
9095+
upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
9096+
}
90579097

90589098
/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
90599099

‎php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎php/src/Google/Protobuf/Internal/DescriptorProto.php

+44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎php/src/Google/Protobuf/Internal/EnumDescriptorProto.php

+44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ruby/ext/google/protobuf_c/ruby-upb.c

+12-8
Original file line numberDiff line numberDiff line change
@@ -10086,7 +10086,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
1008610086
};
1008710087

1008810088
const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init;
10089-
static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = {
10089+
static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[9] = {
1009010090
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
1009110091
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
1009210092
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
@@ -10095,10 +10095,11 @@ static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8
1009510095
{.UPB_PRIVATE(submsg) = &google__protobuf__MessageOptions_msg_init_ptr},
1009610096
{.UPB_PRIVATE(submsg) = &google__protobuf__OneofDescriptorProto_msg_init_ptr},
1009710097
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr},
10098+
{.UPB_PRIVATE(subenum) = &google__protobuf__SymbolVisibility_enum_init},
1009810099
};
1009910100

10100-
static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
10101-
{1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
10101+
static const upb_MiniTableField google_protobuf_DescriptorProto__fields[11] = {
10102+
{1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
1010210103
{2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1010310104
{3, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1010410105
{4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
@@ -10108,12 +10109,13 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
1010810109
{8, UPB_SIZE(36, 80), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1010910110
{9, UPB_SIZE(40, 88), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1011010111
{10, UPB_SIZE(44, 96), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
10112+
{11, UPB_SIZE(48, 12), 66, 8, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
1011110113
};
1011210114

1011310115
const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
1011410116
&google_protobuf_DescriptorProto__submsgs[0],
1011510117
&google_protobuf_DescriptorProto__fields[0],
10116-
UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
10118+
UPB_SIZE(64, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0,
1011710119
#ifdef UPB_TRACING_ENABLED
1011810120
"google.protobuf.DescriptorProto",
1011910121
#endif
@@ -10298,24 +10300,26 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
1029810300
};
1029910301

1030010302
const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init;
10301-
static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = {
10303+
static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[4] = {
1030210304
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr},
1030310305
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr},
1030410306
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr},
10307+
{.UPB_PRIVATE(subenum) = &google__protobuf__SymbolVisibility_enum_init},
1030510308
};
1030610309

10307-
static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
10308-
{1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
10310+
static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[6] = {
10311+
{1, UPB_SIZE(32, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
1030910312
{2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1031010313
{3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1031110314
{4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
1031210315
{5, UPB_SIZE(24, 56), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
10316+
{6, UPB_SIZE(28, 12), 66, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
1031310317
};
1031410318

1031510319
const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
1031610320
&google_protobuf_EnumDescriptorProto__submsgs[0],
1031710321
&google_protobuf_EnumDescriptorProto__fields[0],
10318-
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
10322+
UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
1031910323
#ifdef UPB_TRACING_ENABLED
1032010324
"google.protobuf.EnumDescriptorProto",
1032110325
#endif

0 commit comments

Comments
 (0)