grpc 1.81.0 → 1.82.0.pre1

data/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h

@@ -19,13 +19,9 @@ extern "C" {
 #endif
 
 extern const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init;
-extern const upb_MiniTable* envoy__type__http__v3__PathTransformation_msg_init_ptr;
 extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init;
-extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr;
 extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init;
-extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr;
 extern const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init;
-extern const upb_MiniTable* envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr;
 
 extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_file_layout;
 

data/src/core/ext/upb-gen/envoy/type/matcher/v3/address.upb.h

@@ -10,9 +10,7 @@
 #define ENVOY_TYPE_MATCHER_V3_ADDRESS_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
-
 #include "envoy/type/matcher/v3/address.upb_minitable.h"
-
 #include "xds/core/v3/cidr.upb_minitable.h"
 #include "udpa/annotations/status.upb_minitable.h"
 
@@ -22,54 +20,59 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+typedef struct envoy_type_matcher_v3_AddressMatcher {
+  upb_Message UPB_PRIVATE(base);
+} envoy_type_matcher_v3_AddressMatcher;
 
-typedef struct envoy_type_matcher_v3_AddressMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_AddressMatcher;
 struct xds_core_v3_CidrRange;
 
 
 
 /* envoy.type.matcher.v3.AddressMatcher */
-
 UPB_INLINE envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_AddressMatcher_new(upb_Arena* arena) {
   return (envoy_type_matcher_v3_AddressMatcher*)_upb_Message_New(&envoy__type__matcher__v3__AddressMatcher_msg_init, arena);
 }
-UPB_INLINE envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_AddressMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+UPB_INLINE envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_AddressMatcher_parse(const char* buf, size_t size,
+                                        upb_Arena* arena) {
   envoy_type_matcher_v3_AddressMatcher* ret = envoy_type_matcher_v3_AddressMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__AddressMatcher_msg_init, NULL, 0, arena) !=
-      kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__AddressMatcher_msg_init, NULL, 0,
+                 arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_AddressMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
+UPB_INLINE envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_AddressMatcher_parse_ex(
+    const char* buf, size_t size, const upb_ExtensionRegistry* extreg,
+    int options, upb_Arena* arena) {
   envoy_type_matcher_v3_AddressMatcher* ret = envoy_type_matcher_v3_AddressMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__AddressMatcher_msg_init, extreg, options,
-                 arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__AddressMatcher_msg_init, extreg,
+                 options, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE char* envoy_type_matcher_v3_AddressMatcher_serialize(const envoy_type_matcher_v3_AddressMatcher* msg, upb_Arena* arena, size_t* len) {
+UPB_INLINE char* envoy_type_matcher_v3_AddressMatcher_serialize(const envoy_type_matcher_v3_AddressMatcher* msg,
+                                      upb_Arena* arena, size_t* len) {
   char* ptr;
   (void)upb_Encode(UPB_UPCAST(msg), &envoy__type__matcher__v3__AddressMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
-UPB_INLINE char* envoy_type_matcher_v3_AddressMatcher_serialize_ex(const envoy_type_matcher_v3_AddressMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
+UPB_INLINE char* envoy_type_matcher_v3_AddressMatcher_serialize_ex(const envoy_type_matcher_v3_AddressMatcher* msg,
+                                         int options, upb_Arena* arena,
+                                         size_t* len) {
   char* ptr;
   (void)upb_Encode(UPB_UPCAST(msg), &envoy__type__matcher__v3__AddressMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
 }
 UPB_INLINE void envoy_type_matcher_v3_AddressMatcher_clear_ranges(envoy_type_matcher_v3_AddressMatcher* msg) {
-  const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
 }
-UPB_INLINE const struct xds_core_v3_CidrRange* const* envoy_type_matcher_v3_AddressMatcher_ranges(const envoy_type_matcher_v3_AddressMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+UPB_INLINE const struct xds_core_v3_CidrRange* const* envoy_type_matcher_v3_AddressMatcher_ranges(const envoy_type_matcher_v3_AddressMatcher* msg,
+                                                  size_t* size) {
+  const upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
   const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field);
   if (arr) {
@@ -80,8 +83,11 @@ UPB_INLINE const struct xds_core_v3_CidrRange* const* envoy_type_matcher_v3_Addr
     return NULL;
   }
 }
-UPB_INLINE const upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_upb_array(const envoy_type_matcher_v3_AddressMatcher* msg, size_t* size) {
-  const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+
+//
+UPB_INLINE const upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_upb_array(
+    const envoy_type_matcher_v3_AddressMatcher* msg, size_t* size) {
+  const upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
   const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field);
   if (size) {
@@ -89,8 +95,10 @@ UPB_INLINE const upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_upb_arr
   }
   return arr;
 }
-UPB_INLINE upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_mutable_upb_array(envoy_type_matcher_v3_AddressMatcher* msg, size_t* size, upb_Arena* arena) {
-  const upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+
+UPB_INLINE upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_mutable_upb_array(
+    envoy_type_matcher_v3_AddressMatcher* msg, size_t* size, upb_Arena* arena) {
+  const upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg),
                                                        &field, arena);
@@ -100,8 +108,9 @@ UPB_INLINE upb_Array* _envoy_type_matcher_v3_AddressMatcher_ranges_mutable_upb_a
   return arr;
 }
 
-UPB_INLINE struct xds_core_v3_CidrRange** envoy_type_matcher_v3_AddressMatcher_mutable_ranges(envoy_type_matcher_v3_AddressMatcher* msg, size_t* size) {
-  upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+UPB_INLINE struct xds_core_v3_CidrRange** envoy_type_matcher_v3_AddressMatcher_mutable_ranges(envoy_type_matcher_v3_AddressMatcher* msg,
+                                              size_t* size) {
+  upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
   upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field);
   if (arr) {
@@ -112,13 +121,18 @@ UPB_INLINE struct xds_core_v3_CidrRange** envoy_type_matcher_v3_AddressMatcher_m
     return NULL;
   }
 }
-UPB_INLINE struct xds_core_v3_CidrRange** envoy_type_matcher_v3_AddressMatcher_resize_ranges(envoy_type_matcher_v3_AddressMatcher* msg, size_t size, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
-  return (struct xds_core_v3_CidrRange**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg),
-                                                   &field, size, arena);
+
+UPB_INLINE struct xds_core_v3_CidrRange** envoy_type_matcher_v3_AddressMatcher_resize_ranges(envoy_type_matcher_v3_AddressMatcher* msg,
+                                             size_t size,
+                                             upb_Arena* arena) {
+  upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
+  return (struct xds_core_v3_CidrRange**)upb_Message_ResizeArrayUninitialized(
+      UPB_UPCAST(msg), &field, size, arena);
 }
-UPB_INLINE struct xds_core_v3_CidrRange* envoy_type_matcher_v3_AddressMatcher_add_ranges(envoy_type_matcher_v3_AddressMatcher* msg, upb_Arena* arena) {
-  upb_MiniTableField field = {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+UPB_INLINE struct xds_core_v3_CidrRange* envoy_type_matcher_v3_AddressMatcher_add_ranges(
+    envoy_type_matcher_v3_AddressMatcher* msg, upb_Arena* arena) {
+  upb_MiniTableField field = {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&xds__core__v3__CidrRange_msg_init);
   upb_Array* arr = upb_Message_GetOrCreateMutableArray(
       UPB_UPCAST(msg), &field, arena);
@@ -126,7 +140,8 @@ UPB_INLINE struct xds_core_v3_CidrRange* envoy_type_matcher_v3_AddressMatcher_ad
                   arr, arr->UPB_PRIVATE(size) + 1, arena)) {
     return NULL;
   }
-  struct xds_core_v3_CidrRange* sub = (struct xds_core_v3_CidrRange*)_upb_Message_New(&xds__core__v3__CidrRange_msg_init, arena);
+  struct xds_core_v3_CidrRange* sub =
+      (struct xds_core_v3_CidrRange*)_upb_Message_New(&xds__core__v3__CidrRange_msg_init, arena);
   if (!arr || !sub) return NULL;
   UPB_PRIVATE(_upb_Array_Set)
   (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub));
@@ -134,9 +149,9 @@ UPB_INLINE struct xds_core_v3_CidrRange* envoy_type_matcher_v3_AddressMatcher_ad
 }
 
 #ifdef __cplusplus
-}  /* extern "C" */
+              } /* extern "C" */
 #endif
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_TYPE_MATCHER_V3_ADDRESS_PROTO_UPB_H__UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_ADDRESS_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/type/matcher/v3/address.upb_minitable.c

@@ -15,25 +15,27 @@
 // Must be last.
 #include "upb/port/def.inc"
 
-extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_AddressMatcher__submsgs[1] = {
-  {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init_ptr},
-};
-
-static const upb_MiniTableField envoy_type_matcher_v3_AddressMatcher__fields[1] = {
-  {1, 8, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
+extern const UPB_PRIVATE(upb_GeneratedExtensionListEntry)* UPB_PRIVATE(upb_generated_extension_list);
+typedef struct {
+  upb_MiniTableField fields[1];
+  upb_MiniTableSubInternal subs[1];
+} envoy__type__matcher__v3__AddressMatcher_msg_init_Fields;
+
+static const envoy__type__matcher__v3__AddressMatcher_msg_init_Fields envoy_type_matcher_v3_AddressMatcher__fields = {{
+  {1, 8, 0, UPB_SIZE(3, 4), 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+ },
+  {
+  {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init},
+}};
 
 const upb_MiniTable envoy__type__matcher__v3__AddressMatcher_msg_init = {
-  &envoy_type_matcher_v3_AddressMatcher__submsgs[0],
-  &envoy_type_matcher_v3_AddressMatcher__fields[0],
+  &envoy_type_matcher_v3_AddressMatcher__fields.fields[0],
   16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 #ifdef UPB_TRACING_ENABLED
   "envoy.type.matcher.v3.AddressMatcher",
 #endif
 };
 
-const upb_MiniTable* envoy__type__matcher__v3__AddressMatcher_msg_init_ptr = &envoy__type__matcher__v3__AddressMatcher_msg_init;
 static const upb_MiniTable *messages_layout[1] = {
   &envoy__type__matcher__v3__AddressMatcher_msg_init,
 };

data/src/core/ext/upb-gen/envoy/type/matcher/v3/address.upb_minitable.h

@@ -19,7 +19,6 @@ extern "C" {
 #endif
 
 extern const upb_MiniTable envoy__type__matcher__v3__AddressMatcher_msg_init;
-extern const upb_MiniTable* envoy__type__matcher__v3__AddressMatcher_msg_init_ptr;
 
 extern const upb_MiniTableFile envoy_type_matcher_v3_address_proto_upb_file_layout;
 

data/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h

@@ -10,9 +10,7 @@
 #define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_
 
 #include "upb/generated_code_support.h"
-
 #include "envoy/type/matcher/v3/filter_state.upb_minitable.h"
-
 #include "envoy/type/matcher/v3/address.upb_minitable.h"
 #include "envoy/type/matcher/v3/string.upb_minitable.h"
 #include "udpa/annotations/status.upb_minitable.h"
@@ -24,45 +22,49 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+typedef struct envoy_type_matcher_v3_FilterStateMatcher {
+  upb_Message UPB_PRIVATE(base);
+} envoy_type_matcher_v3_FilterStateMatcher;
 
-typedef struct envoy_type_matcher_v3_FilterStateMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_FilterStateMatcher;
 struct envoy_type_matcher_v3_AddressMatcher;
 struct envoy_type_matcher_v3_StringMatcher;
 
 
 
 /* envoy.type.matcher.v3.FilterStateMatcher */
-
 UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_new(upb_Arena* arena) {
   return (envoy_type_matcher_v3_FilterStateMatcher*)_upb_Message_New(&envoy__type__matcher__v3__FilterStateMatcher_msg_init, arena);
 }
-UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
+UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_parse(const char* buf, size_t size,
+                                        upb_Arena* arena) {
   envoy_type_matcher_v3_FilterStateMatcher* ret = envoy_type_matcher_v3_FilterStateMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, NULL, 0, arena) !=
-      kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, NULL, 0,
+                 arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
+UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher* envoy_type_matcher_v3_FilterStateMatcher_parse_ex(
+    const char* buf, size_t size, const upb_ExtensionRegistry* extreg,
+    int options, upb_Arena* arena) {
   envoy_type_matcher_v3_FilterStateMatcher* ret = envoy_type_matcher_v3_FilterStateMatcher_new(arena);
   if (!ret) return NULL;
-  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, extreg, options,
-                 arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, extreg,
+                 options, arena) != kUpb_DecodeStatus_Ok) {
     return NULL;
   }
   return ret;
 }
-UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize(const envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena, size_t* len) {
+UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize(const envoy_type_matcher_v3_FilterStateMatcher* msg,
+                                      upb_Arena* arena, size_t* len) {
   char* ptr;
   (void)upb_Encode(UPB_UPCAST(msg), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, 0, arena, &ptr, len);
   return ptr;
 }
-UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize_ex(const envoy_type_matcher_v3_FilterStateMatcher* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
+UPB_INLINE char* envoy_type_matcher_v3_FilterStateMatcher_serialize_ex(const envoy_type_matcher_v3_FilterStateMatcher* msg,
+                                         int options, upb_Arena* arena,
+                                         size_t* len) {
   char* ptr;
   (void)upb_Encode(UPB_UPCAST(msg), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, options, arena, &ptr, len);
   return ptr;
@@ -72,13 +74,15 @@ typedef enum {
   envoy_type_matcher_v3_FilterStateMatcher_matcher_address_match = 3,
   envoy_type_matcher_v3_FilterStateMatcher_matcher_NOT_SET = 0
 } envoy_type_matcher_v3_FilterStateMatcher_matcher_oneofcases;
-UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher_matcher_oneofcases envoy_type_matcher_v3_FilterStateMatcher_matcher_case(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+
+UPB_INLINE envoy_type_matcher_v3_FilterStateMatcher_matcher_oneofcases
+envoy_type_matcher_v3_FilterStateMatcher_matcher_case(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   return (envoy_type_matcher_v3_FilterStateMatcher_matcher_oneofcases)upb_Message_WhichOneofFieldNumber(
       UPB_UPCAST(msg), &field);
 }
 UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_clear_matcher(envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearOneof(UPB_UPCAST(msg), &envoy__type__matcher__v3__FilterStateMatcher_msg_init, &field);
 }
 UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_clear_key(envoy_type_matcher_v3_FilterStateMatcher* msg) {
@@ -94,50 +98,51 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_FilterStateMatcher_key(const env
   return ret;
 }
 UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_clear_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
 }
 UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_string_match(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
   const struct envoy_type_matcher_v3_StringMatcher* default_val = NULL;
   const struct envoy_type_matcher_v3_StringMatcher* ret;
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init);
   _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
                                     &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool envoy_type_matcher_v3_FilterStateMatcher_has_string_match(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
 }
 UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_clear_address_match(envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, UPB_SIZE(4, 6), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
 }
 UPB_INLINE const struct envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_FilterStateMatcher_address_match(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
   const struct envoy_type_matcher_v3_AddressMatcher* default_val = NULL;
   const struct envoy_type_matcher_v3_AddressMatcher* ret;
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, UPB_SIZE(4, 6), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__AddressMatcher_msg_init);
   _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
                                     &default_val, &ret);
   return ret;
 }
 UPB_INLINE bool envoy_type_matcher_v3_FilterStateMatcher_has_address_match(const envoy_type_matcher_v3_FilterStateMatcher* msg) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, UPB_SIZE(4, 6), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
 }
 
-UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_key(envoy_type_matcher_v3_FilterStateMatcher *msg, upb_StringView value) {
+UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_key(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_StringView value) {
   const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
-  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message*)msg, &field, &value);
 }
-UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_string_match(envoy_type_matcher_v3_FilterStateMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) {
-  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg, struct envoy_type_matcher_v3_StringMatcher* value) {
+  const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__StringMatcher_msg_init);
-  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message*)msg, &field, &value);
 }
-UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) {
+UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_string_match(
+    envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_FilterStateMatcher_string_match(msg);
   if (sub == NULL) {
     sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
@@ -145,12 +150,13 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Fil
   }
   return sub;
 }
-UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_address_match(envoy_type_matcher_v3_FilterStateMatcher *msg, struct envoy_type_matcher_v3_AddressMatcher* value) {
-  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_address_match(envoy_type_matcher_v3_FilterStateMatcher* msg, struct envoy_type_matcher_v3_AddressMatcher* value) {
+  const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, UPB_SIZE(4, 6), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
   UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__type__matcher__v3__AddressMatcher_msg_init);
-  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
+  upb_Message_SetBaseField((upb_Message*)msg, &field, &value);
 }
-UPB_INLINE struct envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_address_match(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) {
+UPB_INLINE struct envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_address_match(
+    envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) {
   struct envoy_type_matcher_v3_AddressMatcher* sub = (struct envoy_type_matcher_v3_AddressMatcher*)envoy_type_matcher_v3_FilterStateMatcher_address_match(msg);
   if (sub == NULL) {
     sub = (struct envoy_type_matcher_v3_AddressMatcher*)_upb_Message_New(&envoy__type__matcher__v3__AddressMatcher_msg_init, arena);
@@ -160,9 +166,9 @@ UPB_INLINE struct envoy_type_matcher_v3_AddressMatcher* envoy_type_matcher_v3_Fi
 }
 
 #ifdef __cplusplus
-}  /* extern "C" */
+              } /* extern "C" */
 #endif
 
 #include "upb/port/undef.inc"
 
-#endif  /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ */

data/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c

@@ -17,28 +17,34 @@
 // Must be last.
 #include "upb/port/def.inc"
 
-extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher__submsgs[2] = {
-  {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
-  {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__AddressMatcher_msg_init_ptr},
-};
+extern const UPB_PRIVATE(upb_GeneratedExtensionListEntry)* UPB_PRIVATE(upb_generated_extension_list);
+typedef struct {
+  upb_MiniTableField fields[3];
+  upb_MiniTableSubInternal subs[2];
+} envoy__type__matcher__v3__FilterStateMatcher_msg_init_Fields;
 
-static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields[3] = {
+static const envoy__type__matcher__v3__FilterStateMatcher_msg_init_Fields envoy_type_matcher_v3_FilterStateMatcher__fields = {{
   {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
-};
+  {2, UPB_SIZE(12, 32), -9, UPB_SIZE(6, 7), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+  {3, UPB_SIZE(12, 32), -9, UPB_SIZE(4, 6), 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+ },
+  {
+  {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__AddressMatcher_msg_init},
+}};
 
 const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = {
-  &envoy_type_matcher_v3_FilterStateMatcher__submsgs[0],
-  &envoy_type_matcher_v3_FilterStateMatcher__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
+  &envoy_type_matcher_v3_FilterStateMatcher__fields.fields[0],
+  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
 #ifdef UPB_TRACING_ENABLED
   "envoy.type.matcher.v3.FilterStateMatcher",
 #endif
+  UPB_FASTTABLE_INIT({
+    {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
+    {0x001000003f00000a, &upb_DecodeFast_String_Scalar_Tag1Byte},
+  })
 };
 
-const upb_MiniTable* envoy__type__matcher__v3__FilterStateMatcher_msg_init_ptr = &envoy__type__matcher__v3__FilterStateMatcher_msg_init;
 static const upb_MiniTable *messages_layout[1] = {
   &envoy__type__matcher__v3__FilterStateMatcher_msg_init,
 };

data/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h

@@ -19,7 +19,6 @@ extern "C" {
 #endif
 
 extern const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init;
-extern const upb_MiniTable* envoy__type__matcher__v3__FilterStateMatcher_msg_init_ptr;
 
 extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file_layout;