Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update protobuf upb dep (#11668)

Browse Source 
Closes #11668

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/11668 from zhangskz:protobuf-upb-dep 0ebcbda9b5
PiperOrigin-RevId: 504707372
pull/11670/head
zhangskz 2 years ago committed by Copybara-Service
parent 2fbb6bf775
commit d5d5567577
4 changed files with 1279 additions and 464 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. 1509
      php/ext/google/protobuf/php-upb.c
  2. 138
      php/ext/google/protobuf/php-upb.h
  3. 4
      protobuf_deps.bzl
  4. 92
      ruby/ext/google/protobuf_c/ruby-upb.c

1509
php/ext/google/protobuf/php-upb.c
View File

File diff suppressed because it is too large Load Diff

138
php/ext/google/protobuf/php-upb.h
Unescape View File

@ -3332,6 +3332,25 @@ typedef enum {
google_protobuf_FieldOptions_JS_NUMBER = 2
} google_protobuf_FieldOptions_JSType;
typedef enum {
google_protobuf_FieldOptions_RETENTION_UNKNOWN = 0,
google_protobuf_FieldOptions_RETENTION_RUNTIME = 1,
google_protobuf_FieldOptions_RETENTION_SOURCE = 2
} google_protobuf_FieldOptions_OptionRetention;
typedef enum {
google_protobuf_FieldOptions_TARGET_TYPE_UNKNOWN = 0,
google_protobuf_FieldOptions_TARGET_TYPE_FILE = 1,
google_protobuf_FieldOptions_TARGET_TYPE_EXTENSION_RANGE = 2,
google_protobuf_FieldOptions_TARGET_TYPE_MESSAGE = 3,
google_protobuf_FieldOptions_TARGET_TYPE_FIELD = 4,
google_protobuf_FieldOptions_TARGET_TYPE_ONEOF = 5,
google_protobuf_FieldOptions_TARGET_TYPE_ENUM = 6,
google_protobuf_FieldOptions_TARGET_TYPE_ENUM_ENTRY = 7,
google_protobuf_FieldOptions_TARGET_TYPE_SERVICE = 8,
google_protobuf_FieldOptions_TARGET_TYPE_METHOD = 9
} google_protobuf_FieldOptions_OptionTargetType;
typedef enum {
google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
@ -3350,6 +3369,10 @@ extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_i
extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
extern const upb_MiniTableEnum
google_protobuf_FieldOptions_OptionRetention_enum_init;
extern const upb_MiniTableEnum
google_protobuf_FieldOptions_OptionTargetType_enum_init;
extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
@ -6445,12 +6468,80 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_proto
const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field);
}
UPB_INLINE void google_protobuf_FieldOptions_clear_retention(
google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE int32_t google_protobuf_FieldOptions_retention(
const google_protobuf_FieldOptions* msg) {
int32_t default_val = 0;
int32_t ret;
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE bool google_protobuf_FieldOptions_has_retention(
const google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field);
}
UPB_INLINE void google_protobuf_FieldOptions_clear_target(
google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE int32_t
google_protobuf_FieldOptions_target(const google_protobuf_FieldOptions* msg) {
int32_t default_val = 0;
int32_t ret;
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE bool google_protobuf_FieldOptions_has_target(
const google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field);
}
UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
const upb_Array* arr = upb_Message_GetArray(msg, &field);
if (arr) {
if (size) *size = arr->size;
@ -6498,8 +6589,31 @@ UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_Fi
const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE void google_protobuf_FieldOptions_set_retention(
google_protobuf_FieldOptions* msg, int32_t value) {
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE void google_protobuf_FieldOptions_set_target(
google_protobuf_FieldOptions* msg, int32_t value) {
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
upb_MiniTableField field = {
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
if (arr) {
if (size) *size = arr->size;
@ -6510,11 +6624,25 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mu
}
}
UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
upb_MiniTableField field = {
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArray(msg, &field, size, arena);
}
UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
upb_MiniTableField field = {
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
return NULL;

4
protobuf_deps.bzl
Unescape View File

@ -150,7 +150,7 @@ def protobuf_deps():
_github_archive(
name = "upb",
repo = "https://github.com/protocolbuffers/upb",
commit = "5d4d54d387a6cccc7cbebec797cc253d58b42c69",
sha256 = "81acf80e2b452c051ae6239f2ead4f1b56056d7256daea1292d3a423151518e8",
commit = "1881a390b0425f8e255df9ca95a8b5d8104c66a0",
sha256 = "d3ffcaa629893fb74a1459ef28c69f84bb2d6f51feed654941b32ead412a99a1",
patches = ["@com_google_protobuf//build_defs:upb.patch"],
)

92
ruby/ext/google/protobuf_c/ruby-upb.c
Unescape View File

@ -1695,15 +1695,6 @@ static const upb_MiniTable *messages_layout[27] = {
&google_protobuf_GeneratedCodeInfo_Annotation_msg_init,
};
const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
64,
0,
{
0x7fffe,
0x0,
},
};
const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
64,
0,
@ -1713,11 +1704,11 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
},
};
const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
64,
0,
{
0xe,
0x7fffe,
0x0,
},
};
@ -1758,34 +1749,45 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init
},
};
const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
64,
0,
{
0x7,
0xe,
0x0,
},
};
const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
64,
0,
{
0x7,
0x0,
},
const upb_MiniTableEnum
google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
64,
0,
{
0x7,
0x0,
},
};
static const upb_MiniTableEnum *enums_layout[9] = {
&google_protobuf_FieldDescriptorProto_Type_enum_init,
&google_protobuf_FieldDescriptorProto_Label_enum_init,
&google_protobuf_FileOptions_OptimizeMode_enum_init,
&google_protobuf_FieldOptions_CType_enum_init,
&google_protobuf_FieldOptions_JSType_enum_init,
&google_protobuf_FieldOptions_OptionRetention_enum_init,
&google_protobuf_FieldOptions_OptionTargetType_enum_init,
&google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
&google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
const upb_MiniTableEnum
google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
64,
0,
{
0x7,
0x0,
},
};
static const upb_MiniTableEnum* enums_layout[9] = {
&google_protobuf_FieldDescriptorProto_Label_enum_init,
&google_protobuf_FieldDescriptorProto_Type_enum_init,
&google_protobuf_FieldOptions_CType_enum_init,
&google_protobuf_FieldOptions_JSType_enum_init,
&google_protobuf_FieldOptions_OptionRetention_enum_init,
&google_protobuf_FieldOptions_OptionTargetType_enum_init,
&google_protobuf_FileOptions_OptimizeMode_enum_init,
&google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
&google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
};
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
@ -4063,6 +4065,14 @@ static void jsondec_wellknown(jsondec* d, upb_Message* msg,
}
}
static bool upb_JsonDecoder_Decode(jsondec* const d, upb_Message* const msg,
const upb_MessageDef* const m) {
if (UPB_SETJMP(d->err)) return false;
jsondec_tomsg(d, msg, m);
return true;
}
bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
const upb_MessageDef* m, const upb_DefPool* symtab,
int options, upb_Arena* arena, upb_Status* status) {
@ -4082,10 +4092,7 @@ bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
d.debug_field = NULL;
d.is_first = false;
if (UPB_SETJMP(d.err)) return false;
jsondec_tomsg(&d, msg, m);
return true;
return upb_JsonDecoder_Decode(&d, msg, m);
}
@ -4831,6 +4838,17 @@ static size_t jsonenc_nullz(jsonenc* e, size_t size) {
return ret;
}
static size_t upb_JsonEncoder_Encode(jsonenc* const e,
const upb_Message* const msg,
const upb_MessageDef* const m,
const size_t size) {
if (UPB_SETJMP(e->err) != 0) return -1;
jsonenc_msgfield(e, msg, m);
if (e->arena) upb_Arena_Free(e->arena);
return jsonenc_nullz(e, size);
}
size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
const upb_DefPool* ext_pool, int options, char* buf,
size_t size, upb_Status* status) {
@ -4845,11 +4863,7 @@ size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
e.status = status;
e.arena = NULL;
if (UPB_SETJMP(e.err)) return -1;
jsonenc_msgfield(&e, msg, m);
if (e.arena) upb_Arena_Free(e.arena);
return jsonenc_nullz(&e, size);
return upb_JsonEncoder_Encode(&e, msg, m, size);
}

Write Preview
Loading…
Cancel
Save