grpc 1.68.1 → 1.69.0

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

@@ -76,35 +76,35 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = {
 const upb_MiniTable* udpa__annotations__FileMigrateAnnotation_msg_init_ptr = &udpa__annotations__FileMigrateAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_message_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__MessageOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_field_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FieldOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldMigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__EnumOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__EnumValueOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_file_migrate_ext = {
-  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FileOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__FileMigrateAnnotation_msg_init},
 

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -38,4 +38,4 @@ extern const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -108,7 +108,7 @@ UPB_INLINE const udpa_annotations_FieldSecurityAnnotation* udpa_annotations_secu
   const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const udpa_annotations_FieldSecurityAnnotation* default_val = NULL;
   const udpa_annotations_FieldSecurityAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -118,7 +118,7 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption
   const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -137,4 +137,4 @@ UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mut
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ */
+#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_ */

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

@@ -39,7 +39,7 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = {
 const upb_MiniTable* udpa__annotations__FieldSecurityAnnotation_msg_init_ptr = &udpa__annotations__FieldSecurityAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_security_ext = {
-  {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FieldOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldSecurityAnnotation_msg_init},
 

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ */
+#endif  /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -55,4 +55,4 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ */
+#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -28,4 +28,4 @@ extern const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -114,7 +114,7 @@ UPB_INLINE const udpa_annotations_StatusAnnotation* udpa_annotations_file_status
   const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const udpa_annotations_StatusAnnotation* default_val = NULL;
   const udpa_annotations_StatusAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -124,7 +124,7 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti
   const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -143,4 +143,4 @@ UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_fi
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ */
+#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_ */

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

@@ -38,7 +38,7 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = {
 const upb_MiniTable* udpa__annotations__StatusAnnotation_msg_init_ptr = &udpa__annotations__StatusAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_file_status_ext = {
-  {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FileOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__StatusAnnotation_msg_init},
 

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ */
+#endif  /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -91,7 +91,7 @@ UPB_INLINE const udpa_annotations_VersioningAnnotation* udpa_annotations_version
   const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const udpa_annotations_VersioningAnnotation* default_val = NULL;
   const udpa_annotations_VersioningAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -101,7 +101,7 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp
   const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -120,4 +120,4 @@ UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutabl
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ */
+#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_ */

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

@@ -35,7 +35,7 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = {
 const upb_MiniTable* udpa__annotations__VersioningAnnotation_msg_init_ptr = &udpa__annotations__VersioningAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension udpa_annotations_versioning_ext = {
-  {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__MessageOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &udpa__annotations__VersioningAnnotation_msg_init},
 

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout
 
 #include "upb/port/undef.inc"
 
-#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ */
+#endif  /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ */

data/src/core/ext/upb-gen/validate/validate.upb.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef VALIDATE_VALIDATE_PROTO_UPB_H_
-#define VALIDATE_VALIDATE_PROTO_UPB_H_
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_
+#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -6729,7 +6729,7 @@ UPB_INLINE const validate_FieldRules* validate_rules(const struct google_protobu
   const upb_MiniTableExtension* ext = &validate_rules_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const validate_FieldRules* default_val = NULL;
   const validate_FieldRules* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -6739,7 +6739,7 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con
   const upb_MiniTableExtension* ext = &validate_rules_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -6758,4 +6758,4 @@ UPB_INLINE struct validate_FieldRules* validate_mutable_rules(struct google_prot
 
 #include "upb/port/undef.inc"
 
-#endif  /* VALIDATE_VALIDATE_PROTO_UPB_H_ */
+#endif  /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/validate/validate.upb_minitable.c

@@ -17,7 +17,7 @@
 #include "upb/port/def.inc"
 
 extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal validate_FieldRules_submsgs[22] = {
+static const upb_MiniTableSubInternal validate_FieldRules__submsgs[22] = {
   {.UPB_PRIVATE(submsg) = &validate__FloatRules_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &validate__DoubleRules_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &validate__Int32Rules_msg_init_ptr},
@@ -68,7 +68,7 @@ static const upb_MiniTableField validate_FieldRules__fields[22] = {
 };
 
 const upb_MiniTable validate__FieldRules_msg_init = {
-  &validate_FieldRules_submsgs[0],
+  &validate_FieldRules__submsgs[0],
   &validate_FieldRules__fields[0],
   UPB_SIZE(24, 32), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -497,8 +497,8 @@ const upb_MiniTable validate__BoolRules_msg_init = {
 };
 
 const upb_MiniTable* validate__BoolRules_msg_init_ptr = &validate__BoolRules_msg_init;
-static const upb_MiniTableSubInternal validate_StringRules_submsgs[1] = {
-  {.UPB_PRIVATE(subenum) = &validate_KnownRegex_enum_init},
+static const upb_MiniTableSubInternal validate_StringRules__submsgs[1] = {
+  {.UPB_PRIVATE(subenum) = &validate__KnownRegex_enum_init},
 };
 
 static const upb_MiniTableField validate_StringRules__fields[26] = {
@@ -531,7 +531,7 @@ static const upb_MiniTableField validate_StringRules__fields[26] = {
 };
 
 const upb_MiniTable validate__StringRules_msg_init = {
-  &validate_StringRules_submsgs[0],
+  &validate_StringRules__submsgs[0],
   &validate_StringRules__fields[0],
   UPB_SIZE(128, 184), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -661,7 +661,7 @@ const upb_MiniTable validate__MessageRules_msg_init = {
 };
 
 const upb_MiniTable* validate__MessageRules_msg_init_ptr = &validate__MessageRules_msg_init;
-static const upb_MiniTableSubInternal validate_RepeatedRules_submsgs[1] = {
+static const upb_MiniTableSubInternal validate_RepeatedRules__submsgs[1] = {
   {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
 };
 
@@ -674,7 +674,7 @@ static const upb_MiniTableField validate_RepeatedRules__fields[5] = {
 };
 
 const upb_MiniTable validate__RepeatedRules_msg_init = {
-  &validate_RepeatedRules_submsgs[0],
+  &validate_RepeatedRules__submsgs[0],
   &validate_RepeatedRules__fields[0],
   40, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -683,7 +683,7 @@ const upb_MiniTable validate__RepeatedRules_msg_init = {
 };
 
 const upb_MiniTable* validate__RepeatedRules_msg_init_ptr = &validate__RepeatedRules_msg_init;
-static const upb_MiniTableSubInternal validate_MapRules_submsgs[2] = {
+static const upb_MiniTableSubInternal validate_MapRules__submsgs[2] = {
   {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
 };
@@ -698,7 +698,7 @@ static const upb_MiniTableField validate_MapRules__fields[6] = {
 };
 
 const upb_MiniTable validate__MapRules_msg_init = {
-  &validate_MapRules_submsgs[0],
+  &validate_MapRules__submsgs[0],
   &validate_MapRules__fields[0],
   UPB_SIZE(40, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -729,7 +729,7 @@ const upb_MiniTable validate__AnyRules_msg_init = {
 };
 
 const upb_MiniTable* validate__AnyRules_msg_init_ptr = &validate__AnyRules_msg_init;
-static const upb_MiniTableSubInternal validate_DurationRules_submsgs[7] = {
+static const upb_MiniTableSubInternal validate_DurationRules__submsgs[7] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -751,7 +751,7 @@ static const upb_MiniTableField validate_DurationRules__fields[8] = {
 };
 
 const upb_MiniTable validate__DurationRules_msg_init = {
-  &validate_DurationRules_submsgs[0],
+  &validate_DurationRules__submsgs[0],
   &validate_DurationRules__fields[0],
   UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -778,7 +778,7 @@ const upb_MiniTable validate__DurationRules_msg_init = {
 };
 
 const upb_MiniTable* validate__DurationRules_msg_init_ptr = &validate__DurationRules_msg_init;
-static const upb_MiniTableSubInternal validate_TimestampRules_submsgs[6] = {
+static const upb_MiniTableSubInternal validate_TimestampRules__submsgs[6] = {
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
   {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
@@ -800,7 +800,7 @@ static const upb_MiniTableField validate_TimestampRules__fields[9] = {
 };
 
 const upb_MiniTable validate__TimestampRules_msg_init = {
-  &validate_TimestampRules_submsgs[0],
+  &validate_TimestampRules__submsgs[0],
   &validate_TimestampRules__fields[0],
   UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
@@ -809,7 +809,7 @@ const upb_MiniTable validate__TimestampRules_msg_init = {
 };
 
 const upb_MiniTable* validate__TimestampRules_msg_init_ptr = &validate__TimestampRules_msg_init;
-const upb_MiniTableEnum validate_KnownRegex_enum_init = {
+const upb_MiniTableEnum validate__KnownRegex_enum_init = {
     64,
     0,
     {
@@ -841,7 +841,7 @@ const upb_MiniTableExtension validate_required_ext = {
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension validate_rules_ext = {
-  {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FieldOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init},
 
@@ -873,7 +873,7 @@ static const upb_MiniTable *messages_layout[23] = {
 };
 
 static const upb_MiniTableEnum *enums_layout[1] = {
-  &validate_KnownRegex_enum_init,
+  &validate__KnownRegex_enum_init,
 };
 
 

data/src/core/ext/upb-gen/validate/validate.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_
-#define VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -69,7 +69,7 @@ extern const upb_MiniTableExtension validate_ignored_ext;
 extern const upb_MiniTableExtension validate_required_ext;
 extern const upb_MiniTableExtension validate_rules_ext;
 
-extern const upb_MiniTableEnum validate_KnownRegex_enum_init;
+extern const upb_MiniTableEnum validate__KnownRegex_enum_init;
 extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
 
 #ifdef __cplusplus
@@ -78,4 +78,4 @@ extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_ */

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

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
 
@@ -221,7 +221,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_messag
   const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
   const xds_annotations_v3_MigrateAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -231,7 +231,7 @@ UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_Me
   const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -254,7 +254,7 @@ UPB_INLINE const xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_f
   const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const xds_annotations_v3_FieldMigrateAnnotation* default_val = NULL;
   const xds_annotations_v3_FieldMigrateAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -264,7 +264,7 @@ UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_Fiel
   const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -287,7 +287,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_m
   const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
   const xds_annotations_v3_MigrateAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -297,7 +297,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumO
   const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -320,7 +320,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_v
   const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
   const xds_annotations_v3_MigrateAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -330,7 +330,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf
   const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -353,7 +353,7 @@ UPB_INLINE const xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_fi
   const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   const xds_annotations_v3_FileMigrateAnnotation* default_val = NULL;
   const xds_annotations_v3_FileMigrateAnnotation* ret;
   _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -363,7 +363,7 @@ UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileO
   const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
   UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
   UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
-                 &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+                 &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
   bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
   UPB_ASSERT(ok);
 }
@@ -382,4 +382,4 @@ UPB_INLINE struct xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_m
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ */
+#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_ */

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

@@ -76,35 +76,35 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = {
 const upb_MiniTable* xds__annotations__v3__FileMigrateAnnotation_msg_init_ptr = &xds__annotations__v3__FileMigrateAnnotation_msg_init;
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__MessageOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FieldOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldMigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__EnumOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__EnumValueOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
 
 };
 UPB_LINKARR_APPEND(upb_AllExts)
 const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = {
-  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+  {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
   &google__protobuf__FileOptions_msg_init,
   {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileMigrateAnnotation_msg_init},
 

data/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h

@@ -6,8 +6,8 @@
  * regenerated.
  * NO CHECKED-IN PROTOBUF GENCODE */
 
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
 
 #include "upb/generated_code_support.h"
 
@@ -38,4 +38,4 @@ extern const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout;
 
 #include "upb/port/undef.inc"
 
-#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ */
+#endif  /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */