Auto-generate files after cl/998732157
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index d7dea40..fd69e0a 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c
@@ -16696,10 +16696,7 @@ const char* shortname = upb_FieldDef_Name(f); const size_t shortnamelen = strlen(shortname); - upb_value v = upb_value_constptr(f); - - upb_value existing_v; - if (upb_strtable_lookup(&m->ntof, shortname, &existing_v)) { + if (upb_strtable_lookup(&m->ntof, shortname, NULL)) { _upb_DefBuilder_Errf(ctx, "duplicate field name (%s)", shortname); } @@ -16714,13 +16711,13 @@ if (!skip_json_conflicts && strcmp(shortname, json_name) != 0 && google_protobuf_FeatureSet_json_format(m->resolved_features) == google_protobuf_FeatureSet_ALLOW && - upb_strtable_lookup(&m->ntof, json_name, &v)) { + upb_strtable_lookup(&m->ntof, json_name, NULL)) { _upb_DefBuilder_Errf( ctx, "duplicate json_name for (%s) with original field name (%s)", shortname, json_name); } - if (upb_strtable_lookup(&m->jtof, json_name, &v)) { + if (upb_strtable_lookup(&m->jtof, json_name, NULL)) { if (!skip_json_conflicts) { _upb_DefBuilder_Errf(ctx, "duplicate json_name (%s)", json_name); } @@ -16735,7 +16732,8 @@ _upb_DefBuilder_Errf(ctx, "duplicate field number (%u)", field_number); } - ok = upb_inttable_insert(&m->itof, field_number, v, ctx->arena); + ok = upb_inttable_insert(&m->itof, field_number, upb_value_constptr(f), + ctx->arena); if (!ok) _upb_DefBuilder_OomErr(ctx); }
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 7778329..c1e491f 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -15445,10 +15445,7 @@ const char* shortname = upb_FieldDef_Name(f); const size_t shortnamelen = strlen(shortname); - upb_value v = upb_value_constptr(f); - - upb_value existing_v; - if (upb_strtable_lookup(&m->ntof, shortname, &existing_v)) { + if (upb_strtable_lookup(&m->ntof, shortname, NULL)) { _upb_DefBuilder_Errf(ctx, "duplicate field name (%s)", shortname); } @@ -15463,13 +15460,13 @@ if (!skip_json_conflicts && strcmp(shortname, json_name) != 0 && google_protobuf_FeatureSet_json_format(m->resolved_features) == google_protobuf_FeatureSet_ALLOW && - upb_strtable_lookup(&m->ntof, json_name, &v)) { + upb_strtable_lookup(&m->ntof, json_name, NULL)) { _upb_DefBuilder_Errf( ctx, "duplicate json_name for (%s) with original field name (%s)", shortname, json_name); } - if (upb_strtable_lookup(&m->jtof, json_name, &v)) { + if (upb_strtable_lookup(&m->jtof, json_name, NULL)) { if (!skip_json_conflicts) { _upb_DefBuilder_Errf(ctx, "duplicate json_name (%s)", json_name); } @@ -15484,7 +15481,8 @@ _upb_DefBuilder_Errf(ctx, "duplicate field number (%u)", field_number); } - ok = upb_inttable_insert(&m->itof, field_number, v, ctx->arena); + ok = upb_inttable_insert(&m->itof, field_number, upb_value_constptr(f), + ctx->arena); if (!ok) _upb_DefBuilder_OomErr(ctx); }