grpc 1.40.0 → 1.41.0.pre2

data/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "xds/core/v3/collection_entry.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "udpa/annotations/status.upb.h"
@@ -22,14 +22,14 @@ static const upb_msglayout *const xds_core_v3_CollectionEntry_submsgs[2] = {
 };
 
 static const upb_msglayout_field xds_core_v3_CollectionEntry__fields[2] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1},
-  {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1},
+  {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_CollectionEntry_msginit = {
   &xds_core_v3_CollectionEntry_submsgs[0],
   &xds_core_v3_CollectionEntry__fields[0],
-  UPB_SIZE(8, 16), 2, false, 255,
+  UPB_SIZE(8, 16), 2, false, 2, 255,
 };
 
 static const upb_msglayout *const xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = {
@@ -37,15 +37,15 @@ static const upb_msglayout *const xds_core_v3_CollectionEntry_InlineEntry_submsg
 };
 
 static const upb_msglayout_field xds_core_v3_CollectionEntry_InlineEntry__fields[3] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(12, 24), 0, 0, 9, 1},
-  {3, UPB_SIZE(20, 40), 1, 0, 11, 1},
+  {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_CollectionEntry_InlineEntry_msginit = {
   &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0],
   &xds_core_v3_CollectionEntry_InlineEntry__fields[0],
-  UPB_SIZE(24, 48), 3, false, 255,
+  UPB_SIZE(24, 48), 3, false, 3, 255,
 };
 
 #include "upb/port_undef.inc"

data/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h

@@ -9,7 +9,7 @@
 #ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_
 #define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_
 
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
@@ -40,13 +40,19 @@ UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_new(upb_aren
 UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_CollectionEntry *ret = xds_core_v3_CollectionEntry_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_CollectionEntry *ret = xds_core_v3_CollectionEntry_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_CollectionEntry_serialize(const xds_core_v3_CollectionEntry *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_CollectionEntry_msginit, arena, len);
@@ -97,13 +103,19 @@ UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_
 UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_InlineEntry_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_CollectionEntry_InlineEntry *ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_InlineEntry_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_CollectionEntry_InlineEntry *ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_CollectionEntry_InlineEntry_serialize(const xds_core_v3_CollectionEntry_InlineEntry *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena, len);

data/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "xds/core/v3/context_params.upb.h"
 #include "udpa/annotations/status.upb.h"
 
@@ -18,24 +18,24 @@ static const upb_msglayout *const xds_core_v3_ContextParams_submsgs[1] = {
 };
 
 static const upb_msglayout_field xds_core_v3_ContextParams__fields[1] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_LABEL_MAP},
+  {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_MAP},
 };
 
 const upb_msglayout xds_core_v3_ContextParams_msginit = {
   &xds_core_v3_ContextParams_submsgs[0],
   &xds_core_v3_ContextParams__fields[0],
-  UPB_SIZE(8, 8), 1, false, 255,
+  UPB_SIZE(8, 8), 1, false, 1, 255,
 };
 
 static const upb_msglayout_field xds_core_v3_ContextParams_ParamsEntry__fields[2] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 9, 1},
-  {2, UPB_SIZE(8, 16), 0, 0, 9, 1},
+  {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(8, 16), 0, 0, 9, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_ContextParams_ParamsEntry_msginit = {
   NULL,
   &xds_core_v3_ContextParams_ParamsEntry__fields[0],
-  UPB_SIZE(16, 32), 2, false, 255,
+  UPB_SIZE(16, 32), 2, false, 2, 255,
 };
 
 #include "upb/port_undef.inc"

data/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h

@@ -9,7 +9,7 @@
 #ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_
 #define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_
 
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
@@ -36,13 +36,19 @@ UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_new(upb_arena *a
 UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_ContextParams *ret = xds_core_v3_ContextParams_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_ContextParams *ret = xds_core_v3_ContextParams_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_ContextParams_serialize(const xds_core_v3_ContextParams *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_ContextParams_msginit, arena, len);

data/src/core/ext/upb-generated/xds/core/v3/resource.upb.c

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "xds/core/v3/resource.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "udpa/annotations/status.upb.h"
@@ -21,15 +21,15 @@ static const upb_msglayout *const xds_core_v3_Resource_submsgs[2] = {
 };
 
 static const upb_msglayout_field xds_core_v3_Resource__fields[3] = {
-  {1, UPB_SIZE(12, 24), 1, 1, 11, 1},
-  {2, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {3, UPB_SIZE(16, 32), 2, 0, 11, 1},
+  {1, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_Resource_msginit = {
   &xds_core_v3_Resource_submsgs[0],
   &xds_core_v3_Resource__fields[0],
-  UPB_SIZE(24, 48), 3, false, 255,
+  UPB_SIZE(24, 48), 3, false, 3, 255,
 };
 
 #include "upb/port_undef.inc"

data/src/core/ext/upb-generated/xds/core/v3/resource.upb.h

@@ -9,7 +9,7 @@
 #ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
 #define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
 
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
@@ -37,13 +37,19 @@ UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_new(upb_arena *arena) {
 UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_Resource *ret = xds_core_v3_Resource_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_Resource *ret = xds_core_v3_Resource_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_Resource_serialize(const xds_core_v3_Resource *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_Resource_msginit, arena, len);

data/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "xds/core/v3/resource_locator.upb.h"
 #include "udpa/annotations/status.upb.h"
 #include "xds/core/v3/context_params.upb.h"
@@ -21,18 +21,18 @@ static const upb_msglayout *const xds_core_v3_ResourceLocator_submsgs[2] = {
 };
 
 static const upb_msglayout_field xds_core_v3_ResourceLocator__fields[6] = {
-  {1, UPB_SIZE(0, 0), 0, 0, 14, 1},
-  {2, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {3, UPB_SIZE(12, 24), 0, 0, 9, 1},
-  {4, UPB_SIZE(20, 40), 0, 0, 9, 1},
-  {5, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 0, 11, 1},
-  {6, UPB_SIZE(28, 56), 0, 1, 11, 3},
+  {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR},
+  {5, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 0, 11, _UPB_MODE_SCALAR},
+  {6, UPB_SIZE(28, 56), 0, 1, 11, _UPB_MODE_ARRAY},
 };
 
 const upb_msglayout xds_core_v3_ResourceLocator_msginit = {
   &xds_core_v3_ResourceLocator_submsgs[0],
   &xds_core_v3_ResourceLocator__fields[0],
-  UPB_SIZE(40, 80), 6, false, 255,
+  UPB_SIZE(40, 80), 6, false, 6, 255,
 };
 
 static const upb_msglayout *const xds_core_v3_ResourceLocator_Directive_submsgs[1] = {
@@ -40,14 +40,14 @@ static const upb_msglayout *const xds_core_v3_ResourceLocator_Directive_submsgs[
 };
 
 static const upb_msglayout_field xds_core_v3_ResourceLocator_Directive__fields[2] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1},
-  {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1},
+  {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_ResourceLocator_Directive_msginit = {
   &xds_core_v3_ResourceLocator_Directive_submsgs[0],
   &xds_core_v3_ResourceLocator_Directive__fields[0],
-  UPB_SIZE(16, 32), 2, false, 255,
+  UPB_SIZE(16, 32), 2, false, 2, 255,
 };
 
 #include "upb/port_undef.inc"

data/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h

@@ -9,7 +9,7 @@
 #ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_
 #define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_
 
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
@@ -44,13 +44,19 @@ UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_new(upb_aren
 UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_ResourceLocator *ret = xds_core_v3_ResourceLocator_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_ResourceLocator *ret = xds_core_v3_ResourceLocator_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_ResourceLocator_serialize(const xds_core_v3_ResourceLocator *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_ResourceLocator_msginit, arena, len);
@@ -117,13 +123,19 @@ UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Di
 UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Directive_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_ResourceLocator_Directive *ret = xds_core_v3_ResourceLocator_Directive_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Directive_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_ResourceLocator_Directive *ret = xds_core_v3_ResourceLocator_Directive_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_ResourceLocator_Directive_serialize(const xds_core_v3_ResourceLocator_Directive *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_ResourceLocator_Directive_msginit, arena, len);

data/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c

@@ -7,7 +7,7 @@
  * regenerated. */
 
 #include <stddef.h>
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "xds/core/v3/resource_name.upb.h"
 #include "udpa/annotations/status.upb.h"
 #include "xds/core/v3/context_params.upb.h"
@@ -20,16 +20,16 @@ static const upb_msglayout *const xds_core_v3_ResourceName_submsgs[1] = {
 };
 
 static const upb_msglayout_field xds_core_v3_ResourceName__fields[4] = {
-  {1, UPB_SIZE(4, 8), 0, 0, 9, 1},
-  {2, UPB_SIZE(12, 24), 0, 0, 9, 1},
-  {3, UPB_SIZE(20, 40), 0, 0, 9, 1},
-  {4, UPB_SIZE(28, 56), 1, 0, 11, 1},
+  {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR},
+  {2, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR},
+  {3, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR},
+  {4, UPB_SIZE(28, 56), 1, 0, 11, _UPB_MODE_SCALAR},
 };
 
 const upb_msglayout xds_core_v3_ResourceName_msginit = {
   &xds_core_v3_ResourceName_submsgs[0],
   &xds_core_v3_ResourceName__fields[0],
-  UPB_SIZE(32, 64), 4, false, 255,
+  UPB_SIZE(32, 64), 4, false, 4, 255,
 };
 
 #include "upb/port_undef.inc"

data/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h

@@ -9,7 +9,7 @@
 #ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
 #define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
 
-#include "upb/msg.h"
+#include "upb/msg_internal.h"
 #include "upb/decode.h"
 #include "upb/decode_fast.h"
 #include "upb/encode.h"
@@ -35,13 +35,19 @@ UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_new(upb_arena *are
 UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_parse(const char *buf, size_t size,
                         upb_arena *arena) {
   xds_core_v3_ResourceName *ret = xds_core_v3_ResourceName_new(arena);
-  return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, arena)) ? ret : NULL;
+  if (!ret) return NULL;
+  if (!upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, arena)) return NULL;
+  return ret;
 }
 UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_parse_ex(const char *buf, size_t size,
-                           upb_arena *arena, int options) {
+                           const upb_extreg *extreg, int options,
+                           upb_arena *arena) {
   xds_core_v3_ResourceName *ret = xds_core_v3_ResourceName_new(arena);
-  return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, arena, options))
-      ? ret : NULL;
+  if (!ret) return NULL;
+  if (!_upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, extreg, options, arena)) {
+    return NULL;
+  }
+  return ret;
 }
 UPB_INLINE char *xds_core_v3_ResourceName_serialize(const xds_core_v3_ResourceName *msg, upb_arena *arena, size_t *len) {
   return upb_encode(msg, &xds_core_v3_ResourceName_msginit, arena, len);