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

Auto-generate files after cl/594654099

Browse Source
pull/15245/head
Protobuf Team Bot 1 year ago
parent f1b8f477d7
commit 2b79738d5f
4 changed files with 132 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 109
      php/ext/google/protobuf/php-upb.c
  2. 13
      php/ext/google/protobuf/php-upb.h
  3. 109
      ruby/ext/google/protobuf_c/ruby-upb.c
  4. 13
      ruby/ext/google/protobuf_c/ruby-upb.h

109
php/ext/google/protobuf/php-upb.c
Unescape View File

@ -6430,31 +6430,34 @@ bool _upb_mapsorter_pushexts(_upb_mapsorter* s, const upb_Extension* exts,
static const size_t message_overhead = sizeof(upb_Message_InternalData); static const size_t message_overhead = sizeof(upb_Message_InternalData);
upb_Message* upb_Message_New(const upb_MiniTable* m, upb_Arena* arena) { upb_Message* upb_Message_New(const upb_MiniTable* m, upb_Arena* a) {
return _upb_Message_New(m, arena); return _upb_Message_New(m, a);
} }
bool UPB_PRIVATE(_upb_Message_AddUnknown)(upb_Message* msg, const char* data, bool UPB_PRIVATE(_upb_Message_AddUnknown)(upb_Message* msg, const char* data,
size_t len, upb_Arena* arena) { size_t len, upb_Arena* arena) {
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, len, arena)) return false; if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, len, arena)) return false;
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
memcpy(UPB_PTR_AT(in->internal, in->internal->unknown_end, char), data, len); upb_Message_InternalData* in = owner->internal;
in->internal->unknown_end += len; memcpy(UPB_PTR_AT(in, in->unknown_end, char), data, len);
in->unknown_end += len;
return true; return true;
} }
void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) { void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
if (in->internal) { upb_Message_InternalData* in = owner->internal;
in->internal->unknown_end = message_overhead; if (in) {
in->unknown_end = message_overhead;
} }
} }
const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) { const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
const upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
if (in->internal) { upb_Message_InternalData* in = owner->internal;
*len = in->internal->unknown_end - message_overhead; if (in) {
return (char*)(in->internal + 1); *len = in->unknown_end - message_overhead;
return (char*)(in + 1);
} else { } else {
*len = 0; *len = 0;
return NULL; return NULL;
@ -6462,9 +6465,10 @@ const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
} }
void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) { void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
const char* internal_unknown_end = upb_Message_InternalData* in = owner->internal;
UPB_PTR_AT(in->internal, in->internal->unknown_end, char); const char* internal_unknown_end = UPB_PTR_AT(in, in->unknown_end, char);
#ifndef NDEBUG #ifndef NDEBUG
size_t full_unknown_size; size_t full_unknown_size;
const char* full_unknown = upb_Message_GetUnknown(msg, &full_unknown_size); const char* full_unknown = upb_Message_GetUnknown(msg, &full_unknown_size);
@ -6473,10 +6477,11 @@ void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) {
UPB_ASSERT((uintptr_t)(data + len) > (uintptr_t)data); UPB_ASSERT((uintptr_t)(data + len) > (uintptr_t)data);
UPB_ASSERT((uintptr_t)(data + len) <= (uintptr_t)internal_unknown_end); UPB_ASSERT((uintptr_t)(data + len) <= (uintptr_t)internal_unknown_end);
#endif #endif
if ((data + len) != internal_unknown_end) { if ((data + len) != internal_unknown_end) {
memmove((char*)data, data + len, internal_unknown_end - data - len); memmove((char*)data, data + len, internal_unknown_end - data - len);
} }
in->internal->unknown_end -= len; in->unknown_end -= len;
} }
size_t upb_Message_ExtensionCount(const upb_Message* msg) { size_t upb_Message_ExtensionCount(const upb_Message* msg) {
@ -15505,11 +15510,10 @@ const struct upb_Extension* _upb_Message_Getext(
const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
const struct upb_Message* msg, size_t* count) { const struct upb_Message* msg, size_t* count) {
const upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
if (in->internal) { if (in) {
*count = (in->internal->size - in->internal->ext_begin) / *count = (in->size - in->ext_begin) / sizeof(struct upb_Extension);
sizeof(struct upb_Extension); return UPB_PTR_AT(in, in->ext_begin, void);
return UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
} else { } else {
*count = 0; *count = 0;
return NULL; return NULL;
@ -15517,17 +15521,15 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
} }
struct upb_Extension* _upb_Message_GetOrCreateExtension( struct upb_Extension* _upb_Message_GetOrCreateExtension(
struct upb_Message* msg, const upb_MiniTableExtension* e, struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) {
upb_Arena* arena) {
struct upb_Extension* ext = struct upb_Extension* ext =
(struct upb_Extension*)_upb_Message_Getext(msg, e); (struct upb_Extension*)_upb_Message_Getext(msg, e);
if (ext) return ext; if (ext) return ext;
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), a))
arena))
return NULL; return NULL;
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
in->internal->ext_begin -= sizeof(struct upb_Extension); in->ext_begin -= sizeof(struct upb_Extension);
ext = UPB_PTR_AT(in->internal, in->internal->ext_begin, void); ext = UPB_PTR_AT(in, in->ext_begin, void);
memset(ext, 0, sizeof(struct upb_Extension)); memset(ext, 0, sizeof(struct upb_Extension));
ext->ext = e; ext->ext = e;
return ext; return ext;
@ -15544,38 +15546,41 @@ const float kUpb_FltInfinity = INFINITY;
const double kUpb_Infinity = INFINITY; const double kUpb_Infinity = INFINITY;
const double kUpb_NaN = NAN; const double kUpb_NaN = NAN;
static const size_t realloc_overhead = sizeof(upb_Message_InternalData);
bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
upb_Arena* arena) { upb_Arena* a) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); const size_t overhead = sizeof(upb_Message_InternalData);
if (!in->internal) {
upb_Message_Internal* owner = upb_Message_Getinternal(msg);
upb_Message_InternalData* in = owner->internal;
if (!in) {
// No internal data, allocate from scratch. // No internal data, allocate from scratch.
size_t size = UPB_MAX(128, upb_Log2CeilingSize(need + realloc_overhead)); size_t size = UPB_MAX(128, upb_Log2CeilingSize(need + overhead));
upb_Message_InternalData* internal = upb_Arena_Malloc(arena, size); in = upb_Arena_Malloc(a, size);
if (!internal) return false; if (!in) return false;
internal->size = size;
internal->unknown_end = realloc_overhead; in->size = size;
internal->ext_begin = size; in->unknown_end = overhead;
in->internal = internal; in->ext_begin = size;
} else if (in->internal->ext_begin - in->internal->unknown_end < need) { owner->internal = in;
} else if (in->ext_begin - in->unknown_end < need) {
// Internal data is too small, reallocate. // Internal data is too small, reallocate.
size_t new_size = upb_Log2CeilingSize(in->internal->size + need); size_t new_size = upb_Log2CeilingSize(in->size + need);
size_t ext_bytes = in->internal->size - in->internal->ext_begin; size_t ext_bytes = in->size - in->ext_begin;
size_t new_ext_begin = new_size - ext_bytes; size_t new_ext_begin = new_size - ext_bytes;
upb_Message_InternalData* internal = in = upb_Arena_Realloc(a, in, in->size, new_size);
upb_Arena_Realloc(arena, in->internal, in->internal->size, new_size); if (!in) return false;
if (!internal) return false;
if (ext_bytes) { if (ext_bytes) {
// Need to move extension data to the end. // Need to move extension data to the end.
char* ptr = (char*)internal; char* ptr = (char*)in;
memmove(ptr + new_ext_begin, ptr + internal->ext_begin, ext_bytes); memmove(ptr + new_ext_begin, ptr + in->ext_begin, ext_bytes);
} }
internal->ext_begin = new_ext_begin; in->ext_begin = new_ext_begin;
internal->size = new_size; in->size = new_size;
in->internal = internal; owner->internal = in;
} }
UPB_ASSERT(in->internal->ext_begin - in->internal->unknown_end >= need);
UPB_ASSERT(in->ext_begin - in->unknown_end >= need);
return true; return true;
} }

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

@ -2323,6 +2323,11 @@ UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(
return (upb_Message_Internal*)((char*)msg - size); return (upb_Message_Internal*)((char*)msg - size);
} }
UPB_INLINE upb_Message_InternalData* upb_Message_GetInternalData(
const struct upb_Message* msg) {
return upb_Message_Getinternal(msg)->internal;
}
// Discards the unknown fields for this message only. // Discards the unknown fields for this message only.
void _upb_Message_DiscardUnknown_shallow(struct upb_Message* msg); void _upb_Message_DiscardUnknown_shallow(struct upb_Message* msg);
@ -2724,15 +2729,15 @@ UPB_INLINE bool _upb_Message_SetExtensionField(
UPB_INLINE void _upb_Message_ClearExtensionField( UPB_INLINE void _upb_Message_ClearExtensionField(
struct upb_Message* msg, const upb_MiniTableExtension* ext_l) { struct upb_Message* msg, const upb_MiniTableExtension* ext_l) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
if (!in->internal) return; if (!in) return;
const struct upb_Extension* base = const struct upb_Extension* base =
UPB_PTR_AT(in->internal, in->internal->ext_begin, struct upb_Extension); UPB_PTR_AT(in, in->ext_begin, struct upb_Extension);
struct upb_Extension* ext = struct upb_Extension* ext =
(struct upb_Extension*)_upb_Message_Getext(msg, ext_l); (struct upb_Extension*)_upb_Message_Getext(msg, ext_l);
if (ext) { if (ext) {
*ext = *base; *ext = *base;
in->internal->ext_begin += sizeof(struct upb_Extension); in->ext_begin += sizeof(struct upb_Extension);
} }
} }

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

@ -5946,31 +5946,34 @@ bool _upb_mapsorter_pushexts(_upb_mapsorter* s, const upb_Extension* exts,
static const size_t message_overhead = sizeof(upb_Message_InternalData); static const size_t message_overhead = sizeof(upb_Message_InternalData);
upb_Message* upb_Message_New(const upb_MiniTable* m, upb_Arena* arena) { upb_Message* upb_Message_New(const upb_MiniTable* m, upb_Arena* a) {
return _upb_Message_New(m, arena); return _upb_Message_New(m, a);
} }
bool UPB_PRIVATE(_upb_Message_AddUnknown)(upb_Message* msg, const char* data, bool UPB_PRIVATE(_upb_Message_AddUnknown)(upb_Message* msg, const char* data,
size_t len, upb_Arena* arena) { size_t len, upb_Arena* arena) {
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, len, arena)) return false; if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, len, arena)) return false;
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
memcpy(UPB_PTR_AT(in->internal, in->internal->unknown_end, char), data, len); upb_Message_InternalData* in = owner->internal;
in->internal->unknown_end += len; memcpy(UPB_PTR_AT(in, in->unknown_end, char), data, len);
in->unknown_end += len;
return true; return true;
} }
void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) { void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
if (in->internal) { upb_Message_InternalData* in = owner->internal;
in->internal->unknown_end = message_overhead; if (in) {
in->unknown_end = message_overhead;
} }
} }
const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) { const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
const upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
if (in->internal) { upb_Message_InternalData* in = owner->internal;
*len = in->internal->unknown_end - message_overhead; if (in) {
return (char*)(in->internal + 1); *len = in->unknown_end - message_overhead;
return (char*)(in + 1);
} else { } else {
*len = 0; *len = 0;
return NULL; return NULL;
@ -5978,9 +5981,10 @@ const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
} }
void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) { void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_Internal* owner = upb_Message_Getinternal(msg);
const char* internal_unknown_end = upb_Message_InternalData* in = owner->internal;
UPB_PTR_AT(in->internal, in->internal->unknown_end, char); const char* internal_unknown_end = UPB_PTR_AT(in, in->unknown_end, char);
#ifndef NDEBUG #ifndef NDEBUG
size_t full_unknown_size; size_t full_unknown_size;
const char* full_unknown = upb_Message_GetUnknown(msg, &full_unknown_size); const char* full_unknown = upb_Message_GetUnknown(msg, &full_unknown_size);
@ -5989,10 +5993,11 @@ void upb_Message_DeleteUnknown(upb_Message* msg, const char* data, size_t len) {
UPB_ASSERT((uintptr_t)(data + len) > (uintptr_t)data); UPB_ASSERT((uintptr_t)(data + len) > (uintptr_t)data);
UPB_ASSERT((uintptr_t)(data + len) <= (uintptr_t)internal_unknown_end); UPB_ASSERT((uintptr_t)(data + len) <= (uintptr_t)internal_unknown_end);
#endif #endif
if ((data + len) != internal_unknown_end) { if ((data + len) != internal_unknown_end) {
memmove((char*)data, data + len, internal_unknown_end - data - len); memmove((char*)data, data + len, internal_unknown_end - data - len);
} }
in->internal->unknown_end -= len; in->unknown_end -= len;
} }
size_t upb_Message_ExtensionCount(const upb_Message* msg) { size_t upb_Message_ExtensionCount(const upb_Message* msg) {
@ -15021,11 +15026,10 @@ const struct upb_Extension* _upb_Message_Getext(
const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)( const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
const struct upb_Message* msg, size_t* count) { const struct upb_Message* msg, size_t* count) {
const upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
if (in->internal) { if (in) {
*count = (in->internal->size - in->internal->ext_begin) / *count = (in->size - in->ext_begin) / sizeof(struct upb_Extension);
sizeof(struct upb_Extension); return UPB_PTR_AT(in, in->ext_begin, void);
return UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
} else { } else {
*count = 0; *count = 0;
return NULL; return NULL;
@ -15033,17 +15037,15 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
} }
struct upb_Extension* _upb_Message_GetOrCreateExtension( struct upb_Extension* _upb_Message_GetOrCreateExtension(
struct upb_Message* msg, const upb_MiniTableExtension* e, struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) {
upb_Arena* arena) {
struct upb_Extension* ext = struct upb_Extension* ext =
(struct upb_Extension*)_upb_Message_Getext(msg, e); (struct upb_Extension*)_upb_Message_Getext(msg, e);
if (ext) return ext; if (ext) return ext;
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(struct upb_Extension), a))
arena))
return NULL; return NULL;
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
in->internal->ext_begin -= sizeof(struct upb_Extension); in->ext_begin -= sizeof(struct upb_Extension);
ext = UPB_PTR_AT(in->internal, in->internal->ext_begin, void); ext = UPB_PTR_AT(in, in->ext_begin, void);
memset(ext, 0, sizeof(struct upb_Extension)); memset(ext, 0, sizeof(struct upb_Extension));
ext->ext = e; ext->ext = e;
return ext; return ext;
@ -15060,38 +15062,41 @@ const float kUpb_FltInfinity = INFINITY;
const double kUpb_Infinity = INFINITY; const double kUpb_Infinity = INFINITY;
const double kUpb_NaN = NAN; const double kUpb_NaN = NAN;
static const size_t realloc_overhead = sizeof(upb_Message_InternalData);
bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
upb_Arena* arena) { upb_Arena* a) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); const size_t overhead = sizeof(upb_Message_InternalData);
if (!in->internal) {
upb_Message_Internal* owner = upb_Message_Getinternal(msg);
upb_Message_InternalData* in = owner->internal;
if (!in) {
// No internal data, allocate from scratch. // No internal data, allocate from scratch.
size_t size = UPB_MAX(128, upb_Log2CeilingSize(need + realloc_overhead)); size_t size = UPB_MAX(128, upb_Log2CeilingSize(need + overhead));
upb_Message_InternalData* internal = upb_Arena_Malloc(arena, size); in = upb_Arena_Malloc(a, size);
if (!internal) return false; if (!in) return false;
internal->size = size;
internal->unknown_end = realloc_overhead; in->size = size;
internal->ext_begin = size; in->unknown_end = overhead;
in->internal = internal; in->ext_begin = size;
} else if (in->internal->ext_begin - in->internal->unknown_end < need) { owner->internal = in;
} else if (in->ext_begin - in->unknown_end < need) {
// Internal data is too small, reallocate. // Internal data is too small, reallocate.
size_t new_size = upb_Log2CeilingSize(in->internal->size + need); size_t new_size = upb_Log2CeilingSize(in->size + need);
size_t ext_bytes = in->internal->size - in->internal->ext_begin; size_t ext_bytes = in->size - in->ext_begin;
size_t new_ext_begin = new_size - ext_bytes; size_t new_ext_begin = new_size - ext_bytes;
upb_Message_InternalData* internal = in = upb_Arena_Realloc(a, in, in->size, new_size);
upb_Arena_Realloc(arena, in->internal, in->internal->size, new_size); if (!in) return false;
if (!internal) return false;
if (ext_bytes) { if (ext_bytes) {
// Need to move extension data to the end. // Need to move extension data to the end.
char* ptr = (char*)internal; char* ptr = (char*)in;
memmove(ptr + new_ext_begin, ptr + internal->ext_begin, ext_bytes); memmove(ptr + new_ext_begin, ptr + in->ext_begin, ext_bytes);
} }
internal->ext_begin = new_ext_begin; in->ext_begin = new_ext_begin;
internal->size = new_size; in->size = new_size;
in->internal = internal; owner->internal = in;
} }
UPB_ASSERT(in->internal->ext_begin - in->internal->unknown_end >= need);
UPB_ASSERT(in->ext_begin - in->unknown_end >= need);
return true; return true;
} }

13
ruby/ext/google/protobuf_c/ruby-upb.h
Unescape View File

@ -2325,6 +2325,11 @@ UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(
return (upb_Message_Internal*)((char*)msg - size); return (upb_Message_Internal*)((char*)msg - size);
} }
UPB_INLINE upb_Message_InternalData* upb_Message_GetInternalData(
const struct upb_Message* msg) {
return upb_Message_Getinternal(msg)->internal;
}
// Discards the unknown fields for this message only. // Discards the unknown fields for this message only.
void _upb_Message_DiscardUnknown_shallow(struct upb_Message* msg); void _upb_Message_DiscardUnknown_shallow(struct upb_Message* msg);
@ -2726,15 +2731,15 @@ UPB_INLINE bool _upb_Message_SetExtensionField(
UPB_INLINE void _upb_Message_ClearExtensionField( UPB_INLINE void _upb_Message_ClearExtensionField(
struct upb_Message* msg, const upb_MiniTableExtension* ext_l) { struct upb_Message* msg, const upb_MiniTableExtension* ext_l) {
upb_Message_Internal* in = upb_Message_Getinternal(msg); upb_Message_InternalData* in = upb_Message_GetInternalData(msg);
if (!in->internal) return; if (!in) return;
const struct upb_Extension* base = const struct upb_Extension* base =
UPB_PTR_AT(in->internal, in->internal->ext_begin, struct upb_Extension); UPB_PTR_AT(in, in->ext_begin, struct upb_Extension);
struct upb_Extension* ext = struct upb_Extension* ext =
(struct upb_Extension*)_upb_Message_Getext(msg, ext_l); (struct upb_Extension*)_upb_Message_Getext(msg, ext_l);
if (ext) { if (ext) {
*ext = *base; *ext = *base;
in->internal->ext_begin += sizeof(struct upb_Extension); in->ext_begin += sizeof(struct upb_Extension);
} }
} }

Write Preview
Loading…
Cancel
Save