|
|
|
|
@ -641,12 +641,14 @@ static int (*const compar[kUpb_FieldType_SizeOf])(const void*, const void*) = { |
|
|
|
|
[kUpb_FieldType_Bytes] = _upb_mapsorter_cmpstr, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static bool _upb_mapsorter_resize(_upb_mapsorter* s, _upb_sortedmap* sorted, |
|
|
|
|
int size) { |
|
|
|
|
bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type, |
|
|
|
|
const upb_Map* map, _upb_sortedmap* sorted) { |
|
|
|
|
int map_size = _upb_Map_Size(map); |
|
|
|
|
sorted->start = s->size; |
|
|
|
|
sorted->pos = sorted->start; |
|
|
|
|
sorted->end = sorted->start + size; |
|
|
|
|
sorted->end = sorted->start + map_size; |
|
|
|
|
|
|
|
|
|
// Grow s->entries if necessary.
|
|
|
|
|
if (sorted->end > s->cap) { |
|
|
|
|
s->cap = upb_Log2CeilingSize(sorted->end); |
|
|
|
|
s->entries = realloc(s->entries, s->cap * sizeof(*s->entries)); |
|
|
|
|
@ -654,17 +656,9 @@ static bool _upb_mapsorter_resize(_upb_mapsorter* s, _upb_sortedmap* sorted, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
s->size = sorted->end; |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type, |
|
|
|
|
const upb_Map* map, _upb_sortedmap* sorted) { |
|
|
|
|
int map_size = _upb_Map_Size(map); |
|
|
|
|
|
|
|
|
|
if (!_upb_mapsorter_resize(s, sorted, map_size)) return false; |
|
|
|
|
|
|
|
|
|
// Copy non-empty entries from the table to s->entries.
|
|
|
|
|
const void** dst = &s->entries[sorted->start]; |
|
|
|
|
upb_tabent const** dst = &s->entries[sorted->start]; |
|
|
|
|
const upb_tabent* src = map->table.t.entries; |
|
|
|
|
const upb_tabent* end = src + upb_table_size(&map->table.t); |
|
|
|
|
for (; src < end; src++) { |
|
|
|
|
@ -680,29 +674,6 @@ bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type, |
|
|
|
|
compar[key_type]); |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int _upb_mapsorter_cmpext(const void* _a, const void* _b) { |
|
|
|
|
const upb_Message_Extension* const* a = _a; |
|
|
|
|
const upb_Message_Extension* const* b = _b; |
|
|
|
|
uint32_t a_num = (*a)->ext->field.number; |
|
|
|
|
uint32_t b_num = (*b)->ext->field.number; |
|
|
|
|
assert(a_num != b_num); |
|
|
|
|
return a_num < b_num ? -1 : 1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool _upb_mapsorter_pushexts(_upb_mapsorter* s, |
|
|
|
|
const upb_Message_Extension* exts, size_t count, |
|
|
|
|
_upb_sortedmap* sorted) { |
|
|
|
|
if (!_upb_mapsorter_resize(s, sorted, count)) return false; |
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < count; i++) { |
|
|
|
|
s->entries[sorted->start + i] = &exts[i]; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
qsort(&s->entries[sorted->start], count, sizeof(*s->entries), |
|
|
|
|
_upb_mapsorter_cmpext); |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
/* This file was generated by upbc (the upb compiler) from the input
|
|
|
|
|
* file: |
|
|
|
|
* |
|
|
|
|
@ -2254,7 +2225,7 @@ char* upb_strdup2(const char* s, size_t len, upb_Arena* a) { |
|
|
|
|
n = len + 1; |
|
|
|
|
p = upb_Arena_Malloc(a, n); |
|
|
|
|
if (p) { |
|
|
|
|
if (len != 0) memcpy(p, s, len); |
|
|
|
|
memcpy(p, s, len); |
|
|
|
|
p[len] = 0; |
|
|
|
|
} |
|
|
|
|
return p; |
|
|
|
|
@ -7590,27 +7561,9 @@ void _upb_DefBuilder_OomErr(upb_DefBuilder* ctx) { |
|
|
|
|
_upb_DefBuilder_FailJmp(ctx); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Verify a relative identifier string. The loop is branchless for speed.
|
|
|
|
|
static void _upb_DefBuilder_CheckIdentNotFull(upb_DefBuilder* ctx, |
|
|
|
|
upb_StringView name) { |
|
|
|
|
bool good = name.size > 0; |
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < name.size; i++) { |
|
|
|
|
const char c = name.data[i]; |
|
|
|
|
const char d = c | 0x20; // force lowercase
|
|
|
|
|
const bool is_alpha = (('a' <= d) & (d <= 'z')) | (c == '_'); |
|
|
|
|
const bool is_numer = ('0' <= c) & (c <= '9') & (i != 0); |
|
|
|
|
|
|
|
|
|
good &= is_alpha | is_numer; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!good) _upb_DefBuilder_CheckIdentSlow(ctx, name, false); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const char* _upb_DefBuilder_MakeFullName(upb_DefBuilder* ctx, |
|
|
|
|
const char* prefix, |
|
|
|
|
upb_StringView name) { |
|
|
|
|
_upb_DefBuilder_CheckIdentNotFull(ctx, name); |
|
|
|
|
if (prefix) { |
|
|
|
|
// ret = prefix + '.' + name;
|
|
|
|
|
size_t n = strlen(prefix); |
|
|
|
|
@ -7726,7 +7679,7 @@ static bool TryGetChar(const char** src, const char* end, char* ch) { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int TryGetHexDigit(const char** src, const char* end) { |
|
|
|
|
static char TryGetHexDigit(const char** src, const char* end) { |
|
|
|
|
char ch; |
|
|
|
|
if (!TryGetChar(src, end, &ch)) return -1; |
|
|
|
|
if ('0' <= ch && ch <= '9') { |
|
|
|
|
@ -7743,10 +7696,10 @@ static int TryGetHexDigit(const char** src, const char* end) { |
|
|
|
|
static char upb_DefBuilder_ParseHexEscape(upb_DefBuilder* ctx, |
|
|
|
|
const upb_FieldDef* f, |
|
|
|
|
const char** src, const char* end) { |
|
|
|
|
int hex_digit = TryGetHexDigit(src, end); |
|
|
|
|
char hex_digit = TryGetHexDigit(src, end); |
|
|
|
|
if (hex_digit < 0) { |
|
|
|
|
_upb_DefBuilder_Errf( |
|
|
|
|
ctx, "\\x must be followed by at least one hex digit (field='%s')", |
|
|
|
|
ctx, "\\x cannot be followed by non-hex digit in field '%s' default", |
|
|
|
|
upb_FieldDef_FullName(f)); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
@ -7922,7 +7875,7 @@ err: |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool _upb_DefPool_InsertExt(upb_DefPool* s, const upb_MiniTableExtension* ext, |
|
|
|
|
const upb_FieldDef* f) { |
|
|
|
|
upb_FieldDef* f) { |
|
|
|
|
return upb_inttable_insert(&s->exts, (uintptr_t)ext, upb_value_constptr(f), |
|
|
|
|
s->arena); |
|
|
|
|
} |
|
|
|
|
@ -8154,6 +8107,12 @@ static const upb_FileDef* _upb_DefPool_AddFile( |
|
|
|
|
const upb_MiniTableFile* layout, upb_Status* status) { |
|
|
|
|
const upb_StringView name = UPB_DESC(FileDescriptorProto_name)(file_proto); |
|
|
|
|
|
|
|
|
|
if (name.size == 0) { |
|
|
|
|
upb_Status_SetErrorFormat(status, |
|
|
|
|
"missing name in google_protobuf_FileDescriptorProto"); |
|
|
|
|
return NULL; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Determine whether we already know about this file.
|
|
|
|
|
{ |
|
|
|
|
upb_value v; |
|
|
|
|
@ -8545,6 +8504,7 @@ static void create_enumdef(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
e->file = _upb_DefBuilder_File(ctx); |
|
|
|
|
|
|
|
|
|
name = UPB_DESC(EnumDescriptorProto_name)(enum_proto); |
|
|
|
|
_upb_DefBuilder_CheckIdentNotFull(ctx, name); |
|
|
|
|
|
|
|
|
|
e->full_name = _upb_DefBuilder_MakeFullName(ctx, prefix, name); |
|
|
|
|
_upb_DefBuilder_Add(ctx, e->full_name, |
|
|
|
|
@ -9354,14 +9314,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const upb_StringView name = UPB_DESC(FieldDescriptorProto_name)(field_proto); |
|
|
|
|
|
|
|
|
|
f->full_name = _upb_DefBuilder_MakeFullName(ctx, prefix, name); |
|
|
|
|
f->label_ = (int)UPB_DESC(FieldDescriptorProto_label)(field_proto); |
|
|
|
|
f->number_ = UPB_DESC(FieldDescriptorProto_number)(field_proto); |
|
|
|
|
f->is_proto3_optional = |
|
|
|
|
UPB_DESC(FieldDescriptorProto_proto3_optional)(field_proto); |
|
|
|
|
f->msgdef = m; |
|
|
|
|
f->scope.oneof = NULL; |
|
|
|
|
_upb_DefBuilder_CheckIdentNotFull(ctx, name); |
|
|
|
|
|
|
|
|
|
f->has_json_name = UPB_DESC(FieldDescriptorProto_has_json_name)(field_proto); |
|
|
|
|
if (f->has_json_name) { |
|
|
|
|
@ -9373,6 +9326,14 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
} |
|
|
|
|
if (!f->json_name) _upb_DefBuilder_OomErr(ctx); |
|
|
|
|
|
|
|
|
|
f->full_name = _upb_DefBuilder_MakeFullName(ctx, prefix, name); |
|
|
|
|
f->label_ = (int)UPB_DESC(FieldDescriptorProto_label)(field_proto); |
|
|
|
|
f->number_ = UPB_DESC(FieldDescriptorProto_number)(field_proto); |
|
|
|
|
f->is_proto3_optional = |
|
|
|
|
UPB_DESC(FieldDescriptorProto_proto3_optional)(field_proto); |
|
|
|
|
f->msgdef = m; |
|
|
|
|
f->scope.oneof = NULL; |
|
|
|
|
|
|
|
|
|
const bool has_type = UPB_DESC(FieldDescriptorProto_has_type)(field_proto); |
|
|
|
|
const bool has_type_name = |
|
|
|
|
UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto); |
|
|
|
|
@ -9502,24 +9463,19 @@ static void _upb_FieldDef_CreateNotExt(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
_upb_MessageDef_InsertField(ctx, m, f); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
upb_FieldDef* _upb_Extensions_New( |
|
|
|
|
upb_DefBuilder* ctx, int n, |
|
|
|
|
const UPB_DESC(FieldDescriptorProto) * const* protos, const char* prefix, |
|
|
|
|
upb_MessageDef* m) { |
|
|
|
|
_upb_DefType_CheckPadding(sizeof(upb_FieldDef)); |
|
|
|
|
upb_FieldDef* defs = |
|
|
|
|
(upb_FieldDef*)_upb_DefBuilder_Alloc(ctx, sizeof(upb_FieldDef) * n); |
|
|
|
|
if (!ctx->layout) return; |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < n; i++) { |
|
|
|
|
upb_FieldDef* f = &defs[i]; |
|
|
|
|
|
|
|
|
|
_upb_FieldDef_CreateExt(ctx, prefix, protos[i], m, f); |
|
|
|
|
f->index_ = i; |
|
|
|
|
const upb_MiniTable* mt = upb_MessageDef_MiniTable(m); |
|
|
|
|
const upb_MiniTableField* fields = mt->fields; |
|
|
|
|
for (int i = 0; i < mt->field_count; i++) { |
|
|
|
|
if (fields[i].number == f->number_) { |
|
|
|
|
f->layout_index = i; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return defs; |
|
|
|
|
UPB_ASSERT(false); // It should be impossible to reach this point.
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
upb_FieldDef* _upb_FieldDefs_New( |
|
|
|
|
@ -9530,23 +9486,28 @@ upb_FieldDef* _upb_FieldDefs_New( |
|
|
|
|
upb_FieldDef* defs = |
|
|
|
|
(upb_FieldDef*)_upb_DefBuilder_Alloc(ctx, sizeof(upb_FieldDef) * n); |
|
|
|
|
|
|
|
|
|
uint32_t previous = 0; |
|
|
|
|
for (int i = 0; i < n; i++) { |
|
|
|
|
upb_FieldDef* f = &defs[i]; |
|
|
|
|
|
|
|
|
|
_upb_FieldDef_CreateNotExt(ctx, prefix, protos[i], m, f); |
|
|
|
|
f->index_ = i; |
|
|
|
|
if (!ctx->layout) { |
|
|
|
|
// Speculate that the def fields are sorted. We will always sort the
|
|
|
|
|
// MiniTable fields, so if defs are sorted then indices will match.
|
|
|
|
|
//
|
|
|
|
|
// If this is incorrect, we will overwrite later.
|
|
|
|
|
f->layout_index = i; |
|
|
|
|
// If we are creating extensions then is_sorted will be NULL.
|
|
|
|
|
// If we are not creating extensions then is_sorted will be non-NULL.
|
|
|
|
|
if (is_sorted) { |
|
|
|
|
uint32_t previous = 0; |
|
|
|
|
for (int i = 0; i < n; i++) { |
|
|
|
|
upb_FieldDef* f = &defs[i]; |
|
|
|
|
|
|
|
|
|
_upb_FieldDef_CreateNotExt(ctx, prefix, protos[i], m, f); |
|
|
|
|
f->index_ = i; |
|
|
|
|
if (!ctx->layout) f->layout_index = i; |
|
|
|
|
|
|
|
|
|
const uint32_t current = f->number_; |
|
|
|
|
if (previous > current) *is_sorted = false; |
|
|
|
|
previous = current; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
for (int i = 0; i < n; i++) { |
|
|
|
|
upb_FieldDef* f = &defs[i]; |
|
|
|
|
|
|
|
|
|
const uint32_t current = f->number_; |
|
|
|
|
if (previous > current) *is_sorted = false; |
|
|
|
|
previous = current; |
|
|
|
|
_upb_FieldDef_CreateExt(ctx, prefix, protos[i], m, f); |
|
|
|
|
f->index_ = i; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return defs; |
|
|
|
|
@ -9602,9 +9563,6 @@ static int _upb_FieldDef_Compare(const void* p1, const void* p2) { |
|
|
|
|
return (v1 < v2) ? -1 : (v1 > v2); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// _upb_FieldDefs_Sorted() is mostly a pure function of its inputs, but has one
|
|
|
|
|
// critical side effect that we depend on: it sets layout_index appropriately
|
|
|
|
|
// for non-sorted lists of fields.
|
|
|
|
|
const upb_FieldDef** _upb_FieldDefs_Sorted(const upb_FieldDef* f, int n, |
|
|
|
|
upb_Arena* a) { |
|
|
|
|
// TODO(salo): Replace this arena alloc with a persistent scratch buffer.
|
|
|
|
|
@ -9662,10 +9620,7 @@ static void resolve_extension(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
"field number %u in extension %s has no extension range in message %s", |
|
|
|
|
(unsigned)f->number_, f->full_name, upb_MessageDef_FullName(m)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx, |
|
|
|
|
const upb_FieldDef* f) { |
|
|
|
|
const upb_MiniTableExtension* ext = _upb_FieldDef_ExtensionMiniTable(f); |
|
|
|
|
|
|
|
|
|
if (ctx->layout) { |
|
|
|
|
@ -9684,8 +9639,8 @@ void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx, |
|
|
|
|
sub.subenum = _upb_EnumDef_MiniTable(f->sub.enumdef); |
|
|
|
|
} |
|
|
|
|
bool ok2 = upb_MiniTableExtension_Build(desc.data, desc.size, mut_ext, |
|
|
|
|
upb_MessageDef_MiniTable(f->msgdef), |
|
|
|
|
sub, ctx->status); |
|
|
|
|
upb_MessageDef_MiniTable(m), sub, |
|
|
|
|
ctx->status); |
|
|
|
|
if (!ok2) _upb_DefBuilder_Errf(ctx, "Could not build extension mini table"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -9742,7 +9697,6 @@ struct upb_FileDef { |
|
|
|
|
const UPB_DESC(FileOptions) * opts; |
|
|
|
|
const char* name; |
|
|
|
|
const char* package; |
|
|
|
|
const char* edition; |
|
|
|
|
|
|
|
|
|
const upb_FileDef** deps; |
|
|
|
|
const int32_t* public_deps; |
|
|
|
|
@ -9779,10 +9733,6 @@ const char* upb_FileDef_Package(const upb_FileDef* f) { |
|
|
|
|
return f->package ? f->package : ""; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const char* upb_FileDef_Edition(const upb_FileDef* f) { |
|
|
|
|
return f->edition ? f->edition : ""; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const char* _upb_FileDef_RawPackage(const upb_FileDef* f) { return f->package; } |
|
|
|
|
|
|
|
|
|
upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f) { return f->syntax; } |
|
|
|
|
@ -9930,14 +9880,13 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
upb_StringView name = UPB_DESC(FileDescriptorProto_name)(file_proto); |
|
|
|
|
file->name = strviewdup(ctx, name); |
|
|
|
|
if (strlen(file->name) != name.size) { |
|
|
|
|
_upb_DefBuilder_Errf(ctx, "File name contained embedded NULL"); |
|
|
|
|
if (!UPB_DESC(FileDescriptorProto_has_name)(file_proto)) { |
|
|
|
|
_upb_DefBuilder_Errf(ctx, "File has no name"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
upb_StringView package = UPB_DESC(FileDescriptorProto_package)(file_proto); |
|
|
|
|
file->name = strviewdup(ctx, UPB_DESC(FileDescriptorProto_name)(file_proto)); |
|
|
|
|
|
|
|
|
|
upb_StringView package = UPB_DESC(FileDescriptorProto_package)(file_proto); |
|
|
|
|
if (package.size) { |
|
|
|
|
_upb_DefBuilder_CheckIdentFull(ctx, package); |
|
|
|
|
file->package = strviewdup(ctx, package); |
|
|
|
|
@ -9945,18 +9894,6 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx, |
|
|
|
|
file->package = NULL; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
upb_StringView edition = UPB_DESC(FileDescriptorProto_edition)(file_proto); |
|
|
|
|
|
|
|
|
|
if (edition.size == 0) { |
|
|
|
|
file->edition = NULL; |
|
|
|
|
} else { |
|
|
|
|
// TODO(b/267770604): How should we validate this?
|
|
|
|
|
file->edition = strviewdup(ctx, edition); |
|
|
|
|
if (strlen(file->edition) != edition.size) { |
|
|
|
|
_upb_DefBuilder_Errf(ctx, "Edition name contained embedded NULL"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (UPB_DESC(FileDescriptorProto_has_syntax)(file_proto)) { |
|
|
|
|
upb_StringView syntax = UPB_DESC(FileDescriptorProto_syntax)(file_proto); |
|
|
|
|
|
|
|
|
|
@ -10025,7 +9962,8 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx, |
|
|
|
|
// Create extensions.
|
|
|
|
|
exts = UPB_DESC(FileDescriptorProto_extension)(file_proto, &n); |
|
|
|
|
file->top_lvl_ext_count = n; |
|
|
|
|
file->top_lvl_exts = _upb_Extensions_New(ctx, n, exts, file->package, NULL); |
|
|
|
|
file->top_lvl_exts = |
|
|
|
|
_upb_FieldDefs_New(ctx, n, exts, file->package, NULL, NULL); |
|
|
|
|
|
|
|
|
|
// Create messages.
|
|
|
|
|
msgs = UPB_DESC(FileDescriptorProto_message_type)(file_proto, &n); |
|
|
|
|
@ -10049,19 +9987,11 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx, |
|
|
|
|
_upb_FieldDef_Resolve(ctx, file->package, f); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < file->top_lvl_msg_count; i++) { |
|
|
|
|
upb_MessageDef* m = (upb_MessageDef*)upb_FileDef_TopLevelMessage(file, i); |
|
|
|
|
_upb_MessageDef_CreateMiniTable(ctx, (upb_MessageDef*)m); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < file->top_lvl_ext_count; i++) { |
|
|
|
|
upb_FieldDef* f = (upb_FieldDef*)upb_FileDef_TopLevelExtension(file, i); |
|
|
|
|
_upb_FieldDef_BuildMiniTableExtension(ctx, f); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < file->top_lvl_msg_count; i++) { |
|
|
|
|
upb_MessageDef* m = (upb_MessageDef*)upb_FileDef_TopLevelMessage(file, i); |
|
|
|
|
_upb_MessageDef_LinkMiniTable(ctx, m); |
|
|
|
|
if (!ctx->layout) { |
|
|
|
|
for (int i = 0; i < file->top_lvl_msg_count; i++) { |
|
|
|
|
upb_MessageDef* m = (upb_MessageDef*)upb_FileDef_TopLevelMessage(file, i); |
|
|
|
|
_upb_MessageDef_LinkMiniTable(ctx, m); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (file->ext_count) { |
|
|
|
|
@ -10574,8 +10504,6 @@ bool upb_MessageDef_IsMessageSet(const upb_MessageDef* m) { |
|
|
|
|
static upb_MiniTable* _upb_MessageDef_MakeMiniTable(upb_DefBuilder* ctx, |
|
|
|
|
const upb_MessageDef* m) { |
|
|
|
|
upb_StringView desc; |
|
|
|
|
// Note: this will assign layout_index for fields, so upb_FieldDef_MiniTable()
|
|
|
|
|
// is safe to call only after this call.
|
|
|
|
|
bool ok = upb_MessageDef_MiniDescriptorEncode(m, ctx->tmp_arena, &desc); |
|
|
|
|
if (!ok) _upb_DefBuilder_OomErr(ctx); |
|
|
|
|
|
|
|
|
|
@ -10595,6 +10523,23 @@ void _upb_MessageDef_Resolve(upb_DefBuilder* ctx, upb_MessageDef* m) { |
|
|
|
|
_upb_FieldDef_Resolve(ctx, m->full_name, f); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!ctx->layout) { |
|
|
|
|
m->layout = _upb_MessageDef_MakeMiniTable(ctx, m); |
|
|
|
|
if (!m->layout) _upb_DefBuilder_OomErr(ctx); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#ifndef NDEBUG |
|
|
|
|
for (int i = 0; i < m->field_count; i++) { |
|
|
|
|
const upb_FieldDef* f = upb_MessageDef_Field(m, i); |
|
|
|
|
const int layout_index = _upb_FieldDef_LayoutIndex(f); |
|
|
|
|
UPB_ASSERT(layout_index < m->layout->field_count); |
|
|
|
|
const upb_MiniTableField* mt_f = &m->layout->fields[layout_index]; |
|
|
|
|
UPB_ASSERT(upb_FieldDef_Type(f) == upb_MiniTableField_Type(mt_f)); |
|
|
|
|
UPB_ASSERT(upb_FieldDef_HasPresence(f) == |
|
|
|
|
upb_MiniTableField_HasPresence(mt_f)); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
m->in_message_set = false; |
|
|
|
|
for (int i = 0; i < upb_MessageDef_NestedExtensionCount(m); i++) { |
|
|
|
|
upb_FieldDef* ext = (upb_FieldDef*)upb_MessageDef_NestedExtension(m, i); |
|
|
|
|
@ -10657,39 +10602,8 @@ void _upb_MessageDef_InsertField(upb_DefBuilder* ctx, upb_MessageDef* m, |
|
|
|
|
if (!ok) _upb_DefBuilder_OomErr(ctx); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void _upb_MessageDef_CreateMiniTable(upb_DefBuilder* ctx, upb_MessageDef* m) { |
|
|
|
|
if (ctx->layout == NULL) { |
|
|
|
|
m->layout = _upb_MessageDef_MakeMiniTable(ctx, m); |
|
|
|
|
} else { |
|
|
|
|
UPB_ASSERT(ctx->msg_count < ctx->layout->msg_count); |
|
|
|
|
m->layout = ctx->layout->msgs[ctx->msg_count++]; |
|
|
|
|
UPB_ASSERT(m->field_count == m->layout->field_count); |
|
|
|
|
|
|
|
|
|
// We don't need the result of this call, but it will assign layout_index
|
|
|
|
|
// for all the fields in O(n lg n) time.
|
|
|
|
|
_upb_FieldDefs_Sorted(m->fields, m->field_count, ctx->tmp_arena); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < m->nested_msg_count; i++) { |
|
|
|
|
upb_MessageDef* nested = |
|
|
|
|
(upb_MessageDef*)upb_MessageDef_NestedMessage(m, i); |
|
|
|
|
_upb_MessageDef_CreateMiniTable(ctx, nested); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void _upb_MessageDef_LinkMiniTable(upb_DefBuilder* ctx, |
|
|
|
|
const upb_MessageDef* m) { |
|
|
|
|
for (int i = 0; i < upb_MessageDef_NestedExtensionCount(m); i++) { |
|
|
|
|
const upb_FieldDef* ext = upb_MessageDef_NestedExtension(m, i); |
|
|
|
|
_upb_FieldDef_BuildMiniTableExtension(ctx, ext); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < m->nested_msg_count; i++) { |
|
|
|
|
_upb_MessageDef_LinkMiniTable(ctx, upb_MessageDef_NestedMessage(m, i)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (ctx->layout) return; |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < m->field_count; i++) { |
|
|
|
|
const upb_FieldDef* f = upb_MessageDef_Field(m, i); |
|
|
|
|
const upb_MessageDef* sub_m = upb_FieldDef_MessageSubDef(f); |
|
|
|
|
@ -10717,17 +10631,9 @@ void _upb_MessageDef_LinkMiniTable(upb_DefBuilder* ctx, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#ifndef NDEBUG |
|
|
|
|
for (int i = 0; i < m->field_count; i++) { |
|
|
|
|
const upb_FieldDef* f = upb_MessageDef_Field(m, i); |
|
|
|
|
const int layout_index = _upb_FieldDef_LayoutIndex(f); |
|
|
|
|
UPB_ASSERT(layout_index < m->layout->field_count); |
|
|
|
|
const upb_MiniTableField* mt_f = &m->layout->fields[layout_index]; |
|
|
|
|
UPB_ASSERT(upb_FieldDef_Type(f) == upb_MiniTableField_Type(mt_f)); |
|
|
|
|
UPB_ASSERT(upb_FieldDef_HasPresence(f) == |
|
|
|
|
upb_MiniTableField_HasPresence(mt_f)); |
|
|
|
|
for (int i = 0; i < m->nested_msg_count; i++) { |
|
|
|
|
_upb_MessageDef_LinkMiniTable(ctx, upb_MessageDef_NestedMessage(m, i)); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static uint64_t _upb_MessageDef_Modifiers(const upb_MessageDef* m) { |
|
|
|
|
@ -10860,6 +10766,7 @@ static void create_msgdef(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
m->is_sorted = true; |
|
|
|
|
|
|
|
|
|
name = UPB_DESC(DescriptorProto_name)(msg_proto); |
|
|
|
|
_upb_DefBuilder_CheckIdentNotFull(ctx, name); |
|
|
|
|
|
|
|
|
|
m->full_name = _upb_DefBuilder_MakeFullName(ctx, prefix, name); |
|
|
|
|
_upb_DefBuilder_Add(ctx, m->full_name, _upb_DefType_Pack(m, UPB_DEFTYPE_MSG)); |
|
|
|
|
@ -10878,6 +10785,17 @@ static void create_msgdef(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
ok = upb_strtable_init(&m->ntof, n_oneof + n_field, ctx->arena); |
|
|
|
|
if (!ok) _upb_DefBuilder_OomErr(ctx); |
|
|
|
|
|
|
|
|
|
if (ctx->layout) { |
|
|
|
|
/* create_fielddef() below depends on this being set. */ |
|
|
|
|
UPB_ASSERT(ctx->msg_count < ctx->layout->msg_count); |
|
|
|
|
m->layout = ctx->layout->msgs[ctx->msg_count++]; |
|
|
|
|
UPB_ASSERT(n_field == m->layout->field_count); |
|
|
|
|
} else { |
|
|
|
|
/* Allocate now (to allow cross-linking), populate later. */ |
|
|
|
|
m->layout = _upb_DefBuilder_Alloc( |
|
|
|
|
ctx, sizeof(*m->layout) + sizeof(_upb_FastTable_Entry)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
UPB_DEF_SET_OPTIONS(m->opts, DescriptorProto, MessageOptions, msg_proto); |
|
|
|
|
|
|
|
|
|
m->oneof_count = n_oneof; |
|
|
|
|
@ -10918,7 +10836,7 @@ static void create_msgdef(upb_DefBuilder* ctx, const char* prefix, |
|
|
|
|
const UPB_DESC(FieldDescriptorProto)* const* exts = |
|
|
|
|
UPB_DESC(DescriptorProto_extension)(msg_proto, &n_ext); |
|
|
|
|
m->nested_ext_count = n_ext; |
|
|
|
|
m->nested_exts = _upb_Extensions_New(ctx, n_ext, exts, m->full_name, m); |
|
|
|
|
m->nested_exts = _upb_FieldDefs_New(ctx, n_ext, exts, m->full_name, m, NULL); |
|
|
|
|
|
|
|
|
|
const UPB_DESC(DescriptorProto)* const* msgs = |
|
|
|
|
UPB_DESC(DescriptorProto_nested_type)(msg_proto, &n_msg); |
|
|
|
|
@ -11325,6 +11243,7 @@ static void create_service(upb_DefBuilder* ctx, |
|
|
|
|
s->file = _upb_DefBuilder_File(ctx); |
|
|
|
|
|
|
|
|
|
name = UPB_DESC(ServiceDescriptorProto_name)(svc_proto); |
|
|
|
|
_upb_DefBuilder_CheckIdentNotFull(ctx, name); |
|
|
|
|
const char* package = _upb_FileDef_RawPackage(s->file); |
|
|
|
|
s->full_name = _upb_DefBuilder_MakeFullName(ctx, package, name); |
|
|
|
|
_upb_DefBuilder_Add(ctx, s->full_name, |
|
|
|
|
@ -14092,15 +14011,6 @@ static void encode_msgset_item(upb_encstate* e, |
|
|
|
|
encode_tag(e, kUpb_MsgSet_Item, kUpb_WireType_StartGroup); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void encode_ext(upb_encstate* e, const upb_Message_Extension* ext, |
|
|
|
|
bool is_message_set) { |
|
|
|
|
if (UPB_UNLIKELY(is_message_set)) { |
|
|
|
|
encode_msgset_item(e, ext); |
|
|
|
|
} else { |
|
|
|
|
encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void encode_message(upb_encstate* e, const upb_Message* msg, |
|
|
|
|
const upb_MiniTable* m, size_t* size) { |
|
|
|
|
size_t pre_len = e->limit - e->ptr; |
|
|
|
|
@ -14130,17 +14040,12 @@ static void encode_message(upb_encstate* e, const upb_Message* msg, |
|
|
|
|
size_t ext_count; |
|
|
|
|
const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &ext_count); |
|
|
|
|
if (ext_count) { |
|
|
|
|
if (e->options & kUpb_EncodeOption_Deterministic) { |
|
|
|
|
_upb_sortedmap sorted; |
|
|
|
|
_upb_mapsorter_pushexts(&e->sorter, ext, ext_count, &sorted); |
|
|
|
|
while (_upb_sortedmap_nextext(&e->sorter, &sorted, &ext)) { |
|
|
|
|
encode_ext(e, ext, m->ext == kUpb_ExtMode_IsMessageSet); |
|
|
|
|
} |
|
|
|
|
_upb_mapsorter_popmap(&e->sorter, &sorted); |
|
|
|
|
} else { |
|
|
|
|
const upb_Message_Extension* end = ext + ext_count; |
|
|
|
|
for (; ext != end; ext++) { |
|
|
|
|
encode_ext(e, ext, m->ext == kUpb_ExtMode_IsMessageSet); |
|
|
|
|
const upb_Message_Extension* end = ext + ext_count; |
|
|
|
|
for (; ext != end; ext++) { |
|
|
|
|
if (UPB_UNLIKELY(m->ext == kUpb_ExtMode_IsMessageSet)) { |
|
|
|
|
encode_msgset_item(e, ext); |
|
|
|
|
} else { |
|
|
|
|
encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Deanna Garcia
2 years ago