grpc 1.65.2 → 1.66.0.pre3

data/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c

@@ -23,6 +23,9 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = {
   NULL,
   &grpc_lookup_v1_NameMatcher__fields[0],
   UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.NameMatcher",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x001000003f00000a, &upb_pss_1bt},
@@ -49,6 +52,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = {
   &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0],
   &grpc_lookup_v1_GrpcKeyBuilder__fields[0],
   UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.GrpcKeyBuilder",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x001000003f00000a, &upb_prm_1bt_max64b},
@@ -66,6 +72,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init = {
   NULL,
   &grpc_lookup_v1_GrpcKeyBuilder_Name__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.GrpcKeyBuilder.Name",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_pss_1bt},
@@ -84,6 +93,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init = {
   NULL,
   &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[0],
   UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_pss_1bt},
@@ -101,6 +113,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init
   NULL,
   &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[0],
   48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x001000003f00000a, &upb_pss_1bt},
@@ -127,6 +142,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = {
   &grpc_lookup_v1_HttpKeyBuilder_submsgs[0],
   &grpc_lookup_v1_HttpKeyBuilder__fields[0],
   UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.HttpKeyBuilder",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_prs_1bt},
@@ -148,6 +166,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init
   NULL,
   &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[0],
   48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.HttpKeyBuilder.ConstantKeysEntry",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x001000003f00000a, &upb_pss_1bt},
@@ -180,6 +201,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = {
   &grpc_lookup_v1_RouteLookupConfig_submsgs[0],
   &grpc_lookup_v1_RouteLookupConfig__fields[0],
   UPB_SIZE(64, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.RouteLookupConfig",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x001000003f00000a, &upb_prm_1bt_max64b},
@@ -212,6 +236,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = {
   &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0],
   &grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+#ifdef UPB_TRACING_ENABLED
+  "grpc.lookup.v1.RouteLookupClusterSpecifier",
+#endif
 };
 
 static const upb_MiniTable *messages_layout[9] = {

data/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h

@@ -83,7 +83,7 @@ UPB_INLINE upb_StringView udpa_annotations_MigrateAnnotation_rename(const udpa_a
 
 UPB_INLINE void udpa_annotations_MigrateAnnotation_set_rename(udpa_annotations_MigrateAnnotation *msg, upb_StringView value) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 /* udpa.annotations.FieldMigrateAnnotation */
@@ -149,11 +149,11 @@ UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_oneof_promotio
 
 UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_rename(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_oneof_promotion(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) {
   const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 /* udpa.annotations.FileMigrateAnnotation */
@@ -207,7 +207,7 @@ UPB_INLINE upb_StringView udpa_annotations_FileMigrateAnnotation_move_to_package
 
 UPB_INLINE void udpa_annotations_FileMigrateAnnotation_set_move_to_package(udpa_annotations_FileMigrateAnnotation *msg, upb_StringView value) {
   const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 UPB_INLINE bool udpa_annotations_has_message_migrate(const struct google_protobuf_MessageOptions* msg) {
@@ -231,9 +231,18 @@ UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_Mess
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_message_migrate(struct google_protobuf_MessageOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_message_migrate(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_message_migrate(msg, sub, arena);
+  }
+  return sub;
+}
 UPB_INLINE bool udpa_annotations_has_field_migrate(const struct google_protobuf_FieldOptions* msg) {
   return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_field_migrate_ext);
 }
@@ -255,9 +264,18 @@ UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldO
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_FieldMigrateAnnotation* udpa_annotations_mutable_field_migrate(struct google_protobuf_FieldOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_FieldMigrateAnnotation* sub = (struct udpa_annotations_FieldMigrateAnnotation*)udpa_annotations_field_migrate(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_FieldMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FieldMigrateAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_field_migrate(msg, sub, arena);
+  }
+  return sub;
+}
 UPB_INLINE bool udpa_annotations_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) {
   return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_migrate_ext);
 }
@@ -279,9 +297,18 @@ UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOpt
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_migrate(struct google_protobuf_EnumOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_migrate(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_enum_migrate(msg, sub, arena);
+  }
+  return sub;
+}
 UPB_INLINE bool udpa_annotations_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) {
   return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_value_migrate_ext);
 }
@@ -303,9 +330,18 @@ UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_E
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_value_migrate(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_enum_value_migrate(msg, sub, arena);
+  }
+  return sub;
+}
 UPB_INLINE bool udpa_annotations_has_file_migrate(const struct google_protobuf_FileOptions* msg) {
   return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_file_migrate_ext);
 }
@@ -327,9 +363,18 @@ UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOpt
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_FileMigrateAnnotation* udpa_annotations_mutable_file_migrate(struct google_protobuf_FileOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_FileMigrateAnnotation* sub = (struct udpa_annotations_FileMigrateAnnotation*)udpa_annotations_file_migrate(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_FileMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FileMigrateAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_file_migrate(msg, sub, arena);
+  }
+  return sub;
+}
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c

@@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init = {
   NULL,
   &udpa_annotations_MigrateAnnotation__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.MigrateAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_pss_1bt},
@@ -36,6 +39,9 @@ const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init = {
   NULL,
   &udpa_annotations_FieldMigrateAnnotation__fields[0],
   UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.FieldMigrateAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_pss_1bt},
@@ -52,6 +58,9 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = {
   NULL,
   &udpa_annotations_FileMigrateAnnotation__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.FileMigrateAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},

data/src/core/ext/upb-gen/udpa/annotations/security.upb.h

@@ -90,11 +90,11 @@ UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted
 
 UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) {
   const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 UPB_INLINE bool udpa_annotations_has_security(const struct google_protobuf_FieldOptions* msg) {
@@ -118,9 +118,18 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mutable_security(struct google_protobuf_FieldOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_FieldSecurityAnnotation* sub = (struct udpa_annotations_FieldSecurityAnnotation*)udpa_annotations_security(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_FieldSecurityAnnotation*)_upb_Message_New(&udpa__annotations__FieldSecurityAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_security(msg, sub, arena);
+  }
+  return sub;
+}
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c

@@ -23,6 +23,9 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = {
   NULL,
   &udpa_annotations_FieldSecurityAnnotation__fields[0],
   16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.FieldSecurityAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f000008, &upb_psb1_1bt},

data/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h

@@ -45,7 +45,7 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
 #ifdef __cplusplus

data/src/core/ext/upb-gen/udpa/annotations/status.upb.h

@@ -96,11 +96,11 @@ UPB_INLINE int32_t udpa_annotations_StatusAnnotation_package_version_status(cons
 
 UPB_INLINE void udpa_annotations_StatusAnnotation_set_work_in_progress(udpa_annotations_StatusAnnotation *msg, bool value) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 UPB_INLINE void udpa_annotations_StatusAnnotation_set_package_version_status(udpa_annotations_StatusAnnotation *msg, int32_t value) {
   const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 UPB_INLINE bool udpa_annotations_has_file_status(const struct google_protobuf_FileOptions* msg) {
@@ -124,9 +124,18 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_file_status(struct google_protobuf_FileOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_StatusAnnotation* sub = (struct udpa_annotations_StatusAnnotation*)udpa_annotations_file_status(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_StatusAnnotation*)_upb_Message_New(&udpa__annotations__StatusAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_file_status(msg, sub, arena);
+  }
+  return sub;
+}
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c

@@ -22,6 +22,9 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = {
   NULL,
   &udpa_annotations_StatusAnnotation__fields[0],
   16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.StatusAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f000008, &upb_psb1_1bt},

data/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h

@@ -77,7 +77,7 @@ UPB_INLINE upb_StringView udpa_annotations_VersioningAnnotation_previous_message
 
 UPB_INLINE void udpa_annotations_VersioningAnnotation_set_previous_message_type(udpa_annotations_VersioningAnnotation *msg, upb_StringView value) {
   const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
 }
 
 UPB_INLINE bool udpa_annotations_has_versioning(const struct google_protobuf_MessageOptions* msg) {
@@ -101,9 +101,18 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
                  &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
-  bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena);
+  bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
+UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutable_versioning(struct google_protobuf_MessageOptions* msg,
+                                    upb_Arena* arena) {
+  struct udpa_annotations_VersioningAnnotation* sub = (struct udpa_annotations_VersioningAnnotation*)udpa_annotations_versioning(msg);
+  if (sub == NULL) {
+    sub = (struct udpa_annotations_VersioningAnnotation*)_upb_Message_New(&udpa__annotations__VersioningAnnotation_msg_init, arena);
+    if (sub) udpa_annotations_set_versioning(msg, sub, arena);
+  }
+  return sub;
+}
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c

@@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = {
   NULL,
   &udpa_annotations_VersioningAnnotation__fields[0],
   UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+#ifdef UPB_TRACING_ENABLED
+  "udpa.annotations.VersioningAnnotation",
+#endif
   UPB_FASTTABLE_INIT({
     {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
     {0x000800003f00000a, &upb_pss_1bt},