diff options
Diffstat (limited to 'src')
209 files changed, 7714 insertions, 4689 deletions
diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c index d230ccb2ff..8db5543023 100644 --- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c +++ b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/admin/v3/config_dump.upb.h" #include "envoy/config/bootstrap/v3/bootstrap.upb.h" #include "google/protobuf/any.upb.h" @@ -22,13 +22,13 @@ static const upb_msglayout *const envoy_admin_v3_ConfigDump_submsgs[1] = { }; static const upb_msglayout_field envoy_admin_v3_ConfigDump__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_ConfigDump_msginit = { &envoy_admin_v3_ConfigDump_submsgs[0], &envoy_admin_v3_ConfigDump__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_admin_v3_UpdateFailureState_submsgs[2] = { @@ -37,16 +37,16 @@ static const upb_msglayout *const envoy_admin_v3_UpdateFailureState_submsgs[2] = }; static const upb_msglayout_field envoy_admin_v3_UpdateFailureState__fields[4] = { - {1, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {2, UPB_SIZE(24, 48), 2, 1, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 48), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit = { &envoy_admin_v3_UpdateFailureState_submsgs[0], &envoy_admin_v3_UpdateFailureState__fields[0], - UPB_SIZE(32, 64), 4, false, 255, + UPB_SIZE(32, 64), 4, false, 4, 255, }; static const upb_msglayout *const envoy_admin_v3_BootstrapConfigDump_submsgs[2] = { @@ -55,14 +55,14 @@ static const upb_msglayout *const envoy_admin_v3_BootstrapConfigDump_submsgs[2] }; static const upb_msglayout_field envoy_admin_v3_BootstrapConfigDump__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit = { &envoy_admin_v3_BootstrapConfigDump_submsgs[0], &envoy_admin_v3_BootstrapConfigDump__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_submsgs[2] = { @@ -71,15 +71,15 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_submsgs[2] }; static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, - {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit = { &envoy_admin_v3_ListenersConfigDump_submsgs[0], &envoy_admin_v3_ListenersConfigDump__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = { @@ -88,14 +88,14 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_StaticListe }; static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit = { &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { @@ -104,15 +104,15 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicList }; static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit = { &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[2] = { @@ -121,18 +121,18 @@ static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicList }; static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 1, 0, 11, 1}, - {3, UPB_SIZE(20, 32), 2, 0, 11, 1}, - {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, - {5, UPB_SIZE(28, 48), 4, 1, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(28, 48), 4, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit = { &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0], - UPB_SIZE(32, 64), 6, false, 255, + UPB_SIZE(32, 64), 6, false, 6, 255, }; static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_submsgs[2] = { @@ -141,16 +141,16 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_submsgs[2] = }; static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump__fields[4] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, - {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, - {4, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit = { &envoy_admin_v3_ClustersConfigDump_submsgs[0], &envoy_admin_v3_ClustersConfigDump__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = { @@ -159,14 +159,14 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_StaticCluste }; static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit = { &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { @@ -176,17 +176,17 @@ static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_DynamicClust }; static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, - {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, - {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit = { &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0], - UPB_SIZE(32, 48), 5, false, 255, + UPB_SIZE(32, 48), 5, false, 5, 255, }; static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_submsgs[2] = { @@ -195,14 +195,14 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_submsgs[2] = { }; static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump__fields[2] = { - {2, UPB_SIZE(0, 0), 0, 1, 11, 3}, - {3, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {2, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit = { &envoy_admin_v3_RoutesConfigDump_submsgs[0], &envoy_admin_v3_RoutesConfigDump__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 0, 255, }; static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = { @@ -211,14 +211,14 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_StaticRouteCon }; static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit = { &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { @@ -228,17 +228,17 @@ static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_DynamicRouteCo }; static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, - {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, - {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit = { &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0], - UPB_SIZE(32, 48), 5, false, 255, + UPB_SIZE(32, 48), 5, false, 5, 255, }; static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = { @@ -247,14 +247,14 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_submsgs[ }; static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit = { &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = { @@ -263,15 +263,15 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_InlineSc }; static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit = { &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = { @@ -281,18 +281,18 @@ static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_DynamicS }; static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(32, 56), 0, 1, 11, 3}, - {4, UPB_SIZE(24, 40), 1, 2, 11, 1}, - {5, UPB_SIZE(28, 48), 2, 0, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(32, 56), 0, 1, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(24, 40), 1, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(28, 48), 2, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit = { &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0], - UPB_SIZE(40, 64), 6, false, 255, + UPB_SIZE(40, 64), 6, false, 6, 255, }; static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_submsgs[2] = { @@ -301,15 +301,15 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_submsgs[2] = }; static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, - {3, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit = { &envoy_admin_v3_SecretsConfigDump_submsgs[0], &envoy_admin_v3_SecretsConfigDump__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = { @@ -319,18 +319,18 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_DynamicSecret }; static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(24, 40), 1, 2, 11, 1}, - {4, UPB_SIZE(28, 48), 2, 1, 11, 1}, - {5, UPB_SIZE(32, 56), 3, 0, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 40), 1, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 48), 2, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 56), 3, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit = { &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0], - UPB_SIZE(40, 64), 6, false, 255, + UPB_SIZE(40, 64), 6, false, 6, 255, }; static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = { @@ -339,15 +339,15 @@ static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_StaticSecret_ }; static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit = { &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_submsgs[2] = { @@ -356,14 +356,14 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_submsgs[2] }; static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump__fields[2] = { - {2, UPB_SIZE(0, 0), 0, 1, 11, 3}, - {3, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {2, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit = { &envoy_admin_v3_EndpointsConfigDump_submsgs[0], &envoy_admin_v3_EndpointsConfigDump__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 0, 255, }; static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = { @@ -372,14 +372,14 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_StaticEndpo }; static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit = { &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { @@ -389,17 +389,17 @@ static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_DynamicEndp }; static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, - {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, - {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 32), 2, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), 3, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit = { &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0], - UPB_SIZE(32, 48), 5, false, 255, + UPB_SIZE(32, 48), 5, false, 5, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h index 6f117c6659..db9fe28efb 100644 --- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h +++ b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ #define ENVOY_ADMIN_V3_CONFIG_DUMP_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" @@ -110,13 +110,19 @@ UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_new(upb_arena *a UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ConfigDump *ret = envoy_admin_v3_ConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ConfigDump *ret = envoy_admin_v3_ConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ConfigDump_serialize(const envoy_admin_v3_ConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ConfigDump_msginit, arena, len); @@ -147,13 +153,19 @@ UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_ UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_UpdateFailureState *ret = envoy_admin_v3_UpdateFailureState_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_UpdateFailureState *ret = envoy_admin_v3_UpdateFailureState_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_UpdateFailureState_serialize(const envoy_admin_v3_UpdateFailureState *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_UpdateFailureState_msginit, arena, len); @@ -207,13 +219,19 @@ UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDum UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_BootstrapConfigDump *ret = envoy_admin_v3_BootstrapConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_BootstrapConfigDump *ret = envoy_admin_v3_BootstrapConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_BootstrapConfigDump_serialize(const envoy_admin_v3_BootstrapConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_BootstrapConfigDump_msginit, arena, len); @@ -259,13 +277,19 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDum UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ListenersConfigDump *ret = envoy_admin_v3_ListenersConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ListenersConfigDump *ret = envoy_admin_v3_ListenersConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_serialize(const envoy_admin_v3_ListenersConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_msginit, arena, len); @@ -315,13 +339,19 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_Lis UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_ListenersConfigDump_StaticListener_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_StaticListener *ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_ListenersConfigDump_StaticListener_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_StaticListener *ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_StaticListener_serialize(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena, len); @@ -367,13 +397,19 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_DynamicListenerState *ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_DynamicListenerState *ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena, len); @@ -423,13 +459,19 @@ UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_Li UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_ListenersConfigDump_DynamicListener_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_DynamicListener *ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_ListenersConfigDump_DynamicListener_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ListenersConfigDump_DynamicListener *ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_DynamicListener_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena, len); @@ -513,13 +555,19 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_ UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ClustersConfigDump *ret = envoy_admin_v3_ClustersConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ClustersConfigDump *ret = envoy_admin_v3_ClustersConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_serialize(const envoy_admin_v3_ClustersConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_msginit, arena, len); @@ -584,13 +632,19 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_Clust UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_ClustersConfigDump_StaticCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ClustersConfigDump_StaticCluster *ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_ClustersConfigDump_StaticCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ClustersConfigDump_StaticCluster *ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_StaticCluster_serialize(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena, len); @@ -636,13 +690,19 @@ UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_Clus UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_ClustersConfigDump_DynamicCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ClustersConfigDump_DynamicCluster *ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_ClustersConfigDump_DynamicCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ClustersConfigDump_DynamicCluster *ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_DynamicCluster_serialize(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena, len); @@ -711,13 +771,19 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_new( UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_RoutesConfigDump *ret = envoy_admin_v3_RoutesConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_RoutesConfigDump *ret = envoy_admin_v3_RoutesConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_serialize(const envoy_admin_v3_RoutesConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_msginit, arena, len); @@ -763,13 +829,19 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_Rou UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena, len); @@ -815,13 +887,19 @@ UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_Ro UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena, len); @@ -890,13 +968,19 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesCon UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump *ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump *ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_serialize(const envoy_admin_v3_ScopedRoutesConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena, len); @@ -942,13 +1026,19 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena, len); @@ -998,13 +1088,19 @@ UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envo UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena, len); @@ -1077,13 +1173,19 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_ne UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_SecretsConfigDump *ret = envoy_admin_v3_SecretsConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_SecretsConfigDump *ret = envoy_admin_v3_SecretsConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_serialize(const envoy_admin_v3_SecretsConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_msginit, arena, len); @@ -1144,13 +1246,19 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_Secret UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_SecretsConfigDump_DynamicSecret *ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_SecretsConfigDump_DynamicSecret *ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena, len); @@ -1223,13 +1331,19 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_Secrets UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_SecretsConfigDump_StaticSecret_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_SecretsConfigDump_StaticSecret *ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_SecretsConfigDump_StaticSecret_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_SecretsConfigDump_StaticSecret *ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena, len); @@ -1279,13 +1393,19 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDum UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDump_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump *ret = envoy_admin_v3_EndpointsConfigDump_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDump_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump *ret = envoy_admin_v3_EndpointsConfigDump_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_serialize(const envoy_admin_v3_EndpointsConfigDump *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_msginit, arena, len); @@ -1331,13 +1451,19 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena, len); @@ -1383,13 +1509,19 @@ UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c index 007de31015..c3aaa11687 100644 --- a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c +++ b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/annotations/deprecation.upb.h" #include "google/protobuf/descriptor.upb.h" diff --git a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h index 1478843b59..c6ccf281db 100644 --- a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h +++ b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ #define ENVOY_ANNOTATIONS_DEPRECATION_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" diff --git a/src/core/ext/upb-generated/envoy/annotations/resource.upb.c b/src/core/ext/upb-generated/envoy/annotations/resource.upb.c index 8f1877d1c6..2f605df917 100644 --- a/src/core/ext/upb-generated/envoy/annotations/resource.upb.c +++ b/src/core/ext/upb-generated/envoy/annotations/resource.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/annotations/resource.upb.h" #include "google/protobuf/descriptor.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field envoy_annotations_ResourceAnnotation__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_annotations_ResourceAnnotation_msginit = { NULL, &envoy_annotations_ResourceAnnotation__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/annotations/resource.upb.h b/src/core/ext/upb-generated/envoy/annotations/resource.upb.h index 534eef36b8..4ba34cedc3 100644 --- a/src/core/ext/upb-generated/envoy/annotations/resource.upb.h +++ b/src/core/ext/upb-generated/envoy/annotations/resource.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ #define ENVOY_ANNOTATIONS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_annotations_ResourceAnnotation *envoy_annotations_ResourceAnnot UPB_INLINE envoy_annotations_ResourceAnnotation *envoy_annotations_ResourceAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { envoy_annotations_ResourceAnnotation *ret = envoy_annotations_ResourceAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_annotations_ResourceAnnotation *envoy_annotations_ResourceAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_annotations_ResourceAnnotation *ret = envoy_annotations_ResourceAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_annotations_ResourceAnnotation_serialize(const envoy_annotations_ResourceAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_annotations_ResourceAnnotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c index fa6dcbc1fb..579a29724c 100644 --- a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c +++ b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/accesslog/v3/accesslog.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/route/v3/route_components.upb.h" @@ -27,15 +27,15 @@ static const upb_msglayout *const envoy_config_accesslog_v3_AccessLog_submsgs[2] }; static const upb_msglayout_field envoy_config_accesslog_v3_AccessLog__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {4, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_AccessLog_msginit = { &envoy_config_accesslog_v3_AccessLog_submsgs[0], &envoy_config_accesslog_v3_AccessLog__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 2, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_AccessLogFilter_submsgs[12] = { @@ -54,24 +54,24 @@ static const upb_msglayout *const envoy_config_accesslog_v3_AccessLogFilter_subm }; static const upb_msglayout_field envoy_config_accesslog_v3_AccessLogFilter__fields[12] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 10, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 11, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 9, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 7, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 8, 11, 1}, - {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {11, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {12, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 10, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 11, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 9, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 7, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 8, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_AccessLogFilter_msginit = { &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0], &envoy_config_accesslog_v3_AccessLogFilter__fields[0], - UPB_SIZE(8, 16), 12, false, 255, + UPB_SIZE(8, 16), 12, false, 12, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = { @@ -79,14 +79,14 @@ static const upb_msglayout *const envoy_config_accesslog_v3_ComparisonFilter_sub }; static const upb_msglayout_field envoy_config_accesslog_v3_ComparisonFilter__fields[2] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(8, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_ComparisonFilter_msginit = { &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0], &envoy_config_accesslog_v3_ComparisonFilter__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = { @@ -94,13 +94,13 @@ static const upb_msglayout *const envoy_config_accesslog_v3_StatusCodeFilter_sub }; static const upb_msglayout_field envoy_config_accesslog_v3_StatusCodeFilter__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_StatusCodeFilter_msginit = { &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0], &envoy_config_accesslog_v3_StatusCodeFilter__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { @@ -108,25 +108,25 @@ static const upb_msglayout *const envoy_config_accesslog_v3_DurationFilter_subms }; static const upb_msglayout_field envoy_config_accesslog_v3_DurationFilter__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_DurationFilter_msginit = { &envoy_config_accesslog_v3_DurationFilter_submsgs[0], &envoy_config_accesslog_v3_DurationFilter__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; const upb_msglayout envoy_config_accesslog_v3_NotHealthCheckFilter_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_config_accesslog_v3_TraceableFilter_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { @@ -134,15 +134,15 @@ static const upb_msglayout *const envoy_config_accesslog_v3_RuntimeFilter_submsg }; static const upb_msglayout_field envoy_config_accesslog_v3_RuntimeFilter__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_RuntimeFilter_msginit = { &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0], &envoy_config_accesslog_v3_RuntimeFilter__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_AndFilter_submsgs[1] = { @@ -150,13 +150,13 @@ static const upb_msglayout *const envoy_config_accesslog_v3_AndFilter_submsgs[1] }; static const upb_msglayout_field envoy_config_accesslog_v3_AndFilter__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_accesslog_v3_AndFilter_msginit = { &envoy_config_accesslog_v3_AndFilter_submsgs[0], &envoy_config_accesslog_v3_AndFilter__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_OrFilter_submsgs[1] = { @@ -164,13 +164,13 @@ static const upb_msglayout *const envoy_config_accesslog_v3_OrFilter_submsgs[1] }; static const upb_msglayout_field envoy_config_accesslog_v3_OrFilter__fields[1] = { - {2, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {2, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_accesslog_v3_OrFilter_msginit = { &envoy_config_accesslog_v3_OrFilter_submsgs[0], &envoy_config_accesslog_v3_OrFilter__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 0, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = { @@ -178,34 +178,34 @@ static const upb_msglayout *const envoy_config_accesslog_v3_HeaderFilter_submsgs }; static const upb_msglayout_field envoy_config_accesslog_v3_HeaderFilter__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_HeaderFilter_msginit = { &envoy_config_accesslog_v3_HeaderFilter_submsgs[0], &envoy_config_accesslog_v3_HeaderFilter__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_accesslog_v3_ResponseFlagFilter_msginit = { NULL, &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_accesslog_v3_GrpcStatusFilter__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 14, _UPB_LABEL_PACKED}, - {2, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 14, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {2, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_GrpcStatusFilter_msginit = { NULL, &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = { @@ -214,14 +214,14 @@ static const upb_msglayout *const envoy_config_accesslog_v3_MetadataFilter_subms }; static const upb_msglayout_field envoy_config_accesslog_v3_MetadataFilter__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_MetadataFilter_msginit = { &envoy_config_accesslog_v3_MetadataFilter_submsgs[0], &envoy_config_accesslog_v3_MetadataFilter__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = { @@ -229,14 +229,14 @@ static const upb_msglayout *const envoy_config_accesslog_v3_ExtensionFilter_subm }; static const upb_msglayout_field envoy_config_accesslog_v3_ExtensionFilter__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_accesslog_v3_ExtensionFilter_msginit = { &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0], &envoy_config_accesslog_v3_ExtensionFilter__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h index 8e33c869c7..34eba0d374 100644 --- a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h +++ b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ #define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_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" @@ -113,13 +113,19 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLog *envoy_config_accesslog_v3_Access UPB_INLINE envoy_config_accesslog_v3_AccessLog *envoy_config_accesslog_v3_AccessLog_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_AccessLog *ret = envoy_config_accesslog_v3_AccessLog_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_AccessLog *envoy_config_accesslog_v3_AccessLog_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_AccessLog *ret = envoy_config_accesslog_v3_AccessLog_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_AccessLog_serialize(const envoy_config_accesslog_v3_AccessLog *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_AccessLog_msginit, arena, len); @@ -174,13 +180,19 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter *envoy_config_accesslog_v3_ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter *envoy_config_accesslog_v3_AccessLogFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_AccessLogFilter *ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter *envoy_config_accesslog_v3_AccessLogFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_AccessLogFilter *ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_AccessLogFilter_serialize(const envoy_config_accesslog_v3_AccessLogFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_AccessLogFilter_msginit, arena, len); @@ -381,13 +393,19 @@ UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter *envoy_config_accesslog_v3 UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter *envoy_config_accesslog_v3_ComparisonFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_ComparisonFilter *ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter *envoy_config_accesslog_v3_ComparisonFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_ComparisonFilter *ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_ComparisonFilter_serialize(const envoy_config_accesslog_v3_ComparisonFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_ComparisonFilter_msginit, arena, len); @@ -422,13 +440,19 @@ UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter *envoy_config_accesslog_v3 UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter *envoy_config_accesslog_v3_StatusCodeFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_StatusCodeFilter *ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter *envoy_config_accesslog_v3_StatusCodeFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_StatusCodeFilter *ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_StatusCodeFilter_serialize(const envoy_config_accesslog_v3_StatusCodeFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_StatusCodeFilter_msginit, arena, len); @@ -459,13 +483,19 @@ UPB_INLINE envoy_config_accesslog_v3_DurationFilter *envoy_config_accesslog_v3_D UPB_INLINE envoy_config_accesslog_v3_DurationFilter *envoy_config_accesslog_v3_DurationFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_DurationFilter *ret = envoy_config_accesslog_v3_DurationFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_DurationFilter *envoy_config_accesslog_v3_DurationFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_DurationFilter *ret = envoy_config_accesslog_v3_DurationFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_DurationFilter_serialize(const envoy_config_accesslog_v3_DurationFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_DurationFilter_msginit, arena, len); @@ -496,13 +526,19 @@ UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter *envoy_config_accesslo UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter *envoy_config_accesslog_v3_NotHealthCheckFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_NotHealthCheckFilter *ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter *envoy_config_accesslog_v3_NotHealthCheckFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_NotHealthCheckFilter *ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_NotHealthCheckFilter_serialize(const envoy_config_accesslog_v3_NotHealthCheckFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_NotHealthCheckFilter_msginit, arena, len); @@ -518,13 +554,19 @@ UPB_INLINE envoy_config_accesslog_v3_TraceableFilter *envoy_config_accesslog_v3_ UPB_INLINE envoy_config_accesslog_v3_TraceableFilter *envoy_config_accesslog_v3_TraceableFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_TraceableFilter *ret = envoy_config_accesslog_v3_TraceableFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_TraceableFilter *envoy_config_accesslog_v3_TraceableFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_TraceableFilter *ret = envoy_config_accesslog_v3_TraceableFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_TraceableFilter_serialize(const envoy_config_accesslog_v3_TraceableFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_TraceableFilter_msginit, arena, len); @@ -540,13 +582,19 @@ UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter *envoy_config_accesslog_v3_Ru UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter *envoy_config_accesslog_v3_RuntimeFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_RuntimeFilter *ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter *envoy_config_accesslog_v3_RuntimeFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_RuntimeFilter *ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_RuntimeFilter_serialize(const envoy_config_accesslog_v3_RuntimeFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_RuntimeFilter_msginit, arena, len); @@ -585,13 +633,19 @@ UPB_INLINE envoy_config_accesslog_v3_AndFilter *envoy_config_accesslog_v3_AndFil UPB_INLINE envoy_config_accesslog_v3_AndFilter *envoy_config_accesslog_v3_AndFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_AndFilter *ret = envoy_config_accesslog_v3_AndFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_AndFilter *envoy_config_accesslog_v3_AndFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_AndFilter *ret = envoy_config_accesslog_v3_AndFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_AndFilter_serialize(const envoy_config_accesslog_v3_AndFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_AndFilter_msginit, arena, len); @@ -622,13 +676,19 @@ UPB_INLINE envoy_config_accesslog_v3_OrFilter *envoy_config_accesslog_v3_OrFilte UPB_INLINE envoy_config_accesslog_v3_OrFilter *envoy_config_accesslog_v3_OrFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_OrFilter *ret = envoy_config_accesslog_v3_OrFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_OrFilter *envoy_config_accesslog_v3_OrFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_OrFilter *ret = envoy_config_accesslog_v3_OrFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_OrFilter_serialize(const envoy_config_accesslog_v3_OrFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_OrFilter_msginit, arena, len); @@ -659,13 +719,19 @@ UPB_INLINE envoy_config_accesslog_v3_HeaderFilter *envoy_config_accesslog_v3_Hea UPB_INLINE envoy_config_accesslog_v3_HeaderFilter *envoy_config_accesslog_v3_HeaderFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_HeaderFilter *ret = envoy_config_accesslog_v3_HeaderFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_HeaderFilter *envoy_config_accesslog_v3_HeaderFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_HeaderFilter *ret = envoy_config_accesslog_v3_HeaderFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_HeaderFilter_serialize(const envoy_config_accesslog_v3_HeaderFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_HeaderFilter_msginit, arena, len); @@ -696,13 +762,19 @@ UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter *envoy_config_accesslog_ UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter *envoy_config_accesslog_v3_ResponseFlagFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_ResponseFlagFilter *ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter *envoy_config_accesslog_v3_ResponseFlagFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_ResponseFlagFilter *ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_ResponseFlagFilter_serialize(const envoy_config_accesslog_v3_ResponseFlagFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_ResponseFlagFilter_msginit, arena, len); @@ -729,13 +801,19 @@ UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter *envoy_config_accesslog_v3 UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter *envoy_config_accesslog_v3_GrpcStatusFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_GrpcStatusFilter *ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter *envoy_config_accesslog_v3_GrpcStatusFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_GrpcStatusFilter *ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_GrpcStatusFilter_serialize(const envoy_config_accesslog_v3_GrpcStatusFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_GrpcStatusFilter_msginit, arena, len); @@ -766,13 +844,19 @@ UPB_INLINE envoy_config_accesslog_v3_MetadataFilter *envoy_config_accesslog_v3_M UPB_INLINE envoy_config_accesslog_v3_MetadataFilter *envoy_config_accesslog_v3_MetadataFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_MetadataFilter *ret = envoy_config_accesslog_v3_MetadataFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_MetadataFilter *envoy_config_accesslog_v3_MetadataFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_MetadataFilter *ret = envoy_config_accesslog_v3_MetadataFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_MetadataFilter_serialize(const envoy_config_accesslog_v3_MetadataFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_MetadataFilter_msginit, arena, len); @@ -818,13 +902,19 @@ UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter *envoy_config_accesslog_v3_ UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter *envoy_config_accesslog_v3_ExtensionFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_accesslog_v3_ExtensionFilter *ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter *envoy_config_accesslog_v3_ExtensionFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_accesslog_v3_ExtensionFilter *ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_accesslog_v3_ExtensionFilter_serialize(const envoy_config_accesslog_v3_ExtensionFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_accesslog_v3_ExtensionFilter_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c index 153cbc687c..5b72a4c40d 100644 --- a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c +++ b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/bootstrap/v3/bootstrap.upb.h" #include "envoy/config/accesslog/v3/accesslog.upb.h" #include "envoy/config/cluster/v3/cluster.upb.h" @@ -61,42 +61,42 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_submsgs[21 }; static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap__fields[30] = { - {1, UPB_SIZE(32, 56), 1, 13, 11, 1}, - {2, UPB_SIZE(36, 64), 2, 3, 11, 1}, - {3, UPB_SIZE(40, 72), 3, 2, 11, 1}, - {4, UPB_SIZE(44, 80), 4, 4, 11, 1}, - {5, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {6, UPB_SIZE(100, 192), 0, 16, 11, 3}, - {7, UPB_SIZE(48, 88), 5, 19, 11, 1}, - {8, UPB_SIZE(52, 96), 6, 8, 11, 1}, - {9, UPB_SIZE(56, 104), 7, 18, 11, 1}, - {12, UPB_SIZE(60, 112), 8, 0, 11, 1}, - {13, UPB_SIZE(64, 120), 9, 15, 11, 1}, - {14, UPB_SIZE(68, 128), 10, 10, 11, 1}, - {15, UPB_SIZE(72, 136), 11, 17, 11, 1}, - {16, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {17, UPB_SIZE(76, 144), 12, 7, 11, 1}, - {18, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {19, UPB_SIZE(80, 152), 13, 20, 11, 1}, - {20, UPB_SIZE(4, 4), 0, 0, 8, 1}, - {21, UPB_SIZE(104, 200), 0, 14, 11, 3}, - {22, UPB_SIZE(108, 208), 0, 11, 11, 3}, - {23, UPB_SIZE(84, 160), 14, 11, 11, 1}, - {24, UPB_SIZE(24, 40), 0, 0, 9, 1}, - {25, UPB_SIZE(112, 216), 0, 1, 11, _UPB_LABEL_MAP}, - {26, UPB_SIZE(116, 224), 0, 0, 9, 3}, - {27, UPB_SIZE(88, 168), 15, 9, 11, 1}, - {28, UPB_SIZE(120, 232), 0, 6, 11, 3}, - {29, UPB_SIZE(128, 248), UPB_SIZE(-133, -253), 0, 8, 1}, - {30, UPB_SIZE(92, 176), 16, 12, 11, 1}, - {31, UPB_SIZE(96, 184), 17, 14, 11, 1}, - {32, UPB_SIZE(124, 240), 0, 5, 11, 3}, + {1, UPB_SIZE(32, 56), 1, 13, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(36, 64), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(40, 72), 3, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(44, 80), 4, 4, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(100, 192), 0, 16, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(48, 88), 5, 19, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(52, 96), 6, 8, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(56, 104), 7, 18, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(60, 112), 8, 0, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(64, 120), 9, 15, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(68, 128), 10, 10, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(72, 136), 11, 17, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(76, 144), 12, 7, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(80, 152), 13, 20, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(104, 200), 0, 14, 11, _UPB_MODE_ARRAY}, + {22, UPB_SIZE(108, 208), 0, 11, 11, _UPB_MODE_ARRAY}, + {23, UPB_SIZE(84, 160), 14, 11, 11, _UPB_MODE_SCALAR}, + {24, UPB_SIZE(24, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(112, 216), 0, 1, 11, _UPB_MODE_MAP}, + {26, UPB_SIZE(116, 224), 0, 0, 9, _UPB_MODE_ARRAY}, + {27, UPB_SIZE(88, 168), 15, 9, 11, _UPB_MODE_SCALAR}, + {28, UPB_SIZE(120, 232), 0, 6, 11, _UPB_MODE_ARRAY}, + {29, UPB_SIZE(128, 248), UPB_SIZE(-133, -253), 0, 8, _UPB_MODE_SCALAR}, + {30, UPB_SIZE(92, 176), 16, 12, 11, _UPB_MODE_SCALAR}, + {31, UPB_SIZE(96, 184), 17, 14, 11, _UPB_MODE_SCALAR}, + {32, UPB_SIZE(124, 240), 0, 5, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit = { &envoy_config_bootstrap_v3_Bootstrap_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap__fields[0], - UPB_SIZE(136, 256), 30, false, 255, + UPB_SIZE(136, 256), 30, false, 9, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = { @@ -106,15 +106,15 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_StaticReso }; static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, - {3, UPB_SIZE(8, 16), 0, 2, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 1, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(8, 16), 0, 2, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit = { &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[2] = { @@ -123,17 +123,17 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_DynamicRes }; static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = { - {1, UPB_SIZE(20, 40), 1, 1, 11, 1}, - {2, UPB_SIZE(24, 48), 2, 1, 11, 1}, - {3, UPB_SIZE(28, 56), 3, 0, 11, 1}, - {5, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {6, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(20, 40), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 48), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 56), 3, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit = { &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 3, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { @@ -141,14 +141,14 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_Certificat }; static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit = { &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Admin_submsgs[3] = { @@ -158,17 +158,17 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Admin_submsgs[3] = { }; static const upb_msglayout_field envoy_config_bootstrap_v3_Admin__fields[5] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(20, 40), 1, 1, 11, 1}, - {4, UPB_SIZE(24, 48), 0, 2, 11, 3}, - {5, UPB_SIZE(28, 56), 0, 0, 11, 3}, + {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, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 48), 0, 2, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(28, 56), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_bootstrap_v3_Admin_msginit = { &envoy_config_bootstrap_v3_Admin_submsgs[0], &envoy_config_bootstrap_v3_Admin__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 5, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = { @@ -178,16 +178,16 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_subms }; static const upb_msglayout_field envoy_config_bootstrap_v3_ClusterManager__fields[4] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 2, 11, 1}, - {4, UPB_SIZE(20, 40), 3, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 40), 3, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_msginit = { &envoy_config_bootstrap_v3_ClusterManager_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = { @@ -195,14 +195,14 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_Outli }; static const upb_msglayout_field envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit = { &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdogs_submsgs[1] = { @@ -210,14 +210,14 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdogs_submsgs[1] }; static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdogs__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_Watchdogs_msginit = { &envoy_config_bootstrap_v3_Watchdogs_submsgs[0], &envoy_config_bootstrap_v3_Watchdogs__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_submsgs[3] = { @@ -227,19 +227,19 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_submsgs[3] }; static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdog__fields[7] = { - {1, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 2, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 2, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 2, 11, 1}, - {5, UPB_SIZE(20, 40), 5, 1, 11, 1}, - {6, UPB_SIZE(24, 48), 6, 2, 11, 1}, - {7, UPB_SIZE(28, 56), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 5, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 48), 6, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 56), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_bootstrap_v3_Watchdog_msginit = { &envoy_config_bootstrap_v3_Watchdog_submsgs[0], &envoy_config_bootstrap_v3_Watchdog__fields[0], - UPB_SIZE(32, 64), 7, false, 255, + UPB_SIZE(32, 64), 7, false, 7, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = { @@ -247,14 +247,14 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_WatchdogAct }; static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit = { &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0], &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_FatalAction_submsgs[1] = { @@ -262,13 +262,13 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_FatalAction_submsgs[ }; static const upb_msglayout_field envoy_config_bootstrap_v3_FatalAction__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_FatalAction_msginit = { &envoy_config_bootstrap_v3_FatalAction_submsgs[0], &envoy_config_bootstrap_v3_FatalAction__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_Runtime_submsgs[1] = { @@ -276,16 +276,16 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_Runtime_submsgs[1] = }; static const upb_msglayout_field envoy_config_bootstrap_v3_Runtime__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 envoy_config_bootstrap_v3_Runtime_msginit = { &envoy_config_bootstrap_v3_Runtime_submsgs[0], &envoy_config_bootstrap_v3_Runtime__fields[0], - UPB_SIZE(32, 64), 4, false, 255, + UPB_SIZE(32, 64), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = { @@ -296,35 +296,35 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_submsgs }; static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_msginit = { &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer__fields[0], - UPB_SIZE(16, 32), 5, false, 255, + UPB_SIZE(16, 32), 5, false, 5, 255, }; static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit = { NULL, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { @@ -332,14 +332,14 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLay }; static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit = { &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = { @@ -347,24 +347,24 @@ static const upb_msglayout *const envoy_config_bootstrap_v3_LayeredRuntime_subms }; static const upb_msglayout_field envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_bootstrap_v3_LayeredRuntime_msginit = { &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0], &envoy_config_bootstrap_v3_LayeredRuntime__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_bootstrap_v3_CustomInlineHeader__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_bootstrap_v3_CustomInlineHeader_msginit = { NULL, &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h index 21152f2fb0..33a9b2c259 100644 --- a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h +++ b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ #define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_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" @@ -141,13 +141,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootst UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootstrap_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap *ret = envoy_config_bootstrap_v3_Bootstrap_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootstrap_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap *ret = envoy_config_bootstrap_v3_Bootstrap_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_serialize(const envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena, len); @@ -543,13 +549,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_boo UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_bootstrap_v3_Bootstrap_StaticResources_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap_StaticResources *ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_bootstrap_v3_Bootstrap_StaticResources_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap_StaticResources *ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_StaticResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena, len); @@ -610,13 +622,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bo UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap_DynamicResources *ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Bootstrap_DynamicResources *ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena, len); @@ -703,13 +721,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_new( UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Admin *ret = envoy_config_bootstrap_v3_Admin_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Admin *ret = envoy_config_bootstrap_v3_Admin_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Admin_serialize(const envoy_config_bootstrap_v3_Admin *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Admin_msginit, arena, len); @@ -778,13 +802,19 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_C UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_ClusterManager_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_ClusterManager *ret = envoy_config_bootstrap_v3_ClusterManager_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_ClusterManager_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_ClusterManager *ret = envoy_config_bootstrap_v3_ClusterManager_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_ClusterManager_serialize(const envoy_config_bootstrap_v3_ClusterManager *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena, len); @@ -849,13 +879,19 @@ UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_conf UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_serialize(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena, len); @@ -890,13 +926,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchd UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchdogs_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Watchdogs *ret = envoy_config_bootstrap_v3_Watchdogs_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchdogs_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Watchdogs *ret = envoy_config_bootstrap_v3_Watchdogs_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Watchdogs_serialize(const envoy_config_bootstrap_v3_Watchdogs *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena, len); @@ -942,13 +984,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdo UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdog_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Watchdog *ret = envoy_config_bootstrap_v3_Watchdog_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdog_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Watchdog *ret = envoy_config_bootstrap_v3_Watchdog_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Watchdog_serialize(const envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdog_msginit, arena, len); @@ -1069,13 +1117,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_boots UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Watchdog_WatchdogAction *ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Watchdog_WatchdogAction *ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_serialize(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena, len); @@ -1110,13 +1164,19 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_Fata UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_FatalAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_FatalAction *ret = envoy_config_bootstrap_v3_FatalAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_FatalAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_FatalAction *ret = envoy_config_bootstrap_v3_FatalAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_FatalAction_serialize(const envoy_config_bootstrap_v3_FatalAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_FatalAction_msginit, arena, len); @@ -1147,13 +1207,19 @@ UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_ UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_Runtime *ret = envoy_config_bootstrap_v3_Runtime_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_Runtime *ret = envoy_config_bootstrap_v3_Runtime_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_Runtime_serialize(const envoy_config_bootstrap_v3_Runtime *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_Runtime_msginit, arena, len); @@ -1196,13 +1262,19 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_Run UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_RuntimeLayer_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_RuntimeLayer_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena, len); @@ -1287,13 +1359,19 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootst UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena, len); @@ -1321,13 +1399,19 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_boots UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena, len); @@ -1343,13 +1427,19 @@ UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootst UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena, len); @@ -1384,13 +1474,19 @@ UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_L UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_LayeredRuntime_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_LayeredRuntime *ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_LayeredRuntime_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_LayeredRuntime *ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_LayeredRuntime_serialize(const envoy_config_bootstrap_v3_LayeredRuntime *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena, len); @@ -1421,13 +1517,19 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader *envoy_config_bootstrap_ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader *envoy_config_bootstrap_v3_CustomInlineHeader_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_bootstrap_v3_CustomInlineHeader *ret = envoy_config_bootstrap_v3_CustomInlineHeader_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader *envoy_config_bootstrap_v3_CustomInlineHeader_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_bootstrap_v3_CustomInlineHeader *ret = envoy_config_bootstrap_v3_CustomInlineHeader_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_CustomInlineHeader_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_bootstrap_v3_CustomInlineHeader_serialize(const envoy_config_bootstrap_v3_CustomInlineHeader *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_bootstrap_v3_CustomInlineHeader_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c index b3f086de19..8d85e0d1d5 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/cluster/v3/circuit_breaker.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/type/v3/percent.upb.h" @@ -23,13 +23,13 @@ static const upb_msglayout *const envoy_config_cluster_v3_CircuitBreakers_submsg }; static const upb_msglayout_field envoy_config_cluster_v3_CircuitBreakers__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_msginit = { &envoy_config_cluster_v3_CircuitBreakers_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[2] = { @@ -38,20 +38,20 @@ static const upb_msglayout *const envoy_config_cluster_v3_CircuitBreakers_Thresh }; static const upb_msglayout_field envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[8] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(12, 16), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 24), 2, 1, 11, 1}, - {4, UPB_SIZE(20, 32), 3, 1, 11, 1}, - {5, UPB_SIZE(24, 40), 4, 1, 11, 1}, - {6, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {7, UPB_SIZE(28, 48), 5, 1, 11, 1}, - {8, UPB_SIZE(32, 56), 6, 0, 11, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 16), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 2, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 32), 3, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(24, 40), 4, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 48), 5, 1, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(32, 56), 6, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit = { &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0], - UPB_SIZE(40, 64), 8, false, 255, + UPB_SIZE(40, 64), 8, false, 8, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = { @@ -60,14 +60,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_CircuitBreakers_Thresh }; static const upb_msglayout_field envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit = { &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h index 8d6099603d..4d89a703e7 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_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" @@ -43,13 +43,19 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers *envoy_config_cluster_v3_Circ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers *envoy_config_cluster_v3_CircuitBreakers_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers *ret = envoy_config_cluster_v3_CircuitBreakers_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_CircuitBreakers *envoy_config_cluster_v3_CircuitBreakers_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers *ret = envoy_config_cluster_v3_CircuitBreakers_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_CircuitBreakers_serialize(const envoy_config_cluster_v3_CircuitBreakers *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_CircuitBreakers_msginit, arena, len); @@ -80,13 +86,19 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds *envoy_config_clus UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds *envoy_config_cluster_v3_CircuitBreakers_Thresholds_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers_Thresholds *ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds *envoy_config_cluster_v3_CircuitBreakers_Thresholds_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers_Thresholds *ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_CircuitBreakers_Thresholds_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msginit, arena, len); @@ -200,13 +212,19 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *envoy UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c index 1d7e99267c..e11d9d7135 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/cluster/v3/cluster.upb.h" #include "envoy/config/cluster/v3/circuit_breaker.upb.h" #include "envoy/config/cluster/v3/filter.upb.h" @@ -40,13 +40,13 @@ static const upb_msglayout *const envoy_config_cluster_v3_ClusterCollection_subm }; static const upb_msglayout_field envoy_config_cluster_v3_ClusterCollection__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_ClusterCollection_msginit = { &envoy_config_cluster_v3_ClusterCollection_submsgs[0], &envoy_config_cluster_v3_ClusterCollection__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_submsgs[34] = { @@ -87,62 +87,62 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_submsgs[34] = }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster__fields[50] = { - {1, UPB_SIZE(24, 24), 0, 0, 9, 1}, - {2, UPB_SIZE(172, 320), UPB_SIZE(-177, -329), 0, 14, 1}, - {3, UPB_SIZE(40, 56), 1, 3, 11, 1}, - {4, UPB_SIZE(44, 64), 2, 32, 11, 1}, - {5, UPB_SIZE(48, 72), 3, 33, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {8, UPB_SIZE(152, 280), 0, 22, 11, 3}, - {9, UPB_SIZE(52, 80), 4, 33, 11, 1}, - {10, UPB_SIZE(56, 88), 5, 0, 11, 1}, - {13, UPB_SIZE(60, 96), 6, 23, 11, 1}, - {14, UPB_SIZE(64, 104), 7, 24, 11, 1}, - {16, UPB_SIZE(68, 112), 8, 32, 11, 1}, - {17, UPB_SIZE(8, 8), 0, 0, 14, 1}, - {18, UPB_SIZE(156, 288), 0, 18, 11, 3}, - {19, UPB_SIZE(72, 120), 9, 15, 11, 1}, - {20, UPB_SIZE(76, 128), 10, 32, 11, 1}, - {21, UPB_SIZE(80, 136), 11, 19, 11, 1}, - {22, UPB_SIZE(84, 144), 12, 4, 11, 1}, - {23, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 10, 11, 1}, - {24, UPB_SIZE(88, 152), 13, 27, 11, 1}, - {25, UPB_SIZE(92, 160), 14, 26, 11, 1}, - {26, UPB_SIZE(12, 12), 0, 0, 14, 1}, - {27, UPB_SIZE(96, 168), 15, 1, 11, 1}, - {28, UPB_SIZE(32, 40), 0, 0, 9, 1}, - {29, UPB_SIZE(100, 176), 16, 25, 11, 1}, - {30, UPB_SIZE(104, 184), 17, 17, 11, 1}, - {31, UPB_SIZE(16, 16), 0, 0, 8, 1}, - {32, UPB_SIZE(17, 17), 0, 0, 8, 1}, - {33, UPB_SIZE(108, 192), 18, 30, 11, 1}, - {34, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 7, 11, 1}, - {36, UPB_SIZE(160, 296), 0, 12, 11, _UPB_LABEL_MAP}, - {37, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 5, 11, 1}, - {38, UPB_SIZE(172, 320), UPB_SIZE(-177, -329), 2, 11, 1}, - {39, UPB_SIZE(18, 18), 0, 0, 8, 1}, - {40, UPB_SIZE(164, 304), 0, 13, 11, 3}, - {41, UPB_SIZE(112, 200), 19, 14, 11, 1}, - {42, UPB_SIZE(116, 208), 20, 20, 11, 1}, - {43, UPB_SIZE(168, 312), 0, 11, 11, 3}, - {44, UPB_SIZE(120, 216), 21, 9, 11, 1}, - {45, UPB_SIZE(19, 19), 0, 0, 8, 1}, - {46, UPB_SIZE(124, 224), 22, 29, 11, 1}, - {47, UPB_SIZE(20, 20), 0, 0, 8, 1}, - {48, UPB_SIZE(128, 232), 23, 28, 11, 1}, - {49, UPB_SIZE(132, 240), 24, 16, 11, 1}, - {50, UPB_SIZE(136, 248), 25, 8, 11, 1}, - {51, UPB_SIZE(21, 21), 0, 0, 8, 1}, - {52, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 6, 11, 1}, - {53, UPB_SIZE(140, 256), 26, 21, 11, 1}, - {54, UPB_SIZE(144, 264), 27, 31, 11, 1}, - {55, UPB_SIZE(148, 272), 28, 28, 11, 1}, + {1, UPB_SIZE(24, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(172, 320), UPB_SIZE(-177, -329), 0, 14, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(40, 56), 1, 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(44, 64), 2, 32, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(48, 72), 3, 33, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(152, 280), 0, 22, 11, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(52, 80), 4, 33, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(56, 88), 5, 0, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(60, 96), 6, 23, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(64, 104), 7, 24, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(68, 112), 8, 32, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(156, 288), 0, 18, 11, _UPB_MODE_ARRAY}, + {19, UPB_SIZE(72, 120), 9, 15, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(76, 128), 10, 32, 11, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(80, 136), 11, 19, 11, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(84, 144), 12, 4, 11, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 10, 11, _UPB_MODE_SCALAR}, + {24, UPB_SIZE(88, 152), 13, 27, 11, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(92, 160), 14, 26, 11, _UPB_MODE_SCALAR}, + {26, UPB_SIZE(12, 12), 0, 0, 14, _UPB_MODE_SCALAR}, + {27, UPB_SIZE(96, 168), 15, 1, 11, _UPB_MODE_SCALAR}, + {28, UPB_SIZE(32, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {29, UPB_SIZE(100, 176), 16, 25, 11, _UPB_MODE_SCALAR}, + {30, UPB_SIZE(104, 184), 17, 17, 11, _UPB_MODE_SCALAR}, + {31, UPB_SIZE(16, 16), 0, 0, 8, _UPB_MODE_SCALAR}, + {32, UPB_SIZE(17, 17), 0, 0, 8, _UPB_MODE_SCALAR}, + {33, UPB_SIZE(108, 192), 18, 30, 11, _UPB_MODE_SCALAR}, + {34, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 7, 11, _UPB_MODE_SCALAR}, + {36, UPB_SIZE(160, 296), 0, 12, 11, _UPB_MODE_MAP}, + {37, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 5, 11, _UPB_MODE_SCALAR}, + {38, UPB_SIZE(172, 320), UPB_SIZE(-177, -329), 2, 11, _UPB_MODE_SCALAR}, + {39, UPB_SIZE(18, 18), 0, 0, 8, _UPB_MODE_SCALAR}, + {40, UPB_SIZE(164, 304), 0, 13, 11, _UPB_MODE_ARRAY}, + {41, UPB_SIZE(112, 200), 19, 14, 11, _UPB_MODE_SCALAR}, + {42, UPB_SIZE(116, 208), 20, 20, 11, _UPB_MODE_SCALAR}, + {43, UPB_SIZE(168, 312), 0, 11, 11, _UPB_MODE_ARRAY}, + {44, UPB_SIZE(120, 216), 21, 9, 11, _UPB_MODE_SCALAR}, + {45, UPB_SIZE(19, 19), 0, 0, 8, _UPB_MODE_SCALAR}, + {46, UPB_SIZE(124, 224), 22, 29, 11, _UPB_MODE_SCALAR}, + {47, UPB_SIZE(20, 20), 0, 0, 8, _UPB_MODE_SCALAR}, + {48, UPB_SIZE(128, 232), 23, 28, 11, _UPB_MODE_SCALAR}, + {49, UPB_SIZE(132, 240), 24, 16, 11, _UPB_MODE_SCALAR}, + {50, UPB_SIZE(136, 248), 25, 8, 11, _UPB_MODE_SCALAR}, + {51, UPB_SIZE(21, 21), 0, 0, 8, _UPB_MODE_SCALAR}, + {52, UPB_SIZE(180, 336), UPB_SIZE(-185, -345), 6, 11, _UPB_MODE_SCALAR}, + {53, UPB_SIZE(140, 256), 26, 21, 11, _UPB_MODE_SCALAR}, + {54, UPB_SIZE(144, 264), 27, 31, 11, _UPB_MODE_SCALAR}, + {55, UPB_SIZE(148, 272), 28, 28, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_msginit = { &envoy_config_cluster_v3_Cluster_submsgs[0], &envoy_config_cluster_v3_Cluster__fields[0], - UPB_SIZE(192, 352), 50, false, 255, + UPB_SIZE(192, 352), 50, false, 6, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = { @@ -151,15 +151,15 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_TransportSocke }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit = { &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0], &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = { @@ -167,14 +167,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CustomClusterT }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_CustomClusterType__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_CustomClusterType_msginit = { &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0], &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = { @@ -182,14 +182,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_EdsClusterConf }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit = { &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = { @@ -198,32 +198,32 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_LbSubsetConfig }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[7] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(12, 16), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 24), 0, 0, 11, 3}, - {4, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {5, UPB_SIZE(9, 9), 0, 0, 8, 1}, - {6, UPB_SIZE(10, 10), 0, 0, 8, 1}, - {7, UPB_SIZE(11, 11), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 16), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(9, 9), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(10, 10), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(11, 11), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit = { &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0], - UPB_SIZE(24, 32), 7, false, 255, + UPB_SIZE(24, 32), 7, false, 7, 255, }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[4] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 3}, - {2, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {3, UPB_SIZE(12, 16), 0, 0, 9, 3}, - {4, UPB_SIZE(4, 4), 0, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit = { NULL, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0], - UPB_SIZE(16, 24), 4, false, 255, + UPB_SIZE(16, 24), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[2] = { @@ -232,14 +232,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_LeastRequestLb }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[1] = { @@ -247,15 +247,15 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_RingHashLbConf }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[3] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {3, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {4, UPB_SIZE(12, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = { @@ -263,23 +263,23 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_MaglevLbConfig }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit = { NULL, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[5] = { @@ -291,19 +291,19 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[7] = { - {1, UPB_SIZE(4, 8), 1, 3, 11, 1}, - {2, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 2, 11, 1}, - {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, 1}, - {4, UPB_SIZE(8, 16), 2, 4, 11, 1}, - {5, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {6, UPB_SIZE(2, 2), 0, 0, 8, 1}, - {7, UPB_SIZE(12, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), 2, 4, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0], - UPB_SIZE(24, 48), 7, false, 255, + UPB_SIZE(24, 48), 7, false, 7, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = { @@ -312,21 +312,21 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { @@ -334,14 +334,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_CommonLbConfig }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[2] = { - {1, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit = { &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[1] = { @@ -349,14 +349,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_RefreshRate_su }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_RefreshRate__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_RefreshRate_msginit = { &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0], &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[1] = { @@ -364,14 +364,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_PreconnectPoli }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit = { &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0], &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { @@ -379,14 +379,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_TypedExtension }; static const upb_msglayout_field envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit = { &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0], &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = { @@ -394,13 +394,13 @@ static const upb_msglayout *const envoy_config_cluster_v3_LoadBalancingPolicy_su }; static const upb_msglayout_field envoy_config_cluster_v3_LoadBalancingPolicy__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_msginit = { &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = { @@ -408,14 +408,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_LoadBalancingPolicy_Po }; static const upb_msglayout_field envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit = { &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_UpstreamBindConfig_submsgs[1] = { @@ -423,13 +423,13 @@ static const upb_msglayout *const envoy_config_cluster_v3_UpstreamBindConfig_sub }; static const upb_msglayout_field envoy_config_cluster_v3_UpstreamBindConfig__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_UpstreamBindConfig_msginit = { &envoy_config_cluster_v3_UpstreamBindConfig_submsgs[0], &envoy_config_cluster_v3_UpstreamBindConfig__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = { @@ -437,24 +437,24 @@ static const upb_msglayout *const envoy_config_cluster_v3_UpstreamConnectionOpti }; static const upb_msglayout_field envoy_config_cluster_v3_UpstreamConnectionOptions__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_UpstreamConnectionOptions_msginit = { &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0], &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_cluster_v3_TrackClusterStats__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_TrackClusterStats_msginit = { NULL, &envoy_config_cluster_v3_TrackClusterStats__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h index 84feca0618..fc1e82db89 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_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" @@ -201,13 +201,19 @@ UPB_INLINE envoy_config_cluster_v3_ClusterCollection *envoy_config_cluster_v3_Cl UPB_INLINE envoy_config_cluster_v3_ClusterCollection *envoy_config_cluster_v3_ClusterCollection_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_ClusterCollection *ret = envoy_config_cluster_v3_ClusterCollection_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_ClusterCollection *envoy_config_cluster_v3_ClusterCollection_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_ClusterCollection *ret = envoy_config_cluster_v3_ClusterCollection_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_ClusterCollection_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_ClusterCollection_serialize(const envoy_config_cluster_v3_ClusterCollection *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_ClusterCollection_msginit, arena, len); @@ -238,13 +244,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster *envoy_config_cluster_v3_Cluster_new( UPB_INLINE envoy_config_cluster_v3_Cluster *envoy_config_cluster_v3_Cluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster *ret = envoy_config_cluster_v3_Cluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster *envoy_config_cluster_v3_Cluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster *ret = envoy_config_cluster_v3_Cluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_serialize(const envoy_config_cluster_v3_Cluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_msginit, arena, len); @@ -883,13 +895,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch *envoy_config_cl UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch *envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_TransportSocketMatch *ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_TransportSocketMatch *envoy_config_cluster_v3_Cluster_TransportSocketMatch_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_TransportSocketMatch *ret = envoy_config_cluster_v3_Cluster_TransportSocketMatch_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_TransportSocketMatch_serialize(const envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, arena, len); @@ -939,13 +957,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType *envoy_config_clust UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType *envoy_config_cluster_v3_Cluster_CustomClusterType_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_CustomClusterType *ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_CustomClusterType *envoy_config_cluster_v3_Cluster_CustomClusterType_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_CustomClusterType *ret = envoy_config_cluster_v3_Cluster_CustomClusterType_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_CustomClusterType_serialize(const envoy_config_cluster_v3_Cluster_CustomClusterType *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_CustomClusterType_msginit, arena, len); @@ -980,13 +1004,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig *envoy_config_cluste UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig *envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_EdsClusterConfig *ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_EdsClusterConfig *envoy_config_cluster_v3_Cluster_EdsClusterConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_EdsClusterConfig *ret = envoy_config_cluster_v3_Cluster_EdsClusterConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit, arena, len); @@ -1021,13 +1051,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig *envoy_config_cluster_ UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig *envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_LbSubsetConfig *ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig *envoy_config_cluster_v3_Cluster_LbSubsetConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_LbSubsetConfig *ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_LbSubsetConfig_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msginit, arena, len); @@ -1093,13 +1129,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *envo UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *ret = envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_serialize(const envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msginit, arena, len); @@ -1145,13 +1187,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *envoy_config_cl UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *ret = envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_serialize(const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, arena, len); @@ -1197,13 +1245,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig *envoy_config_cluste UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig *envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_RingHashLbConfig *ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_RingHashLbConfig *envoy_config_cluster_v3_Cluster_RingHashLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_RingHashLbConfig *ret = envoy_config_cluster_v3_Cluster_RingHashLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_RingHashLbConfig_serialize(const envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, arena, len); @@ -1253,13 +1307,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig *envoy_config_cluster_ UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig *envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_MaglevLbConfig *ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_MaglevLbConfig *envoy_config_cluster_v3_Cluster_MaglevLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_MaglevLbConfig *ret = envoy_config_cluster_v3_Cluster_MaglevLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_MaglevLbConfig_serialize(const envoy_config_cluster_v3_Cluster_MaglevLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, arena, len); @@ -1290,13 +1350,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *envoy_config_clu UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *ret = envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_serialize(const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, arena, len); @@ -1316,13 +1382,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig *envoy_config_cluster_ UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_CommonLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_msginit, arena, len); @@ -1426,13 +1498,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *env UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msginit, arena, len); @@ -1482,13 +1560,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConf UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, arena, len); @@ -1504,13 +1588,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbCon UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *ret = envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_serialize(const envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, arena, len); @@ -1545,13 +1635,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate *envoy_config_cluster_v3_ UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate *envoy_config_cluster_v3_Cluster_RefreshRate_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_RefreshRate *ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_RefreshRate *envoy_config_cluster_v3_Cluster_RefreshRate_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_RefreshRate *ret = envoy_config_cluster_v3_Cluster_RefreshRate_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_RefreshRate_serialize(const envoy_config_cluster_v3_Cluster_RefreshRate *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, arena, len); @@ -1597,13 +1693,19 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluste UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Cluster_PreconnectPolicy *ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Cluster_PreconnectPolicy *ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena, len); @@ -1667,13 +1769,19 @@ UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy *envoy_config_cluster_v3_ UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy *envoy_config_cluster_v3_LoadBalancingPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_LoadBalancingPolicy *ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy *envoy_config_cluster_v3_LoadBalancingPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_LoadBalancingPolicy *ret = envoy_config_cluster_v3_LoadBalancingPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_LoadBalancingPolicy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, arena, len); @@ -1704,13 +1812,19 @@ UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy *envoy_config_clus UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy *envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_LoadBalancingPolicy_Policy *ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_LoadBalancingPolicy_Policy *envoy_config_cluster_v3_LoadBalancingPolicy_Policy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_LoadBalancingPolicy_Policy *ret = envoy_config_cluster_v3_LoadBalancingPolicy_Policy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_LoadBalancingPolicy_Policy_serialize(const envoy_config_cluster_v3_LoadBalancingPolicy_Policy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, arena, len); @@ -1745,13 +1859,19 @@ UPB_INLINE envoy_config_cluster_v3_UpstreamBindConfig *envoy_config_cluster_v3_U UPB_INLINE envoy_config_cluster_v3_UpstreamBindConfig *envoy_config_cluster_v3_UpstreamBindConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_UpstreamBindConfig *ret = envoy_config_cluster_v3_UpstreamBindConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamBindConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamBindConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_UpstreamBindConfig *envoy_config_cluster_v3_UpstreamBindConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_UpstreamBindConfig *ret = envoy_config_cluster_v3_UpstreamBindConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamBindConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamBindConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_UpstreamBindConfig_serialize(const envoy_config_cluster_v3_UpstreamBindConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_UpstreamBindConfig_msginit, arena, len); @@ -1782,13 +1902,19 @@ UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions *envoy_config_clust UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions *envoy_config_cluster_v3_UpstreamConnectionOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_UpstreamConnectionOptions *ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions *envoy_config_cluster_v3_UpstreamConnectionOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_UpstreamConnectionOptions *ret = envoy_config_cluster_v3_UpstreamConnectionOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_UpstreamConnectionOptions_serialize(const envoy_config_cluster_v3_UpstreamConnectionOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_UpstreamConnectionOptions_msginit, arena, len); @@ -1819,13 +1945,19 @@ UPB_INLINE envoy_config_cluster_v3_TrackClusterStats *envoy_config_cluster_v3_Tr UPB_INLINE envoy_config_cluster_v3_TrackClusterStats *envoy_config_cluster_v3_TrackClusterStats_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_TrackClusterStats *ret = envoy_config_cluster_v3_TrackClusterStats_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_TrackClusterStats *envoy_config_cluster_v3_TrackClusterStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_TrackClusterStats *ret = envoy_config_cluster_v3_TrackClusterStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_TrackClusterStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_TrackClusterStats_serialize(const envoy_config_cluster_v3_TrackClusterStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_TrackClusterStats_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c index 14230149e5..7c02e7a614 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/cluster/v3/filter.upb.h" #include "google/protobuf/any.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const envoy_config_cluster_v3_Filter_submsgs[1] = { }; static const upb_msglayout_field envoy_config_cluster_v3_Filter__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_Filter_msginit = { &envoy_config_cluster_v3_Filter_submsgs[0], &envoy_config_cluster_v3_Filter__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h index 1850b2a550..36356fbeed 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_FILTER_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 envoy_config_cluster_v3_Filter *envoy_config_cluster_v3_Filter_new(up UPB_INLINE envoy_config_cluster_v3_Filter *envoy_config_cluster_v3_Filter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_Filter *ret = envoy_config_cluster_v3_Filter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_Filter *envoy_config_cluster_v3_Filter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_Filter *ret = envoy_config_cluster_v3_Filter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_Filter_serialize(const envoy_config_cluster_v3_Filter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_Filter_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c index f90563f1e7..3092f86502 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/cluster/v3/outlier_detection.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" @@ -23,33 +23,33 @@ static const upb_msglayout *const envoy_config_cluster_v3_OutlierDetection_subms }; static const upb_msglayout_field envoy_config_cluster_v3_OutlierDetection__fields[21] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 1, 11, 1}, - {5, UPB_SIZE(20, 40), 5, 1, 11, 1}, - {6, UPB_SIZE(24, 48), 6, 1, 11, 1}, - {7, UPB_SIZE(28, 56), 7, 1, 11, 1}, - {8, UPB_SIZE(32, 64), 8, 1, 11, 1}, - {9, UPB_SIZE(36, 72), 9, 1, 11, 1}, - {10, UPB_SIZE(40, 80), 10, 1, 11, 1}, - {11, UPB_SIZE(44, 88), 11, 1, 11, 1}, - {12, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {13, UPB_SIZE(48, 96), 12, 1, 11, 1}, - {14, UPB_SIZE(52, 104), 13, 1, 11, 1}, - {15, UPB_SIZE(56, 112), 14, 1, 11, 1}, - {16, UPB_SIZE(60, 120), 15, 1, 11, 1}, - {17, UPB_SIZE(64, 128), 16, 1, 11, 1}, - {18, UPB_SIZE(68, 136), 17, 1, 11, 1}, - {19, UPB_SIZE(72, 144), 18, 1, 11, 1}, - {20, UPB_SIZE(76, 152), 19, 1, 11, 1}, - {21, UPB_SIZE(80, 160), 20, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 5, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 48), 6, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 56), 7, 1, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(32, 64), 8, 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(36, 72), 9, 1, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(40, 80), 10, 1, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(44, 88), 11, 1, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(48, 96), 12, 1, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(52, 104), 13, 1, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(56, 112), 14, 1, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(60, 120), 15, 1, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(64, 128), 16, 1, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(68, 136), 17, 1, 11, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(72, 144), 18, 1, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(76, 152), 19, 1, 11, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(80, 160), 20, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_cluster_v3_OutlierDetection_msginit = { &envoy_config_cluster_v3_OutlierDetection_submsgs[0], &envoy_config_cluster_v3_OutlierDetection__fields[0], - UPB_SIZE(88, 168), 21, false, 255, + UPB_SIZE(88, 168), 21, false, 21, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h index 70b7623262..9da074f42e 100644 --- a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h +++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_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 envoy_config_cluster_v3_OutlierDetection *envoy_config_cluster_v3_Out UPB_INLINE envoy_config_cluster_v3_OutlierDetection *envoy_config_cluster_v3_OutlierDetection_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_cluster_v3_OutlierDetection *ret = envoy_config_cluster_v3_OutlierDetection_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_cluster_v3_OutlierDetection *envoy_config_cluster_v3_OutlierDetection_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_cluster_v3_OutlierDetection *ret = envoy_config_cluster_v3_OutlierDetection_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_cluster_v3_OutlierDetection_serialize(const envoy_config_cluster_v3_OutlierDetection *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_cluster_v3_OutlierDetection_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c index 048fc05035..457e1ead50 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/socket_option.upb.h" #include "google/protobuf/wrappers.upb.h" @@ -18,39 +18,39 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_config_core_v3_Pipe__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 13, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Pipe_msginit = { NULL, &envoy_config_core_v3_Pipe__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_EnvoyInternalAddress__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_EnvoyInternalAddress_msginit = { NULL, &envoy_config_core_v3_EnvoyInternalAddress__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_SocketAddress__fields[6] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(24, 40), UPB_SIZE(-33, -57), 0, 13, 1}, - {4, UPB_SIZE(24, 40), UPB_SIZE(-33, -57), 0, 9, 1}, - {5, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 40), UPB_SIZE(-33, -57), 0, 13, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), UPB_SIZE(-33, -57), 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_SocketAddress_msginit = { NULL, &envoy_config_core_v3_SocketAddress__fields[0], - UPB_SIZE(40, 64), 6, false, 255, + UPB_SIZE(40, 64), 6, false, 6, 255, }; static const upb_msglayout *const envoy_config_core_v3_TcpKeepalive_submsgs[1] = { @@ -58,15 +58,15 @@ static const upb_msglayout *const envoy_config_core_v3_TcpKeepalive_submsgs[1] = }; static const upb_msglayout_field envoy_config_core_v3_TcpKeepalive__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_TcpKeepalive_msginit = { &envoy_config_core_v3_TcpKeepalive_submsgs[0], &envoy_config_core_v3_TcpKeepalive__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_BindConfig_submsgs[3] = { @@ -76,15 +76,15 @@ static const upb_msglayout *const envoy_config_core_v3_BindConfig_submsgs[3] = { }; static const upb_msglayout_field envoy_config_core_v3_BindConfig__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 2, 11, 1}, - {3, UPB_SIZE(12, 24), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_BindConfig_msginit = { &envoy_config_core_v3_BindConfig_submsgs[0], &envoy_config_core_v3_BindConfig__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_Address_submsgs[3] = { @@ -94,15 +94,15 @@ static const upb_msglayout *const envoy_config_core_v3_Address_submsgs[3] = { }; static const upb_msglayout_field envoy_config_core_v3_Address__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Address_msginit = { &envoy_config_core_v3_Address_submsgs[0], &envoy_config_core_v3_Address__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_CidrRange_submsgs[1] = { @@ -110,14 +110,14 @@ static const upb_msglayout *const envoy_config_core_v3_CidrRange_submsgs[1] = { }; static const upb_msglayout_field envoy_config_core_v3_CidrRange__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_CidrRange_msginit = { &envoy_config_core_v3_CidrRange_submsgs[0], &envoy_config_core_v3_CidrRange__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h index c8fdbee29e..cab78ba6c8 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_ADDRESS_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" @@ -62,13 +62,19 @@ UPB_INLINE envoy_config_core_v3_Pipe *envoy_config_core_v3_Pipe_new(upb_arena *a UPB_INLINE envoy_config_core_v3_Pipe *envoy_config_core_v3_Pipe_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Pipe *ret = envoy_config_core_v3_Pipe_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Pipe_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Pipe_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Pipe *envoy_config_core_v3_Pipe_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Pipe *ret = envoy_config_core_v3_Pipe_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Pipe_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Pipe_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Pipe_serialize(const envoy_config_core_v3_Pipe *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Pipe_msginit, arena, len); @@ -92,13 +98,19 @@ UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress *envoy_config_core_v3_Envoy UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress *envoy_config_core_v3_EnvoyInternalAddress_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_EnvoyInternalAddress *ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress *envoy_config_core_v3_EnvoyInternalAddress_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_EnvoyInternalAddress *ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_EnvoyInternalAddress_serialize(const envoy_config_core_v3_EnvoyInternalAddress *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_EnvoyInternalAddress_msginit, arena, len); @@ -125,13 +137,19 @@ UPB_INLINE envoy_config_core_v3_SocketAddress *envoy_config_core_v3_SocketAddres UPB_INLINE envoy_config_core_v3_SocketAddress *envoy_config_core_v3_SocketAddress_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_SocketAddress *ret = envoy_config_core_v3_SocketAddress_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_SocketAddress *envoy_config_core_v3_SocketAddress_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_SocketAddress *ret = envoy_config_core_v3_SocketAddress_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_SocketAddress_serialize(const envoy_config_core_v3_SocketAddress *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_SocketAddress_msginit, arena, len); @@ -180,13 +198,19 @@ UPB_INLINE envoy_config_core_v3_TcpKeepalive *envoy_config_core_v3_TcpKeepalive_ UPB_INLINE envoy_config_core_v3_TcpKeepalive *envoy_config_core_v3_TcpKeepalive_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_TcpKeepalive *ret = envoy_config_core_v3_TcpKeepalive_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_TcpKeepalive *envoy_config_core_v3_TcpKeepalive_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_TcpKeepalive *ret = envoy_config_core_v3_TcpKeepalive_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_TcpKeepalive_serialize(const envoy_config_core_v3_TcpKeepalive *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_TcpKeepalive_msginit, arena, len); @@ -247,13 +271,19 @@ UPB_INLINE envoy_config_core_v3_BindConfig *envoy_config_core_v3_BindConfig_new( UPB_INLINE envoy_config_core_v3_BindConfig *envoy_config_core_v3_BindConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_BindConfig *ret = envoy_config_core_v3_BindConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_BindConfig *envoy_config_core_v3_BindConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_BindConfig *ret = envoy_config_core_v3_BindConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_BindConfig_serialize(const envoy_config_core_v3_BindConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_BindConfig_msginit, arena, len); @@ -314,13 +344,19 @@ UPB_INLINE envoy_config_core_v3_Address *envoy_config_core_v3_Address_new(upb_ar UPB_INLINE envoy_config_core_v3_Address *envoy_config_core_v3_Address_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Address *ret = envoy_config_core_v3_Address_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Address_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Address_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Address *envoy_config_core_v3_Address_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Address *ret = envoy_config_core_v3_Address_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Address_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Address_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Address_serialize(const envoy_config_core_v3_Address *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Address_msginit, arena, len); @@ -386,13 +422,19 @@ UPB_INLINE envoy_config_core_v3_CidrRange *envoy_config_core_v3_CidrRange_new(up UPB_INLINE envoy_config_core_v3_CidrRange *envoy_config_core_v3_CidrRange_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_CidrRange *ret = envoy_config_core_v3_CidrRange_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_CidrRange *envoy_config_core_v3_CidrRange_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_CidrRange *ret = envoy_config_core_v3_CidrRange_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_CidrRange_serialize(const envoy_config_core_v3_CidrRange *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_CidrRange_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c index 8e1174d7a9..95c1b37f68 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/backoff.upb.h" #include "google/protobuf/duration.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const envoy_config_core_v3_BackoffStrategy_submsgs[1 }; static const upb_msglayout_field envoy_config_core_v3_BackoffStrategy__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_BackoffStrategy_msginit = { &envoy_config_core_v3_BackoffStrategy_submsgs[0], &envoy_config_core_v3_BackoffStrategy__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h index 3601c66cf9..3711df0062 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_BACKOFF_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 envoy_config_core_v3_BackoffStrategy *envoy_config_core_v3_BackoffStr UPB_INLINE envoy_config_core_v3_BackoffStrategy *envoy_config_core_v3_BackoffStrategy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_BackoffStrategy *ret = envoy_config_core_v3_BackoffStrategy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_BackoffStrategy *envoy_config_core_v3_BackoffStrategy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_BackoffStrategy *ret = envoy_config_core_v3_BackoffStrategy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_BackoffStrategy_serialize(const envoy_config_core_v3_BackoffStrategy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_BackoffStrategy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c index e534377aa6..cfb9327473 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/backoff.upb.h" @@ -27,15 +27,15 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_config_core_v3_Locality__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 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}, + {3, UPB_SIZE(16, 32), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Locality_msginit = { NULL, &envoy_config_core_v3_Locality__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_BuildVersion_submsgs[2] = { @@ -44,14 +44,14 @@ static const upb_msglayout *const envoy_config_core_v3_BuildVersion_submsgs[2] = }; static const upb_msglayout_field envoy_config_core_v3_BuildVersion__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_BuildVersion_msginit = { &envoy_config_core_v3_BuildVersion_submsgs[0], &envoy_config_core_v3_BuildVersion__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_Extension_submsgs[1] = { @@ -59,17 +59,17 @@ static const upb_msglayout *const envoy_config_core_v3_Extension_submsgs[1] = { }; static const upb_msglayout_field envoy_config_core_v3_Extension__fields[5] = { - {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}, - {5, UPB_SIZE(1, 1), 0, 0, 8, 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}, + {5, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Extension_msginit = { &envoy_config_core_v3_Extension_submsgs[0], &envoy_config_core_v3_Extension__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 5, 255, }; static const upb_msglayout *const envoy_config_core_v3_Node_submsgs[6] = { @@ -82,23 +82,23 @@ static const upb_msglayout *const envoy_config_core_v3_Node_submsgs[6] = { }; static const upb_msglayout_field envoy_config_core_v3_Node__fields[11] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(28, 56), 1, 5, 11, 1}, - {4, UPB_SIZE(32, 64), 2, 3, 11, 1}, - {6, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {7, UPB_SIZE(52, 104), UPB_SIZE(-61, -121), 0, 9, 1}, - {8, UPB_SIZE(52, 104), UPB_SIZE(-61, -121), 1, 11, 1}, - {9, UPB_SIZE(36, 72), 0, 2, 11, 3}, - {10, UPB_SIZE(40, 80), 0, 0, 9, 3}, - {11, UPB_SIZE(44, 88), 0, 0, 11, 3}, - {12, UPB_SIZE(48, 96), 0, 4, 11, _UPB_LABEL_MAP}, + {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(28, 56), 1, 5, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 64), 2, 3, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(52, 104), UPB_SIZE(-61, -121), 0, 9, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(52, 104), UPB_SIZE(-61, -121), 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(36, 72), 0, 2, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(40, 80), 0, 0, 9, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(44, 88), 0, 0, 11, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(48, 96), 0, 4, 11, _UPB_MODE_MAP}, }; const upb_msglayout envoy_config_core_v3_Node_msginit = { &envoy_config_core_v3_Node_submsgs[0], &envoy_config_core_v3_Node__fields[0], - UPB_SIZE(64, 128), 11, false, 255, + UPB_SIZE(64, 128), 11, false, 4, 255, }; static const upb_msglayout *const envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = { @@ -106,14 +106,14 @@ static const upb_msglayout *const envoy_config_core_v3_Node_DynamicParametersEnt }; static const upb_msglayout_field envoy_config_core_v3_Node_DynamicParametersEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Node_DynamicParametersEntry_msginit = { &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0], &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_Metadata_submsgs[2] = { @@ -122,14 +122,14 @@ static const upb_msglayout *const envoy_config_core_v3_Metadata_submsgs[2] = { }; static const upb_msglayout_field envoy_config_core_v3_Metadata__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_LABEL_MAP}, - {2, UPB_SIZE(4, 8), 0, 1, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_MAP}, + {2, UPB_SIZE(4, 8), 0, 1, 11, _UPB_MODE_MAP}, }; const upb_msglayout envoy_config_core_v3_Metadata_msginit = { &envoy_config_core_v3_Metadata_submsgs[0], &envoy_config_core_v3_Metadata__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { @@ -137,14 +137,14 @@ static const upb_msglayout *const envoy_config_core_v3_Metadata_FilterMetadataEn }; static const upb_msglayout_field envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit = { &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = { @@ -152,25 +152,25 @@ static const upb_msglayout *const envoy_config_core_v3_Metadata_TypedFilterMetad }; static const upb_msglayout_field envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msginit = { &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_RuntimeUInt32__fields[2] = { - {2, UPB_SIZE(0, 0), 0, 0, 13, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RuntimeUInt32_msginit = { NULL, &envoy_config_core_v3_RuntimeUInt32__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 0, 255, }; static const upb_msglayout *const envoy_config_core_v3_RuntimePercent_submsgs[1] = { @@ -178,25 +178,25 @@ static const upb_msglayout *const envoy_config_core_v3_RuntimePercent_submsgs[1] }; static const upb_msglayout_field envoy_config_core_v3_RuntimePercent__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RuntimePercent_msginit = { &envoy_config_core_v3_RuntimePercent_submsgs[0], &envoy_config_core_v3_RuntimePercent__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_RuntimeDouble__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RuntimeDouble_msginit = { NULL, &envoy_config_core_v3_RuntimeDouble__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = { @@ -204,25 +204,25 @@ static const upb_msglayout *const envoy_config_core_v3_RuntimeFeatureFlag_submsg }; static const upb_msglayout_field envoy_config_core_v3_RuntimeFeatureFlag__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RuntimeFeatureFlag_msginit = { &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0], &envoy_config_core_v3_RuntimeFeatureFlag__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_HeaderValue__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 envoy_config_core_v3_HeaderValue_msginit = { NULL, &envoy_config_core_v3_HeaderValue__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_HeaderValueOption_submsgs[2] = { @@ -231,14 +231,14 @@ static const upb_msglayout *const envoy_config_core_v3_HeaderValueOption_submsgs }; static const upb_msglayout_field envoy_config_core_v3_HeaderValueOption__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HeaderValueOption_msginit = { &envoy_config_core_v3_HeaderValueOption_submsgs[0], &envoy_config_core_v3_HeaderValueOption__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_HeaderMap_submsgs[1] = { @@ -246,35 +246,35 @@ static const upb_msglayout *const envoy_config_core_v3_HeaderMap_submsgs[1] = { }; static const upb_msglayout_field envoy_config_core_v3_HeaderMap__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_HeaderMap_msginit = { &envoy_config_core_v3_HeaderMap_submsgs[0], &envoy_config_core_v3_HeaderMap__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_WatchedDirectory__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit = { NULL, &envoy_config_core_v3_WatchedDirectory__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_DataSource__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_DataSource_msginit = { NULL, &envoy_config_core_v3_DataSource__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_RetryPolicy_submsgs[2] = { @@ -283,14 +283,14 @@ static const upb_msglayout *const envoy_config_core_v3_RetryPolicy_submsgs[2] = }; static const upb_msglayout_field envoy_config_core_v3_RetryPolicy__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RetryPolicy_msginit = { &envoy_config_core_v3_RetryPolicy_submsgs[0], &envoy_config_core_v3_RetryPolicy__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_RemoteDataSource_submsgs[2] = { @@ -299,15 +299,15 @@ static const upb_msglayout *const envoy_config_core_v3_RemoteDataSource_submsgs[ }; static const upb_msglayout_field envoy_config_core_v3_RemoteDataSource__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RemoteDataSource_msginit = { &envoy_config_core_v3_RemoteDataSource_submsgs[0], &envoy_config_core_v3_RemoteDataSource__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_AsyncDataSource_submsgs[2] = { @@ -316,14 +316,14 @@ static const upb_msglayout *const envoy_config_core_v3_AsyncDataSource_submsgs[2 }; static const upb_msglayout_field envoy_config_core_v3_AsyncDataSource__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_AsyncDataSource_msginit = { &envoy_config_core_v3_AsyncDataSource_submsgs[0], &envoy_config_core_v3_AsyncDataSource__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_TransportSocket_submsgs[1] = { @@ -331,14 +331,14 @@ static const upb_msglayout *const envoy_config_core_v3_TransportSocket_submsgs[1 }; static const upb_msglayout_field envoy_config_core_v3_TransportSocket__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_TransportSocket_msginit = { &envoy_config_core_v3_TransportSocket_submsgs[0], &envoy_config_core_v3_TransportSocket__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = { @@ -346,24 +346,24 @@ static const upb_msglayout *const envoy_config_core_v3_RuntimeFractionalPercent_ }; static const upb_msglayout_field envoy_config_core_v3_RuntimeFractionalPercent__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RuntimeFractionalPercent_msginit = { &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0], &envoy_config_core_v3_RuntimeFractionalPercent__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_ControlPlane__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_ControlPlane_msginit = { NULL, &envoy_config_core_v3_ControlPlane__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h index 043c0b9ada..8d36c96746 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_BASE_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" @@ -145,13 +145,19 @@ UPB_INLINE envoy_config_core_v3_Locality *envoy_config_core_v3_Locality_new(upb_ UPB_INLINE envoy_config_core_v3_Locality *envoy_config_core_v3_Locality_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Locality *ret = envoy_config_core_v3_Locality_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Locality_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Locality_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Locality *envoy_config_core_v3_Locality_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Locality *ret = envoy_config_core_v3_Locality_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Locality_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Locality_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Locality_serialize(const envoy_config_core_v3_Locality *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Locality_msginit, arena, len); @@ -179,13 +185,19 @@ UPB_INLINE envoy_config_core_v3_BuildVersion *envoy_config_core_v3_BuildVersion_ UPB_INLINE envoy_config_core_v3_BuildVersion *envoy_config_core_v3_BuildVersion_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_BuildVersion *ret = envoy_config_core_v3_BuildVersion_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_BuildVersion *envoy_config_core_v3_BuildVersion_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_BuildVersion *ret = envoy_config_core_v3_BuildVersion_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_BuildVersion_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_BuildVersion_serialize(const envoy_config_core_v3_BuildVersion *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_BuildVersion_msginit, arena, len); @@ -231,13 +243,19 @@ UPB_INLINE envoy_config_core_v3_Extension *envoy_config_core_v3_Extension_new(up UPB_INLINE envoy_config_core_v3_Extension *envoy_config_core_v3_Extension_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Extension *ret = envoy_config_core_v3_Extension_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Extension_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Extension_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Extension *envoy_config_core_v3_Extension_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Extension *ret = envoy_config_core_v3_Extension_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Extension_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Extension_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Extension_serialize(const envoy_config_core_v3_Extension *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Extension_msginit, arena, len); @@ -284,13 +302,19 @@ UPB_INLINE envoy_config_core_v3_Node *envoy_config_core_v3_Node_new(upb_arena *a UPB_INLINE envoy_config_core_v3_Node *envoy_config_core_v3_Node_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Node *ret = envoy_config_core_v3_Node_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Node_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Node_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Node *envoy_config_core_v3_Node_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Node *ret = envoy_config_core_v3_Node_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Node_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Node_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Node_serialize(const envoy_config_core_v3_Node *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Node_msginit, arena, len); @@ -441,13 +465,19 @@ UPB_INLINE envoy_config_core_v3_Metadata *envoy_config_core_v3_Metadata_new(upb_ UPB_INLINE envoy_config_core_v3_Metadata *envoy_config_core_v3_Metadata_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Metadata *ret = envoy_config_core_v3_Metadata_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Metadata_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Metadata_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Metadata *envoy_config_core_v3_Metadata_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Metadata *ret = envoy_config_core_v3_Metadata_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Metadata_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Metadata_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Metadata_serialize(const envoy_config_core_v3_Metadata *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Metadata_msginit, arena, len); @@ -515,13 +545,19 @@ UPB_INLINE envoy_config_core_v3_RuntimeUInt32 *envoy_config_core_v3_RuntimeUInt3 UPB_INLINE envoy_config_core_v3_RuntimeUInt32 *envoy_config_core_v3_RuntimeUInt32_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RuntimeUInt32 *ret = envoy_config_core_v3_RuntimeUInt32_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RuntimeUInt32 *envoy_config_core_v3_RuntimeUInt32_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RuntimeUInt32 *ret = envoy_config_core_v3_RuntimeUInt32_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeUInt32_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RuntimeUInt32_serialize(const envoy_config_core_v3_RuntimeUInt32 *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RuntimeUInt32_msginit, arena, len); @@ -545,13 +581,19 @@ UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePerc UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePercent_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RuntimePercent *ret = envoy_config_core_v3_RuntimePercent_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePercent_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RuntimePercent *ret = envoy_config_core_v3_RuntimePercent_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RuntimePercent_serialize(const envoy_config_core_v3_RuntimePercent *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RuntimePercent_msginit, arena, len); @@ -586,13 +628,19 @@ UPB_INLINE envoy_config_core_v3_RuntimeDouble *envoy_config_core_v3_RuntimeDoubl UPB_INLINE envoy_config_core_v3_RuntimeDouble *envoy_config_core_v3_RuntimeDouble_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RuntimeDouble *ret = envoy_config_core_v3_RuntimeDouble_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RuntimeDouble *envoy_config_core_v3_RuntimeDouble_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RuntimeDouble *ret = envoy_config_core_v3_RuntimeDouble_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeDouble_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RuntimeDouble_serialize(const envoy_config_core_v3_RuntimeDouble *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RuntimeDouble_msginit, arena, len); @@ -616,13 +664,19 @@ UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag *envoy_config_core_v3_Runtime UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag *envoy_config_core_v3_RuntimeFeatureFlag_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RuntimeFeatureFlag *ret = envoy_config_core_v3_RuntimeFeatureFlag_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RuntimeFeatureFlag *envoy_config_core_v3_RuntimeFeatureFlag_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RuntimeFeatureFlag *ret = envoy_config_core_v3_RuntimeFeatureFlag_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RuntimeFeatureFlag_serialize(const envoy_config_core_v3_RuntimeFeatureFlag *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, arena, len); @@ -657,13 +711,19 @@ UPB_INLINE envoy_config_core_v3_HeaderValue *envoy_config_core_v3_HeaderValue_ne UPB_INLINE envoy_config_core_v3_HeaderValue *envoy_config_core_v3_HeaderValue_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HeaderValue *ret = envoy_config_core_v3_HeaderValue_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HeaderValue *envoy_config_core_v3_HeaderValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HeaderValue *ret = envoy_config_core_v3_HeaderValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HeaderValue_serialize(const envoy_config_core_v3_HeaderValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HeaderValue_msginit, arena, len); @@ -687,13 +747,19 @@ UPB_INLINE envoy_config_core_v3_HeaderValueOption *envoy_config_core_v3_HeaderVa UPB_INLINE envoy_config_core_v3_HeaderValueOption *envoy_config_core_v3_HeaderValueOption_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HeaderValueOption *ret = envoy_config_core_v3_HeaderValueOption_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HeaderValueOption *envoy_config_core_v3_HeaderValueOption_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HeaderValueOption *ret = envoy_config_core_v3_HeaderValueOption_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderValueOption_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HeaderValueOption_serialize(const envoy_config_core_v3_HeaderValueOption *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HeaderValueOption_msginit, arena, len); @@ -739,13 +805,19 @@ UPB_INLINE envoy_config_core_v3_HeaderMap *envoy_config_core_v3_HeaderMap_new(up UPB_INLINE envoy_config_core_v3_HeaderMap *envoy_config_core_v3_HeaderMap_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HeaderMap *ret = envoy_config_core_v3_HeaderMap_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HeaderMap *envoy_config_core_v3_HeaderMap_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HeaderMap *ret = envoy_config_core_v3_HeaderMap_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HeaderMap_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HeaderMap_serialize(const envoy_config_core_v3_HeaderMap *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HeaderMap_msginit, arena, len); @@ -776,13 +848,19 @@ UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDi UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDirectory_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_WatchedDirectory *ret = envoy_config_core_v3_WatchedDirectory_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDirectory_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_WatchedDirectory *ret = envoy_config_core_v3_WatchedDirectory_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_WatchedDirectory_serialize(const envoy_config_core_v3_WatchedDirectory *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_WatchedDirectory_msginit, arena, len); @@ -802,13 +880,19 @@ UPB_INLINE envoy_config_core_v3_DataSource *envoy_config_core_v3_DataSource_new( UPB_INLINE envoy_config_core_v3_DataSource *envoy_config_core_v3_DataSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_DataSource *ret = envoy_config_core_v3_DataSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_DataSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_DataSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_DataSource *envoy_config_core_v3_DataSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_DataSource *ret = envoy_config_core_v3_DataSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_DataSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_DataSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_DataSource_serialize(const envoy_config_core_v3_DataSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_DataSource_msginit, arena, len); @@ -847,13 +931,19 @@ UPB_INLINE envoy_config_core_v3_RetryPolicy *envoy_config_core_v3_RetryPolicy_ne UPB_INLINE envoy_config_core_v3_RetryPolicy *envoy_config_core_v3_RetryPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RetryPolicy *ret = envoy_config_core_v3_RetryPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RetryPolicy *envoy_config_core_v3_RetryPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RetryPolicy *ret = envoy_config_core_v3_RetryPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RetryPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RetryPolicy_serialize(const envoy_config_core_v3_RetryPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RetryPolicy_msginit, arena, len); @@ -899,13 +989,19 @@ UPB_INLINE envoy_config_core_v3_RemoteDataSource *envoy_config_core_v3_RemoteDat UPB_INLINE envoy_config_core_v3_RemoteDataSource *envoy_config_core_v3_RemoteDataSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RemoteDataSource *ret = envoy_config_core_v3_RemoteDataSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RemoteDataSource *envoy_config_core_v3_RemoteDataSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RemoteDataSource *ret = envoy_config_core_v3_RemoteDataSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RemoteDataSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RemoteDataSource_serialize(const envoy_config_core_v3_RemoteDataSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RemoteDataSource_msginit, arena, len); @@ -955,13 +1051,19 @@ UPB_INLINE envoy_config_core_v3_AsyncDataSource *envoy_config_core_v3_AsyncDataS UPB_INLINE envoy_config_core_v3_AsyncDataSource *envoy_config_core_v3_AsyncDataSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_AsyncDataSource *ret = envoy_config_core_v3_AsyncDataSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_AsyncDataSource *envoy_config_core_v3_AsyncDataSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_AsyncDataSource *ret = envoy_config_core_v3_AsyncDataSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_AsyncDataSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_AsyncDataSource_serialize(const envoy_config_core_v3_AsyncDataSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_AsyncDataSource_msginit, arena, len); @@ -1012,13 +1114,19 @@ UPB_INLINE envoy_config_core_v3_TransportSocket *envoy_config_core_v3_TransportS UPB_INLINE envoy_config_core_v3_TransportSocket *envoy_config_core_v3_TransportSocket_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_TransportSocket *ret = envoy_config_core_v3_TransportSocket_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_TransportSocket *envoy_config_core_v3_TransportSocket_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_TransportSocket *ret = envoy_config_core_v3_TransportSocket_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_TransportSocket_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_TransportSocket_serialize(const envoy_config_core_v3_TransportSocket *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_TransportSocket_msginit, arena, len); @@ -1058,13 +1166,19 @@ UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent *envoy_config_core_v3_R UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent *envoy_config_core_v3_RuntimeFractionalPercent_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RuntimeFractionalPercent *ret = envoy_config_core_v3_RuntimeFractionalPercent_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RuntimeFractionalPercent *envoy_config_core_v3_RuntimeFractionalPercent_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RuntimeFractionalPercent *ret = envoy_config_core_v3_RuntimeFractionalPercent_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimeFractionalPercent_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RuntimeFractionalPercent_serialize(const envoy_config_core_v3_RuntimeFractionalPercent *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RuntimeFractionalPercent_msginit, arena, len); @@ -1099,13 +1213,19 @@ UPB_INLINE envoy_config_core_v3_ControlPlane *envoy_config_core_v3_ControlPlane_ UPB_INLINE envoy_config_core_v3_ControlPlane *envoy_config_core_v3_ControlPlane_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_ControlPlane *ret = envoy_config_core_v3_ControlPlane_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_ControlPlane *envoy_config_core_v3_ControlPlane_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_ControlPlane *ret = envoy_config_core_v3_ControlPlane_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_ControlPlane_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_ControlPlane_serialize(const envoy_config_core_v3_ControlPlane *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_ControlPlane_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c index 30a2e754e9..91daff7a51 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/config_source.upb.h" #include "envoy/config/core/v3/grpc_service.upb.h" #include "google/protobuf/duration.upb.h" @@ -27,36 +27,36 @@ static const upb_msglayout *const envoy_config_core_v3_ApiConfigSource_submsgs[3 }; static const upb_msglayout_field envoy_config_core_v3_ApiConfigSource__fields[8] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(28, 40), 0, 0, 9, 3}, - {3, UPB_SIZE(16, 16), 1, 2, 11, 1}, - {4, UPB_SIZE(32, 48), 0, 0, 11, 3}, - {5, UPB_SIZE(20, 24), 2, 2, 11, 1}, - {6, UPB_SIZE(24, 32), 3, 1, 11, 1}, - {7, UPB_SIZE(12, 12), 0, 0, 8, 1}, - {8, UPB_SIZE(8, 8), 0, 0, 14, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(28, 40), 0, 0, 9, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(16, 16), 1, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 48), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(20, 24), 2, 2, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 32), 3, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(12, 12), 0, 0, 8, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_ApiConfigSource_msginit = { &envoy_config_core_v3_ApiConfigSource_submsgs[0], &envoy_config_core_v3_ApiConfigSource__fields[0], - UPB_SIZE(40, 56), 8, false, 255, + UPB_SIZE(40, 56), 8, false, 8, 255, }; const upb_msglayout envoy_config_core_v3_AggregatedConfigSource_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout_field envoy_config_core_v3_SelfConfigSource__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_SelfConfigSource_msginit = { NULL, &envoy_config_core_v3_SelfConfigSource__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_core_v3_RateLimitSettings_submsgs[2] = { @@ -65,14 +65,14 @@ static const upb_msglayout *const envoy_config_core_v3_RateLimitSettings_submsgs }; static const upb_msglayout_field envoy_config_core_v3_RateLimitSettings__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_RateLimitSettings_msginit = { &envoy_config_core_v3_RateLimitSettings_submsgs[0], &envoy_config_core_v3_RateLimitSettings__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_ConfigSource_submsgs[5] = { @@ -84,19 +84,19 @@ static const upb_msglayout *const envoy_config_core_v3_ConfigSource_submsgs[5] = }; static const upb_msglayout_field envoy_config_core_v3_ConfigSource__fields[7] = { - {1, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 9, 1}, - {2, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 1, 11, 1}, - {3, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 11, 1}, - {4, UPB_SIZE(8, 8), 1, 3, 11, 1}, - {5, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 2, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {7, UPB_SIZE(12, 16), 0, 4, 11, 3}, + {1, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 2, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(12, 16), 0, 4, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_ConfigSource_msginit = { &envoy_config_core_v3_ConfigSource_submsgs[0], &envoy_config_core_v3_ConfigSource__fields[0], - UPB_SIZE(32, 48), 7, false, 255, + UPB_SIZE(32, 48), 7, false, 7, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h index 1fc8534890..3388402b5f 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_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" @@ -70,13 +70,19 @@ UPB_INLINE envoy_config_core_v3_ApiConfigSource *envoy_config_core_v3_ApiConfigS UPB_INLINE envoy_config_core_v3_ApiConfigSource *envoy_config_core_v3_ApiConfigSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_ApiConfigSource *ret = envoy_config_core_v3_ApiConfigSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_ApiConfigSource *envoy_config_core_v3_ApiConfigSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_ApiConfigSource *ret = envoy_config_core_v3_ApiConfigSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_ApiConfigSource_serialize(const envoy_config_core_v3_ApiConfigSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_ApiConfigSource_msginit, arena, len); @@ -175,13 +181,19 @@ UPB_INLINE envoy_config_core_v3_AggregatedConfigSource *envoy_config_core_v3_Agg UPB_INLINE envoy_config_core_v3_AggregatedConfigSource *envoy_config_core_v3_AggregatedConfigSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_AggregatedConfigSource *ret = envoy_config_core_v3_AggregatedConfigSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_AggregatedConfigSource *envoy_config_core_v3_AggregatedConfigSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_AggregatedConfigSource *ret = envoy_config_core_v3_AggregatedConfigSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_AggregatedConfigSource_serialize(const envoy_config_core_v3_AggregatedConfigSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_AggregatedConfigSource_msginit, arena, len); @@ -197,13 +209,19 @@ UPB_INLINE envoy_config_core_v3_SelfConfigSource *envoy_config_core_v3_SelfConfi UPB_INLINE envoy_config_core_v3_SelfConfigSource *envoy_config_core_v3_SelfConfigSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_SelfConfigSource *ret = envoy_config_core_v3_SelfConfigSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_SelfConfigSource *envoy_config_core_v3_SelfConfigSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_SelfConfigSource *ret = envoy_config_core_v3_SelfConfigSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_SelfConfigSource_serialize(const envoy_config_core_v3_SelfConfigSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_SelfConfigSource_msginit, arena, len); @@ -223,13 +241,19 @@ UPB_INLINE envoy_config_core_v3_RateLimitSettings *envoy_config_core_v3_RateLimi UPB_INLINE envoy_config_core_v3_RateLimitSettings *envoy_config_core_v3_RateLimitSettings_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_RateLimitSettings *ret = envoy_config_core_v3_RateLimitSettings_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_RateLimitSettings *envoy_config_core_v3_RateLimitSettings_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_RateLimitSettings *ret = envoy_config_core_v3_RateLimitSettings_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_RateLimitSettings_serialize(const envoy_config_core_v3_RateLimitSettings *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_RateLimitSettings_msginit, arena, len); @@ -275,13 +299,19 @@ UPB_INLINE envoy_config_core_v3_ConfigSource *envoy_config_core_v3_ConfigSource_ UPB_INLINE envoy_config_core_v3_ConfigSource *envoy_config_core_v3_ConfigSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_ConfigSource *ret = envoy_config_core_v3_ConfigSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_ConfigSource *envoy_config_core_v3_ConfigSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_ConfigSource *ret = envoy_config_core_v3_ConfigSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_ConfigSource_serialize(const envoy_config_core_v3_ConfigSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_ConfigSource_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c index 3f89247a7a..9de7ac7460 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/event_service_config.upb.h" #include "envoy/config/core/v3/grpc_service.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,13 +21,13 @@ static const upb_msglayout *const envoy_config_core_v3_EventServiceConfig_submsg }; static const upb_msglayout_field envoy_config_core_v3_EventServiceConfig__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_EventServiceConfig_msginit = { &envoy_config_core_v3_EventServiceConfig_submsgs[0], &envoy_config_core_v3_EventServiceConfig__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h index 3069f4c3c7..25ae45e67a 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_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 envoy_config_core_v3_EventServiceConfig *envoy_config_core_v3_EventSe UPB_INLINE envoy_config_core_v3_EventServiceConfig *envoy_config_core_v3_EventServiceConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_EventServiceConfig *ret = envoy_config_core_v3_EventServiceConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_EventServiceConfig *envoy_config_core_v3_EventServiceConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_EventServiceConfig *ret = envoy_config_core_v3_EventServiceConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_EventServiceConfig_serialize(const envoy_config_core_v3_EventServiceConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_EventServiceConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c index 47b8b32ecb..beea24a4ab 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/extension.upb.h" #include "envoy/config/core/v3/config_source.upb.h" #include "google/protobuf/any.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const envoy_config_core_v3_TypedExtensionConfig_subm }; static const upb_msglayout_field envoy_config_core_v3_TypedExtensionConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_TypedExtensionConfig_msginit = { &envoy_config_core_v3_TypedExtensionConfig_submsgs[0], &envoy_config_core_v3_TypedExtensionConfig__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = { @@ -37,16 +37,16 @@ static const upb_msglayout *const envoy_config_core_v3_ExtensionConfigSource_sub }; static const upb_msglayout_field envoy_config_core_v3_ExtensionConfigSource__fields[4] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_ExtensionConfigSource_msginit = { &envoy_config_core_v3_ExtensionConfigSource_submsgs[0], &envoy_config_core_v3_ExtensionConfigSource__fields[0], - UPB_SIZE(16, 32), 4, false, 255, + UPB_SIZE(16, 32), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h index 8499bfc26c..613689c421 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_EXTENSION_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 envoy_config_core_v3_TypedExtensionConfig *envoy_config_core_v3_Typed UPB_INLINE envoy_config_core_v3_TypedExtensionConfig *envoy_config_core_v3_TypedExtensionConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_TypedExtensionConfig *ret = envoy_config_core_v3_TypedExtensionConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_TypedExtensionConfig *envoy_config_core_v3_TypedExtensionConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_TypedExtensionConfig *ret = envoy_config_core_v3_TypedExtensionConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_TypedExtensionConfig_serialize(const envoy_config_core_v3_TypedExtensionConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_TypedExtensionConfig_msginit, arena, len); @@ -81,13 +87,19 @@ UPB_INLINE envoy_config_core_v3_ExtensionConfigSource *envoy_config_core_v3_Exte UPB_INLINE envoy_config_core_v3_ExtensionConfigSource *envoy_config_core_v3_ExtensionConfigSource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_ExtensionConfigSource *ret = envoy_config_core_v3_ExtensionConfigSource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_ExtensionConfigSource *envoy_config_core_v3_ExtensionConfigSource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_ExtensionConfigSource *ret = envoy_config_core_v3_ExtensionConfigSource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_ExtensionConfigSource_serialize(const envoy_config_core_v3_ExtensionConfigSource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_ExtensionConfigSource_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c index b2e99df064..478c5acb15 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/grpc_service.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "google/protobuf/any.upb.h" @@ -30,27 +30,27 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_submsgs[4] = }; static const upb_msglayout_field envoy_config_core_v3_GrpcService__fields[4] = { - {1, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 0, 11, 1}, - {2, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 1, 11, 1}, - {3, UPB_SIZE(4, 8), 1, 3, 11, 1}, - {5, UPB_SIZE(8, 16), 0, 2, 11, 3}, + {1, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), 0, 2, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_GrpcService_msginit = { &envoy_config_core_v3_GrpcService_submsgs[0], &envoy_config_core_v3_GrpcService__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 3, 255, }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_EnvoyGrpc__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 envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit = { NULL, &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = { @@ -62,20 +62,20 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_su }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc__fields[8] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(28, 56), 1, 2, 11, 1}, - {3, UPB_SIZE(44, 88), 0, 0, 11, 3}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {5, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {6, UPB_SIZE(32, 64), 2, 3, 11, 1}, - {7, UPB_SIZE(36, 72), 3, 4, 11, 1}, - {8, UPB_SIZE(40, 80), 4, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(28, 56), 1, 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(44, 88), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(32, 64), 2, 3, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(36, 72), 3, 4, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(40, 80), 4, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0], - UPB_SIZE(48, 96), 8, false, 255, + UPB_SIZE(48, 96), 8, false, 8, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[1] = { @@ -83,21 +83,21 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ss }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { @@ -107,15 +107,15 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ch }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {3, 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), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = { @@ -127,41 +127,41 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ca }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[7] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 4, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 2, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 3, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 4, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 3, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0], - UPB_SIZE(16, 32), 7, false, 255, + UPB_SIZE(16, 32), 7, false, 7, 255, }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[2] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 4, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit = { NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__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 envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit = { NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = { @@ -169,32 +169,32 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ca }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[9] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 0, 0, 9, 1}, - {4, UPB_SIZE(24, 48), 0, 0, 9, 1}, - {5, UPB_SIZE(32, 64), 0, 0, 9, 1}, - {6, UPB_SIZE(40, 80), 0, 0, 9, 1}, - {7, UPB_SIZE(48, 96), 0, 0, 9, 1}, - {8, UPB_SIZE(56, 112), 0, 0, 9, 1}, - {9, UPB_SIZE(64, 128), 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}, + {3, UPB_SIZE(16, 32), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 48), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 64), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(40, 80), 0, 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(48, 96), 0, 0, 9, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(56, 112), 0, 0, 9, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(64, 128), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit = { NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[0], - UPB_SIZE(72, 144), 9, false, 255, + UPB_SIZE(72, 144), 9, false, 9, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = { @@ -202,24 +202,24 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ch }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__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 envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 3, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 3, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit = { NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = { @@ -227,14 +227,14 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcService_GoogleGrpc_Ch }; static const upb_msglayout_field envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_msginit = { &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h index dd9913debf..a59bdf0915 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_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" @@ -86,13 +86,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService *envoy_config_core_v3_GrpcService_ne UPB_INLINE envoy_config_core_v3_GrpcService *envoy_config_core_v3_GrpcService_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService *ret = envoy_config_core_v3_GrpcService_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService *envoy_config_core_v3_GrpcService_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService *ret = envoy_config_core_v3_GrpcService_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_serialize(const envoy_config_core_v3_GrpcService *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_msginit, arena, len); @@ -173,13 +179,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc *envoy_config_core_v3_Grpc UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc *envoy_config_core_v3_GrpcService_EnvoyGrpc_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_EnvoyGrpc *ret = envoy_config_core_v3_GrpcService_EnvoyGrpc_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_EnvoyGrpc *envoy_config_core_v3_GrpcService_EnvoyGrpc_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_EnvoyGrpc *ret = envoy_config_core_v3_GrpcService_EnvoyGrpc_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_EnvoyGrpc_serialize(const envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_EnvoyGrpc_msginit, arena, len); @@ -203,13 +215,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc *envoy_config_core_v3_Grp UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc *envoy_config_core_v3_GrpcService_GoogleGrpc_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc *envoy_config_core_v3_GrpcService_GoogleGrpc_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_msginit, arena, len); @@ -312,13 +330,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *envoy_con UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_msginit, arena, len); @@ -379,13 +403,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *e UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials_msginit, arena, len); @@ -401,13 +431,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *envoy UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_msginit, arena, len); @@ -473,13 +509,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *envoy_co UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_msginit, arena, len); @@ -587,13 +629,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAc UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_msginit, arena, len); @@ -617,13 +665,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAM UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_msginit, arena, len); @@ -647,13 +701,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataC UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_msginit, arena, len); @@ -693,13 +753,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsServic UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_msginit, arena, len); @@ -751,13 +817,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *envoy_config UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_msginit, arena, len); @@ -781,13 +853,19 @@ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *envoy_ UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *ret = envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_serialize(const envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c index b0a5a64288..a1cb228d30 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/health_check.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/event_service_config.upb.h" @@ -38,46 +38,46 @@ static const upb_msglayout *const envoy_config_core_v3_HealthCheck_submsgs[10] = }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck__fields[23] = { - {1, UPB_SIZE(20, 32), 1, 7, 11, 1}, - {2, UPB_SIZE(24, 40), 2, 7, 11, 1}, - {3, UPB_SIZE(28, 48), 3, 7, 11, 1}, - {4, UPB_SIZE(32, 56), 4, 9, 11, 1}, - {5, UPB_SIZE(36, 64), 5, 9, 11, 1}, - {6, UPB_SIZE(40, 72), 6, 9, 11, 1}, - {7, UPB_SIZE(44, 80), 7, 6, 11, 1}, - {8, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 3, 11, 1}, - {9, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 4, 11, 1}, - {11, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 2, 11, 1}, - {12, UPB_SIZE(48, 88), 8, 7, 11, 1}, - {13, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 1, 11, 1}, - {14, UPB_SIZE(52, 96), 9, 7, 11, 1}, - {15, UPB_SIZE(56, 104), 10, 7, 11, 1}, - {16, UPB_SIZE(60, 112), 11, 7, 11, 1}, - {17, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {18, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {19, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {20, UPB_SIZE(64, 120), 12, 7, 11, 1}, - {21, UPB_SIZE(68, 128), 13, 5, 11, 1}, - {22, UPB_SIZE(72, 136), 14, 0, 11, 1}, - {23, UPB_SIZE(76, 144), 15, 8, 11, 1}, - {24, UPB_SIZE(80, 152), 16, 7, 11, 1}, + {1, UPB_SIZE(20, 32), 1, 7, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 40), 2, 7, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 48), 3, 7, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 56), 4, 9, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(36, 64), 5, 9, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(40, 72), 6, 9, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(44, 80), 7, 6, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 3, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 4, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 2, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(48, 88), 8, 7, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 1, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(52, 96), 9, 7, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(56, 104), 10, 7, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(60, 112), 11, 7, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(64, 120), 12, 7, 11, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(68, 128), 13, 5, 11, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(72, 136), 14, 0, 11, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(76, 144), 15, 8, 11, _UPB_MODE_SCALAR}, + {24, UPB_SIZE(80, 152), 16, 7, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_msginit = { &envoy_config_core_v3_HealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck__fields[0], - UPB_SIZE(96, 176), 23, false, 255, + UPB_SIZE(96, 176), 23, false, 9, 255, }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_Payload__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_Payload_msginit = { NULL, &envoy_config_core_v3_HealthCheck_Payload__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[4] = { @@ -88,21 +88,21 @@ static const upb_msglayout *const envoy_config_core_v3_HealthCheck_HttpHealthChe }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[9] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(24, 40), 1, 1, 11, 1}, - {4, UPB_SIZE(28, 48), 2, 1, 11, 1}, - {6, UPB_SIZE(36, 64), 0, 0, 11, 3}, - {8, UPB_SIZE(40, 72), 0, 0, 9, 3}, - {9, UPB_SIZE(44, 80), 0, 3, 11, 3}, - {10, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {11, UPB_SIZE(32, 56), 3, 2, 11, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 40), 1, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 48), 2, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(36, 64), 0, 0, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(40, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(44, 80), 0, 3, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(32, 56), 3, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit = { &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0], - UPB_SIZE(48, 96), 9, false, 255, + UPB_SIZE(48, 96), 9, false, 4, 255, }; static const upb_msglayout *const envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[1] = { @@ -110,35 +110,35 @@ static const upb_msglayout *const envoy_config_core_v3_HealthCheck_TcpHealthChec }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit = { &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit = { NULL, &envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_GrpcHealthCheck__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 envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit = { NULL, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = { @@ -146,24 +146,24 @@ static const upb_msglayout *const envoy_config_core_v3_HealthCheck_CustomHealthC }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit = { &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_TlsOptions__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_TlsOptions_msginit = { NULL, &envoy_config_core_v3_HealthCheck_TlsOptions__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h index e4a803ab25..cc8b0f0da7 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_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" @@ -81,13 +81,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck *envoy_config_core_v3_HealthCheck_ne UPB_INLINE envoy_config_core_v3_HealthCheck *envoy_config_core_v3_HealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck *ret = envoy_config_core_v3_HealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck *envoy_config_core_v3_HealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck *ret = envoy_config_core_v3_HealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_serialize(const envoy_config_core_v3_HealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_msginit, arena, len); @@ -420,13 +426,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_Payload *envoy_config_core_v3_Health UPB_INLINE envoy_config_core_v3_HealthCheck_Payload *envoy_config_core_v3_HealthCheck_Payload_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_Payload *ret = envoy_config_core_v3_HealthCheck_Payload_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_Payload *envoy_config_core_v3_HealthCheck_Payload_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_Payload *ret = envoy_config_core_v3_HealthCheck_Payload_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_Payload_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_Payload_serialize(const envoy_config_core_v3_HealthCheck_Payload *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_Payload_msginit, arena, len); @@ -459,13 +471,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck *envoy_config_core_v UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck *envoy_config_core_v3_HealthCheck_HttpHealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_HttpHealthCheck *ret = envoy_config_core_v3_HealthCheck_HttpHealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_HttpHealthCheck *envoy_config_core_v3_HealthCheck_HttpHealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_HttpHealthCheck *ret = envoy_config_core_v3_HealthCheck_HttpHealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_HttpHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_HttpHealthCheck_msginit, arena, len); @@ -579,13 +597,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck *envoy_config_core_v3 UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck *envoy_config_core_v3_HealthCheck_TcpHealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_TcpHealthCheck *ret = envoy_config_core_v3_HealthCheck_TcpHealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_TcpHealthCheck *envoy_config_core_v3_HealthCheck_TcpHealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_TcpHealthCheck *ret = envoy_config_core_v3_HealthCheck_TcpHealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_TcpHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_TcpHealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_TcpHealthCheck_msginit, arena, len); @@ -631,13 +655,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck *envoy_config_core_ UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck *envoy_config_core_v3_HealthCheck_RedisHealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_RedisHealthCheck *ret = envoy_config_core_v3_HealthCheck_RedisHealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_RedisHealthCheck *envoy_config_core_v3_HealthCheck_RedisHealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_RedisHealthCheck *ret = envoy_config_core_v3_HealthCheck_RedisHealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_RedisHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_RedisHealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_RedisHealthCheck_msginit, arena, len); @@ -657,13 +687,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck *envoy_config_core_v UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck *envoy_config_core_v3_HealthCheck_GrpcHealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_GrpcHealthCheck *ret = envoy_config_core_v3_HealthCheck_GrpcHealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_GrpcHealthCheck *envoy_config_core_v3_HealthCheck_GrpcHealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_GrpcHealthCheck *ret = envoy_config_core_v3_HealthCheck_GrpcHealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_GrpcHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_GrpcHealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_msginit, arena, len); @@ -687,13 +723,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck *envoy_config_core UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck *envoy_config_core_v3_HealthCheck_CustomHealthCheck_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_CustomHealthCheck *ret = envoy_config_core_v3_HealthCheck_CustomHealthCheck_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_CustomHealthCheck *envoy_config_core_v3_HealthCheck_CustomHealthCheck_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_CustomHealthCheck *ret = envoy_config_core_v3_HealthCheck_CustomHealthCheck_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_CustomHealthCheck_serialize(const envoy_config_core_v3_HealthCheck_CustomHealthCheck *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_CustomHealthCheck_msginit, arena, len); @@ -733,13 +775,19 @@ UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions *envoy_config_core_v3_Hea UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions *envoy_config_core_v3_HealthCheck_TlsOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HealthCheck_TlsOptions *ret = envoy_config_core_v3_HealthCheck_TlsOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HealthCheck_TlsOptions *envoy_config_core_v3_HealthCheck_TlsOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HealthCheck_TlsOptions *ret = envoy_config_core_v3_HealthCheck_TlsOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HealthCheck_TlsOptions_serialize(const envoy_config_core_v3_HealthCheck_TlsOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c index c39ebef4c8..840f6a80a5 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/http_uri.upb.h" #include "google/protobuf/duration.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,15 +21,15 @@ static const upb_msglayout *const envoy_config_core_v3_HttpUri_submsgs[1] = { }; static const upb_msglayout_field envoy_config_core_v3_HttpUri__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 9, 1}, - {3, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HttpUri_msginit = { &envoy_config_core_v3_HttpUri_submsgs[0], &envoy_config_core_v3_HttpUri__fields[0], - UPB_SIZE(32, 64), 3, false, 255, + UPB_SIZE(32, 64), 3, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h index c49eec1f99..3cb1ba2cdc 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_HTTP_URI_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 envoy_config_core_v3_HttpUri *envoy_config_core_v3_HttpUri_new(upb_ar UPB_INLINE envoy_config_core_v3_HttpUri *envoy_config_core_v3_HttpUri_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HttpUri *ret = envoy_config_core_v3_HttpUri_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HttpUri *envoy_config_core_v3_HttpUri_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HttpUri *ret = envoy_config_core_v3_HttpUri_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HttpUri_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HttpUri_serialize(const envoy_config_core_v3_HttpUri *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HttpUri_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c index 827de063c1..b1f1cd06dc 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/protocol.upb.h" #include "envoy/config/core/v3/extension.upb.h" #include "envoy/type/v3/percent.upb.h" @@ -23,7 +23,7 @@ const upb_msglayout envoy_config_core_v3_TcpProtocolOptions_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_core_v3_QuicProtocolOptions_submsgs[1] = { @@ -31,26 +31,26 @@ static const upb_msglayout *const envoy_config_core_v3_QuicProtocolOptions_subms }; static const upb_msglayout_field envoy_config_core_v3_QuicProtocolOptions__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_QuicProtocolOptions_msginit = { &envoy_config_core_v3_QuicProtocolOptions_submsgs[0], &envoy_config_core_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout_field envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit = { NULL, &envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[1] = { @@ -58,14 +58,14 @@ static const upb_msglayout *const envoy_config_core_v3_AlternateProtocolsCacheOp }; static const upb_msglayout_field envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit = { &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0], &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_HttpProtocolOptions_submsgs[2] = { @@ -74,18 +74,18 @@ static const upb_msglayout *const envoy_config_core_v3_HttpProtocolOptions_subms }; static const upb_msglayout_field envoy_config_core_v3_HttpProtocolOptions__fields[6] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(12, 16), 2, 1, 11, 1}, - {3, UPB_SIZE(16, 24), 3, 0, 11, 1}, - {4, UPB_SIZE(20, 32), 4, 0, 11, 1}, - {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {6, UPB_SIZE(24, 40), 5, 1, 11, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 3, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 32), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 40), 5, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_HttpProtocolOptions_msginit = { &envoy_config_core_v3_HttpProtocolOptions_submsgs[0], &envoy_config_core_v3_HttpProtocolOptions__fields[0], - UPB_SIZE(32, 48), 6, false, 255, + UPB_SIZE(32, 48), 6, false, 6, 255, }; static const upb_msglayout *const envoy_config_core_v3_Http1ProtocolOptions_submsgs[2] = { @@ -94,19 +94,19 @@ static const upb_msglayout *const envoy_config_core_v3_Http1ProtocolOptions_subm }; static const upb_msglayout_field envoy_config_core_v3_Http1ProtocolOptions__fields[7] = { - {1, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(16, 32), 2, 0, 11, 1}, - {5, UPB_SIZE(2, 2), 0, 0, 8, 1}, - {6, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {7, UPB_SIZE(20, 40), 3, 1, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(20, 40), 3, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_msginit = { &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions__fields[0], - UPB_SIZE(24, 48), 7, false, 255, + UPB_SIZE(24, 48), 7, false, 7, 255, }; static const upb_msglayout *const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = { @@ -115,20 +115,20 @@ static const upb_msglayout *const envoy_config_core_v3_Http1ProtocolOptions_Head }; static const upb_msglayout_field envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit = { &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 1, 255, }; const upb_msglayout envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_core_v3_KeepaliveSettings_submsgs[2] = { @@ -137,16 +137,16 @@ static const upb_msglayout *const envoy_config_core_v3_KeepaliveSettings_submsgs }; static const upb_msglayout_field envoy_config_core_v3_KeepaliveSettings__fields[4] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_KeepaliveSettings_msginit = { &envoy_config_core_v3_KeepaliveSettings_submsgs[0], &envoy_config_core_v3_KeepaliveSettings__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_core_v3_Http2ProtocolOptions_submsgs[4] = { @@ -157,27 +157,27 @@ static const upb_msglayout *const envoy_config_core_v3_Http2ProtocolOptions_subm }; static const upb_msglayout_field envoy_config_core_v3_Http2ProtocolOptions__fields[15] = { - {1, UPB_SIZE(8, 8), 1, 3, 11, 1}, - {2, UPB_SIZE(12, 16), 2, 3, 11, 1}, - {3, UPB_SIZE(16, 24), 3, 3, 11, 1}, - {4, UPB_SIZE(20, 32), 4, 3, 11, 1}, - {5, UPB_SIZE(2, 2), 0, 0, 8, 1}, - {6, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {7, UPB_SIZE(24, 40), 5, 3, 11, 1}, - {8, UPB_SIZE(28, 48), 6, 3, 11, 1}, - {9, UPB_SIZE(32, 56), 7, 3, 11, 1}, - {10, UPB_SIZE(36, 64), 8, 3, 11, 1}, - {11, UPB_SIZE(40, 72), 9, 3, 11, 1}, - {12, UPB_SIZE(4, 4), 0, 0, 8, 1}, - {13, UPB_SIZE(52, 96), 0, 0, 11, 3}, - {14, UPB_SIZE(44, 80), 10, 2, 11, 1}, - {15, UPB_SIZE(48, 88), 11, 1, 11, 1}, + {1, UPB_SIZE(8, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 16), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 3, 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 32), 4, 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(24, 40), 5, 3, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(28, 48), 6, 3, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 56), 7, 3, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(36, 64), 8, 3, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(40, 72), 9, 3, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(52, 96), 0, 0, 11, _UPB_MODE_ARRAY}, + {14, UPB_SIZE(44, 80), 10, 2, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(48, 88), 11, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_msginit = { &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions__fields[0], - UPB_SIZE(56, 104), 15, false, 255, + UPB_SIZE(56, 104), 15, false, 15, 255, }; static const upb_msglayout *const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[1] = { @@ -185,14 +185,14 @@ static const upb_msglayout *const envoy_config_core_v3_Http2ProtocolOptions_Sett }; static const upb_msglayout_field envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit = { &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { @@ -200,13 +200,13 @@ static const upb_msglayout *const envoy_config_core_v3_GrpcProtocolOptions_subms }; static const upb_msglayout_field envoy_config_core_v3_GrpcProtocolOptions__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_GrpcProtocolOptions_msginit = { &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0], &envoy_config_core_v3_GrpcProtocolOptions__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { @@ -215,24 +215,24 @@ static const upb_msglayout *const envoy_config_core_v3_Http3ProtocolOptions_subm }; static const upb_msglayout_field envoy_config_core_v3_Http3ProtocolOptions__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_Http3ProtocolOptions_msginit = { &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http3ProtocolOptions__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_core_v3_SchemeHeaderTransformation__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_SchemeHeaderTransformation_msginit = { NULL, &envoy_config_core_v3_SchemeHeaderTransformation__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h index 8b277ef760..891459bdb9 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_PROTOCOL_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" @@ -88,13 +88,19 @@ UPB_INLINE envoy_config_core_v3_TcpProtocolOptions *envoy_config_core_v3_TcpProt UPB_INLINE envoy_config_core_v3_TcpProtocolOptions *envoy_config_core_v3_TcpProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_TcpProtocolOptions *ret = envoy_config_core_v3_TcpProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_TcpProtocolOptions *envoy_config_core_v3_TcpProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_TcpProtocolOptions *ret = envoy_config_core_v3_TcpProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_TcpProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_TcpProtocolOptions_serialize(const envoy_config_core_v3_TcpProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_TcpProtocolOptions_msginit, arena, len); @@ -110,13 +116,19 @@ UPB_INLINE envoy_config_core_v3_QuicProtocolOptions *envoy_config_core_v3_QuicPr UPB_INLINE envoy_config_core_v3_QuicProtocolOptions *envoy_config_core_v3_QuicProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_QuicProtocolOptions *ret = envoy_config_core_v3_QuicProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_QuicProtocolOptions *envoy_config_core_v3_QuicProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_QuicProtocolOptions *ret = envoy_config_core_v3_QuicProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_QuicProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_QuicProtocolOptions_serialize(const envoy_config_core_v3_QuicProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_QuicProtocolOptions_msginit, arena, len); @@ -177,13 +189,19 @@ UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions *envoy_config_core_v UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions *envoy_config_core_v3_UpstreamHttpProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_UpstreamHttpProtocolOptions *ret = envoy_config_core_v3_UpstreamHttpProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_UpstreamHttpProtocolOptions *envoy_config_core_v3_UpstreamHttpProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_UpstreamHttpProtocolOptions *ret = envoy_config_core_v3_UpstreamHttpProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_UpstreamHttpProtocolOptions_serialize(const envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, arena, len); @@ -207,13 +225,19 @@ UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions *envoy_config_cor UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions *envoy_config_core_v3_AlternateProtocolsCacheOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_AlternateProtocolsCacheOptions *ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_AlternateProtocolsCacheOptions *envoy_config_core_v3_AlternateProtocolsCacheOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_AlternateProtocolsCacheOptions *ret = envoy_config_core_v3_AlternateProtocolsCacheOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_AlternateProtocolsCacheOptions_serialize(const envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_AlternateProtocolsCacheOptions_msginit, arena, len); @@ -248,13 +272,19 @@ UPB_INLINE envoy_config_core_v3_HttpProtocolOptions *envoy_config_core_v3_HttpPr UPB_INLINE envoy_config_core_v3_HttpProtocolOptions *envoy_config_core_v3_HttpProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_HttpProtocolOptions *ret = envoy_config_core_v3_HttpProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_HttpProtocolOptions *envoy_config_core_v3_HttpProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_HttpProtocolOptions *ret = envoy_config_core_v3_HttpProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_HttpProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_HttpProtocolOptions_serialize(const envoy_config_core_v3_HttpProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_HttpProtocolOptions_msginit, arena, len); @@ -349,13 +379,19 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions *envoy_config_core_v3_Http1 UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions *envoy_config_core_v3_Http1ProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions *ret = envoy_config_core_v3_Http1ProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions *envoy_config_core_v3_Http1ProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions *ret = envoy_config_core_v3_Http1ProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http1ProtocolOptions_serialize(const envoy_config_core_v3_Http1ProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_msginit, arena, len); @@ -432,13 +468,19 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *envoy_conf UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_serialize(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_msginit, arena, len); @@ -489,13 +531,19 @@ UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseW UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords *ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords *ret = envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_serialize(const envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords_msginit, arena, len); @@ -511,13 +559,19 @@ UPB_INLINE envoy_config_core_v3_KeepaliveSettings *envoy_config_core_v3_Keepaliv UPB_INLINE envoy_config_core_v3_KeepaliveSettings *envoy_config_core_v3_KeepaliveSettings_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_KeepaliveSettings *ret = envoy_config_core_v3_KeepaliveSettings_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_KeepaliveSettings *envoy_config_core_v3_KeepaliveSettings_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_KeepaliveSettings *ret = envoy_config_core_v3_KeepaliveSettings_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_KeepaliveSettings_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_KeepaliveSettings_serialize(const envoy_config_core_v3_KeepaliveSettings *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_KeepaliveSettings_msginit, arena, len); @@ -593,13 +647,19 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions *envoy_config_core_v3_Http2 UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions *envoy_config_core_v3_Http2ProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http2ProtocolOptions *ret = envoy_config_core_v3_Http2ProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions *envoy_config_core_v3_Http2ProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http2ProtocolOptions *ret = envoy_config_core_v3_Http2ProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http2ProtocolOptions_serialize(const envoy_config_core_v3_Http2ProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_msginit, arena, len); @@ -807,13 +867,19 @@ UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *envoy_co UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *ret = envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *ret = envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_serialize(const envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, arena, len); @@ -859,13 +925,19 @@ UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions *envoy_config_core_v3_GrpcPr UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions *envoy_config_core_v3_GrpcProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_GrpcProtocolOptions *ret = envoy_config_core_v3_GrpcProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_GrpcProtocolOptions *envoy_config_core_v3_GrpcProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_GrpcProtocolOptions *ret = envoy_config_core_v3_GrpcProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_GrpcProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_GrpcProtocolOptions_serialize(const envoy_config_core_v3_GrpcProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_GrpcProtocolOptions_msginit, arena, len); @@ -896,13 +968,19 @@ UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3 UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3ProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_Http3ProtocolOptions *ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3ProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_Http3ProtocolOptions *ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_Http3ProtocolOptions_serialize(const envoy_config_core_v3_Http3ProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena, len); @@ -948,13 +1026,19 @@ UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation *envoy_config_core_v3 UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation *envoy_config_core_v3_SchemeHeaderTransformation_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_SchemeHeaderTransformation *ret = envoy_config_core_v3_SchemeHeaderTransformation_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation *envoy_config_core_v3_SchemeHeaderTransformation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_SchemeHeaderTransformation *ret = envoy_config_core_v3_SchemeHeaderTransformation_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_SchemeHeaderTransformation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_SchemeHeaderTransformation_serialize(const envoy_config_core_v3_SchemeHeaderTransformation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_SchemeHeaderTransformation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c index 4c56e07b7f..2cf1da392f 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/proxy_protocol.upb.h" #include "udpa/annotations/status.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field envoy_config_core_v3_ProxyProtocolConfig__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_ProxyProtocolConfig_msginit = { NULL, &envoy_config_core_v3_ProxyProtocolConfig__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h index bd56a644de..934ea95289 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig *envoy_config_core_v3_ProxyP UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig *envoy_config_core_v3_ProxyProtocolConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_ProxyProtocolConfig *ret = envoy_config_core_v3_ProxyProtocolConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_ProxyProtocolConfig *envoy_config_core_v3_ProxyProtocolConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_ProxyProtocolConfig *ret = envoy_config_core_v3_ProxyProtocolConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_ProxyProtocolConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_ProxyProtocolConfig_serialize(const envoy_config_core_v3_ProxyProtocolConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_ProxyProtocolConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c index 66b8a4ef79..7712482478 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/resolver.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "udpa/annotations/status.upb.h" @@ -16,14 +16,14 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_config_core_v3_DnsResolverOptions__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_DnsResolverOptions_msginit = { NULL, &envoy_config_core_v3_DnsResolverOptions__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = { @@ -32,14 +32,14 @@ static const upb_msglayout *const envoy_config_core_v3_DnsResolutionConfig_subms }; static const upb_msglayout_field envoy_config_core_v3_DnsResolutionConfig__fields[2] = { - {1, UPB_SIZE(8, 16), 0, 0, 11, 3}, - {2, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {1, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_DnsResolutionConfig_msginit = { &envoy_config_core_v3_DnsResolutionConfig_submsgs[0], &envoy_config_core_v3_DnsResolutionConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h index c86e29ed0a..e5afe57a3d 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_RESOLVER_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_config_core_v3_DnsResolverOptions *envoy_config_core_v3_DnsReso UPB_INLINE envoy_config_core_v3_DnsResolverOptions *envoy_config_core_v3_DnsResolverOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_DnsResolverOptions *ret = envoy_config_core_v3_DnsResolverOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_DnsResolverOptions *envoy_config_core_v3_DnsResolverOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_DnsResolverOptions *ret = envoy_config_core_v3_DnsResolverOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolverOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_DnsResolverOptions_serialize(const envoy_config_core_v3_DnsResolverOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_DnsResolverOptions_msginit, arena, len); @@ -68,13 +74,19 @@ UPB_INLINE envoy_config_core_v3_DnsResolutionConfig *envoy_config_core_v3_DnsRes UPB_INLINE envoy_config_core_v3_DnsResolutionConfig *envoy_config_core_v3_DnsResolutionConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_DnsResolutionConfig *ret = envoy_config_core_v3_DnsResolutionConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_DnsResolutionConfig *envoy_config_core_v3_DnsResolutionConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_DnsResolutionConfig *ret = envoy_config_core_v3_DnsResolutionConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_DnsResolutionConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_DnsResolutionConfig_serialize(const envoy_config_core_v3_DnsResolutionConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_DnsResolutionConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c index d4c2ea1400..b90e52d0a9 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/socket_option.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -16,18 +16,18 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_config_core_v3_SocketOption__fields[6] = { - {1, UPB_SIZE(20, 24), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {3, UPB_SIZE(8, 8), 0, 0, 3, 1}, - {4, UPB_SIZE(32, 40), UPB_SIZE(-41, -57), 0, 3, 1}, - {5, UPB_SIZE(32, 40), UPB_SIZE(-41, -57), 0, 12, 1}, - {6, UPB_SIZE(16, 16), 0, 0, 14, 1}, + {1, UPB_SIZE(20, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), 0, 0, 3, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 40), UPB_SIZE(-41, -57), 0, 3, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 40), UPB_SIZE(-41, -57), 0, 12, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(16, 16), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_SocketOption_msginit = { NULL, &envoy_config_core_v3_SocketOption__fields[0], - UPB_SIZE(48, 64), 6, false, 255, + UPB_SIZE(48, 64), 6, false, 6, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h index 0347443069..1437814967 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_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" @@ -39,13 +39,19 @@ UPB_INLINE envoy_config_core_v3_SocketOption *envoy_config_core_v3_SocketOption_ UPB_INLINE envoy_config_core_v3_SocketOption *envoy_config_core_v3_SocketOption_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_SocketOption *ret = envoy_config_core_v3_SocketOption_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_SocketOption *envoy_config_core_v3_SocketOption_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_SocketOption *ret = envoy_config_core_v3_SocketOption_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_SocketOption_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_SocketOption_serialize(const envoy_config_core_v3_SocketOption *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_SocketOption_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c index 17c92619de..cd4c6d2ab4 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/substitution_format_string.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/extension.upb.h" @@ -25,18 +25,18 @@ static const upb_msglayout *const envoy_config_core_v3_SubstitutionFormatString_ }; static const upb_msglayout_field envoy_config_core_v3_SubstitutionFormatString__fields[6] = { - {1, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 9, 1}, - {2, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 2, 11, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {4, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {5, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 11, 1}, - {6, UPB_SIZE(12, 24), 0, 1, 11, 3}, + {1, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(12, 24), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_core_v3_SubstitutionFormatString_msginit = { &envoy_config_core_v3_SubstitutionFormatString_submsgs[0], &envoy_config_core_v3_SubstitutionFormatString__fields[0], - UPB_SIZE(32, 64), 6, false, 255, + UPB_SIZE(32, 64), 6, false, 6, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h index 3f450e9ad1..be910ee6fb 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_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" @@ -39,13 +39,19 @@ UPB_INLINE envoy_config_core_v3_SubstitutionFormatString *envoy_config_core_v3_S UPB_INLINE envoy_config_core_v3_SubstitutionFormatString *envoy_config_core_v3_SubstitutionFormatString_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_SubstitutionFormatString *ret = envoy_config_core_v3_SubstitutionFormatString_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_SubstitutionFormatString *envoy_config_core_v3_SubstitutionFormatString_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_SubstitutionFormatString *ret = envoy_config_core_v3_SubstitutionFormatString_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_SubstitutionFormatString_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_SubstitutionFormatString_serialize(const envoy_config_core_v3_SubstitutionFormatString *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_SubstitutionFormatString_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c b/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c index cd01106ce8..33bc133c8d 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c +++ b/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/core/v3/udp_socket_config.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const envoy_config_core_v3_UdpSocketConfig_submsgs[2 }; static const upb_msglayout_field envoy_config_core_v3_UdpSocketConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_core_v3_UdpSocketConfig_msginit = { &envoy_config_core_v3_UdpSocketConfig_submsgs[0], &envoy_config_core_v3_UdpSocketConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h b/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h index e61e18dbaa..b8ab961245 100644 --- a/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h +++ b/src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_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 envoy_config_core_v3_UdpSocketConfig *envoy_config_core_v3_UdpSocketC UPB_INLINE envoy_config_core_v3_UdpSocketConfig *envoy_config_core_v3_UdpSocketConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_core_v3_UdpSocketConfig *ret = envoy_config_core_v3_UdpSocketConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_core_v3_UdpSocketConfig *envoy_config_core_v3_UdpSocketConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_core_v3_UdpSocketConfig *ret = envoy_config_core_v3_UdpSocketConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_core_v3_UdpSocketConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_core_v3_UdpSocketConfig_serialize(const envoy_config_core_v3_UdpSocketConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_core_v3_UdpSocketConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c index 3f9c789bf8..ea8353edb7 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/endpoint/v3/endpoint.upb.h" #include "envoy/config/endpoint/v3/endpoint_components.upb.h" #include "envoy/type/v3/percent.upb.h" @@ -26,16 +26,16 @@ static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterLoadAssignment__fields[4] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), 0, 2, 11, 3}, - {4, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {5, UPB_SIZE(20, 40), 0, 0, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 2, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 0, 11, _UPB_MODE_MAP}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_msginit = { &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 2, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = { @@ -45,15 +45,15 @@ static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[3] = { - {2, UPB_SIZE(12, 24), 0, 0, 11, 3}, - {3, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {4, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit = { &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 0, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = { @@ -61,14 +61,14 @@ static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit = { &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = { @@ -76,14 +76,14 @@ static const upb_msglayout *const envoy_config_endpoint_v3_ClusterLoadAssignment }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msginit = { &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h index c89e4a4572..b787ab6863 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_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" @@ -52,13 +52,19 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment *envoy_config_endpoint UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment *envoy_config_endpoint_v3_ClusterLoadAssignment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment *envoy_config_endpoint_v3_ClusterLoadAssignment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_ClusterLoadAssignment_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_msginit, arena, len); @@ -116,13 +122,19 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *envoy_config_e UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_msginit, arena, len); @@ -183,13 +195,19 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *e UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *ret = envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_serialize(const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c index f12e49bdaf..f120aafb12 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/endpoint/v3/endpoint_components.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" @@ -25,26 +25,26 @@ static const upb_msglayout *const envoy_config_endpoint_v3_Endpoint_submsgs[2] = }; static const upb_msglayout_field envoy_config_endpoint_v3_Endpoint__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(16, 32), 2, 1, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_Endpoint_msginit = { &envoy_config_endpoint_v3_Endpoint_submsgs[0], &envoy_config_endpoint_v3_Endpoint__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout_field envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 13, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit = { NULL, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { @@ -54,17 +54,17 @@ static const upb_msglayout *const envoy_config_endpoint_v3_LbEndpoint_submsgs[3] }; static const upb_msglayout_field envoy_config_endpoint_v3_LbEndpoint__fields[5] = { - {1, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 1, 11, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {3, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {4, UPB_SIZE(12, 16), 2, 2, 11, 1}, - {5, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 9, 1}, + {1, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 24), UPB_SIZE(-25, -41), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_LbEndpoint_msginit = { &envoy_config_endpoint_v3_LbEndpoint_submsgs[0], &envoy_config_endpoint_v3_LbEndpoint__fields[0], - UPB_SIZE(32, 48), 5, false, 255, + UPB_SIZE(32, 48), 5, false, 5, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[3] = { @@ -74,17 +74,17 @@ static const upb_msglayout *const envoy_config_endpoint_v3_LocalityLbEndpoints_s }; static const upb_msglayout_field envoy_config_endpoint_v3_LocalityLbEndpoints__fields[5] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(20, 32), 0, 1, 11, 3}, - {3, UPB_SIZE(12, 16), 2, 2, 11, 1}, - {5, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {6, UPB_SIZE(16, 24), 3, 2, 11, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 32), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(16, 24), 3, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_LocalityLbEndpoints_msginit = { &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0], - UPB_SIZE(24, 40), 5, false, 255, + UPB_SIZE(24, 40), 5, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h index b6ad981cac..6fddea4565 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_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" @@ -50,13 +50,19 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint *envoy_config_endpoint_v3_Endpoint_ UPB_INLINE envoy_config_endpoint_v3_Endpoint *envoy_config_endpoint_v3_Endpoint_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_Endpoint *ret = envoy_config_endpoint_v3_Endpoint_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_Endpoint *envoy_config_endpoint_v3_Endpoint_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_Endpoint *ret = envoy_config_endpoint_v3_Endpoint_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_Endpoint_serialize(const envoy_config_endpoint_v3_Endpoint *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_Endpoint_msginit, arena, len); @@ -106,13 +112,19 @@ UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *envoy_config_end UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *ret = envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *ret = envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_serialize(const envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_msginit, arena, len); @@ -136,13 +148,19 @@ UPB_INLINE envoy_config_endpoint_v3_LbEndpoint *envoy_config_endpoint_v3_LbEndpo UPB_INLINE envoy_config_endpoint_v3_LbEndpoint *envoy_config_endpoint_v3_LbEndpoint_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_LbEndpoint *ret = envoy_config_endpoint_v3_LbEndpoint_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_LbEndpoint *envoy_config_endpoint_v3_LbEndpoint_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_LbEndpoint *ret = envoy_config_endpoint_v3_LbEndpoint_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LbEndpoint_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_LbEndpoint_serialize(const envoy_config_endpoint_v3_LbEndpoint *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_LbEndpoint_msginit, arena, len); @@ -218,13 +236,19 @@ UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints *envoy_config_endpoint_v UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints *envoy_config_endpoint_v3_LocalityLbEndpoints_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_LocalityLbEndpoints *ret = envoy_config_endpoint_v3_LocalityLbEndpoints_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints *envoy_config_endpoint_v3_LocalityLbEndpoints_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_LocalityLbEndpoints *ret = envoy_config_endpoint_v3_LocalityLbEndpoints_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_LocalityLbEndpoints_serialize(const envoy_config_endpoint_v3_LocalityLbEndpoints *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_LocalityLbEndpoints_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c b/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c index 560826ed31..303f91e56e 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/endpoint/v3/load_report.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" @@ -26,20 +26,20 @@ static const upb_msglayout *const envoy_config_endpoint_v3_UpstreamLocalityStats }; static const upb_msglayout_field envoy_config_endpoint_v3_UpstreamLocalityStats__fields[8] = { - {1, UPB_SIZE(44, 48), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 4, 1}, - {3, UPB_SIZE(16, 16), 0, 0, 4, 1}, - {4, UPB_SIZE(24, 24), 0, 0, 4, 1}, - {5, UPB_SIZE(48, 56), 0, 1, 11, 3}, - {6, UPB_SIZE(40, 40), 0, 0, 13, 1}, - {7, UPB_SIZE(52, 64), 0, 2, 11, 3}, - {8, UPB_SIZE(32, 32), 0, 0, 4, 1}, + {1, UPB_SIZE(44, 48), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 0, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 24), 0, 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(48, 56), 0, 1, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(40, 40), 0, 0, 13, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(52, 64), 0, 2, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(32, 32), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_UpstreamLocalityStats_msginit = { &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0], - UPB_SIZE(56, 72), 8, false, 255, + UPB_SIZE(56, 72), 8, false, 8, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = { @@ -49,31 +49,31 @@ static const upb_msglayout *const envoy_config_endpoint_v3_UpstreamEndpointStats }; static const upb_msglayout_field envoy_config_endpoint_v3_UpstreamEndpointStats__fields[7] = { - {1, UPB_SIZE(40, 40), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 4, 1}, - {3, UPB_SIZE(16, 16), 0, 0, 4, 1}, - {4, UPB_SIZE(24, 24), 0, 0, 4, 1}, - {5, UPB_SIZE(48, 56), 0, 1, 11, 3}, - {6, UPB_SIZE(44, 48), 2, 2, 11, 1}, - {7, UPB_SIZE(32, 32), 0, 0, 4, 1}, + {1, UPB_SIZE(40, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 0, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 24), 0, 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(48, 56), 0, 1, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(44, 48), 2, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(32, 32), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_UpstreamEndpointStats_msginit = { &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0], - UPB_SIZE(56, 64), 7, false, 255, + UPB_SIZE(56, 64), 7, false, 7, 255, }; static const upb_msglayout_field envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[3] = { - {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 4, 1}, - {3, UPB_SIZE(8, 8), 0, 0, 1, 1}, + {1, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit = { NULL, &envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[0], - UPB_SIZE(24, 32), 3, false, 255, + UPB_SIZE(24, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_endpoint_v3_ClusterStats_submsgs[3] = { @@ -83,29 +83,29 @@ static const upb_msglayout *const envoy_config_endpoint_v3_ClusterStats_submsgs[ }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterStats__fields[6] = { - {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(36, 56), 0, 1, 11, 3}, - {3, UPB_SIZE(8, 8), 0, 0, 4, 1}, - {4, UPB_SIZE(32, 48), 1, 2, 11, 1}, - {5, UPB_SIZE(40, 64), 0, 0, 11, 3}, - {6, UPB_SIZE(24, 32), 0, 0, 9, 1}, + {1, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(36, 56), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(8, 8), 0, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 48), 1, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 64), 0, 0, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(24, 32), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterStats_msginit = { &envoy_config_endpoint_v3_ClusterStats_submsgs[0], &envoy_config_endpoint_v3_ClusterStats__fields[0], - UPB_SIZE(48, 80), 6, false, 255, + UPB_SIZE(48, 80), 6, false, 6, 255, }; static const upb_msglayout_field envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[2] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 4, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit = { NULL, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h b/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h index d986e18240..0819b4a1b1 100644 --- a/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h +++ b/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ #define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_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" @@ -53,13 +53,19 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats *envoy_config_endpoint UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats *envoy_config_endpoint_v3_UpstreamLocalityStats_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_UpstreamLocalityStats *ret = envoy_config_endpoint_v3_UpstreamLocalityStats_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats *envoy_config_endpoint_v3_UpstreamLocalityStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_UpstreamLocalityStats *ret = envoy_config_endpoint_v3_UpstreamLocalityStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_UpstreamLocalityStats_serialize(const envoy_config_endpoint_v3_UpstreamLocalityStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_UpstreamLocalityStats_msginit, arena, len); @@ -140,13 +146,19 @@ UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats *envoy_config_endpoint UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats *envoy_config_endpoint_v3_UpstreamEndpointStats_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_UpstreamEndpointStats *ret = envoy_config_endpoint_v3_UpstreamEndpointStats_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats *envoy_config_endpoint_v3_UpstreamEndpointStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_UpstreamEndpointStats *ret = envoy_config_endpoint_v3_UpstreamEndpointStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_UpstreamEndpointStats_serialize(const envoy_config_endpoint_v3_UpstreamEndpointStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_UpstreamEndpointStats_msginit, arena, len); @@ -223,13 +235,19 @@ UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats *envoy_config_endpoi UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats *envoy_config_endpoint_v3_EndpointLoadMetricStats_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_EndpointLoadMetricStats *ret = envoy_config_endpoint_v3_EndpointLoadMetricStats_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats *envoy_config_endpoint_v3_EndpointLoadMetricStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_EndpointLoadMetricStats *ret = envoy_config_endpoint_v3_EndpointLoadMetricStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_EndpointLoadMetricStats_serialize(const envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_EndpointLoadMetricStats_msginit, arena, len); @@ -257,13 +275,19 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats *envoy_config_endpoint_v3_Clust UPB_INLINE envoy_config_endpoint_v3_ClusterStats *envoy_config_endpoint_v3_ClusterStats_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_ClusterStats *ret = envoy_config_endpoint_v3_ClusterStats_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_ClusterStats *envoy_config_endpoint_v3_ClusterStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_ClusterStats *ret = envoy_config_endpoint_v3_ClusterStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_ClusterStats_serialize(const envoy_config_endpoint_v3_ClusterStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_ClusterStats_msginit, arena, len); @@ -336,13 +360,19 @@ UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests *envoy_config_e UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests *envoy_config_endpoint_v3_ClusterStats_DroppedRequests_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_endpoint_v3_ClusterStats_DroppedRequests *ret = envoy_config_endpoint_v3_ClusterStats_DroppedRequests_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_endpoint_v3_ClusterStats_DroppedRequests *envoy_config_endpoint_v3_ClusterStats_DroppedRequests_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_endpoint_v3_ClusterStats_DroppedRequests *ret = envoy_config_endpoint_v3_ClusterStats_DroppedRequests_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_endpoint_v3_ClusterStats_DroppedRequests_serialize(const envoy_config_endpoint_v3_ClusterStats_DroppedRequests *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c index e016fffa22..0c19654923 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/listener/v3/api_listener.upb.h" #include "google/protobuf/any.upb.h" #include "udpa/annotations/status.upb.h" @@ -20,13 +20,13 @@ static const upb_msglayout *const envoy_config_listener_v3_ApiListener_submsgs[1 }; static const upb_msglayout_field envoy_config_listener_v3_ApiListener__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_ApiListener_msginit = { &envoy_config_listener_v3_ApiListener_submsgs[0], &envoy_config_listener_v3_ApiListener__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h b/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h index 9d1372b4e8..ba821ff9d1 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_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 envoy_config_listener_v3_ApiListener *envoy_config_listener_v3_ApiLis UPB_INLINE envoy_config_listener_v3_ApiListener *envoy_config_listener_v3_ApiListener_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ApiListener *ret = envoy_config_listener_v3_ApiListener_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ApiListener *envoy_config_listener_v3_ApiListener_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ApiListener *ret = envoy_config_listener_v3_ApiListener_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ApiListener_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ApiListener_serialize(const envoy_config_listener_v3_ApiListener *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ApiListener_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c index a75126bb58..ad006ed69a 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/listener/v3/listener.upb.h" #include "envoy/config/accesslog/v3/accesslog.upb.h" #include "envoy/config/core/v3/address.upb.h" @@ -32,13 +32,13 @@ static const upb_msglayout *const envoy_config_listener_v3_ListenerCollection_su }; static const upb_msglayout_field envoy_config_listener_v3_ListenerCollection__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_listener_v3_ListenerCollection_msginit = { &envoy_config_listener_v3_ListenerCollection_submsgs[0], &envoy_config_listener_v3_ListenerCollection__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_Listener_submsgs[14] = { @@ -59,39 +59,39 @@ static const upb_msglayout *const envoy_config_listener_v3_Listener_submsgs[14] }; static const upb_msglayout_field envoy_config_listener_v3_Listener__fields[27] = { - {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(32, 48), 1, 1, 11, 1}, - {3, UPB_SIZE(96, 176), 0, 5, 11, 3}, - {4, UPB_SIZE(36, 56), 2, 11, 11, 1}, - {5, UPB_SIZE(40, 64), 3, 13, 11, 1}, - {6, UPB_SIZE(44, 72), 4, 2, 11, 1}, - {7, UPB_SIZE(48, 80), 5, 7, 11, 1}, - {8, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {9, UPB_SIZE(100, 184), 0, 9, 11, 3}, - {10, UPB_SIZE(52, 88), 6, 11, 11, 1}, - {11, UPB_SIZE(56, 96), 7, 11, 11, 1}, - {12, UPB_SIZE(60, 104), 8, 13, 11, 1}, - {13, UPB_SIZE(104, 192), 0, 3, 11, 3}, - {15, UPB_SIZE(64, 112), 9, 12, 11, 1}, - {16, UPB_SIZE(8, 8), 0, 0, 14, 1}, - {17, UPB_SIZE(12, 12), 0, 0, 8, 1}, - {18, UPB_SIZE(68, 120), 10, 10, 11, 1}, - {19, UPB_SIZE(72, 128), 11, 4, 11, 1}, - {20, UPB_SIZE(76, 136), 12, 6, 11, 1}, - {21, UPB_SIZE(13, 13), 0, 0, 8, 1}, - {22, UPB_SIZE(108, 200), 0, 0, 11, 3}, - {24, UPB_SIZE(80, 144), 13, 13, 11, 1}, - {25, UPB_SIZE(84, 152), 14, 5, 11, 1}, - {26, UPB_SIZE(88, 160), 15, 11, 11, 1}, - {27, UPB_SIZE(112, 208), UPB_SIZE(-117, -217), 8, 11, 1}, - {28, UPB_SIZE(24, 32), 0, 0, 9, 1}, - {29, UPB_SIZE(92, 168), 16, 11, 11, 1}, + {1, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 48), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(96, 176), 0, 5, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(36, 56), 2, 11, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 64), 3, 13, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(44, 72), 4, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(48, 80), 5, 7, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(100, 184), 0, 9, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(52, 88), 6, 11, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(56, 96), 7, 11, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(60, 104), 8, 13, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(104, 192), 0, 3, 11, _UPB_MODE_ARRAY}, + {15, UPB_SIZE(64, 112), 9, 12, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(12, 12), 0, 0, 8, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(68, 120), 10, 10, 11, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(72, 128), 11, 4, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(76, 136), 12, 6, 11, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(13, 13), 0, 0, 8, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(108, 200), 0, 0, 11, _UPB_MODE_ARRAY}, + {24, UPB_SIZE(80, 144), 13, 13, 11, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(84, 152), 14, 5, 11, _UPB_MODE_SCALAR}, + {26, UPB_SIZE(88, 160), 15, 11, 11, _UPB_MODE_SCALAR}, + {27, UPB_SIZE(112, 208), UPB_SIZE(-117, -217), 8, 11, _UPB_MODE_SCALAR}, + {28, UPB_SIZE(24, 32), 0, 0, 9, _UPB_MODE_SCALAR}, + {29, UPB_SIZE(92, 168), 16, 11, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_Listener_msginit = { &envoy_config_listener_v3_Listener_submsgs[0], &envoy_config_listener_v3_Listener__fields[0], - UPB_SIZE(120, 224), 27, false, 255, + UPB_SIZE(120, 224), 27, false, 13, 255, }; static const upb_msglayout *const envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = { @@ -99,13 +99,13 @@ static const upb_msglayout *const envoy_config_listener_v3_Listener_DeprecatedV1 }; static const upb_msglayout_field envoy_config_listener_v3_Listener_DeprecatedV1__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_Listener_DeprecatedV1_msginit = { &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0], &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[1] = { @@ -113,25 +113,25 @@ static const upb_msglayout *const envoy_config_listener_v3_Listener_ConnectionBa }; static const upb_msglayout_field envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit = { &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0], &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; const upb_msglayout envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_config_listener_v3_Listener_InternalListenerConfig_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h b/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h index 56a7f7c690..3842168355 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_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" @@ -77,13 +77,19 @@ UPB_INLINE envoy_config_listener_v3_ListenerCollection *envoy_config_listener_v3 UPB_INLINE envoy_config_listener_v3_ListenerCollection *envoy_config_listener_v3_ListenerCollection_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ListenerCollection *ret = envoy_config_listener_v3_ListenerCollection_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ListenerCollection *envoy_config_listener_v3_ListenerCollection_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ListenerCollection *ret = envoy_config_listener_v3_ListenerCollection_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerCollection_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ListenerCollection_serialize(const envoy_config_listener_v3_ListenerCollection *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ListenerCollection_msginit, arena, len); @@ -114,13 +120,19 @@ UPB_INLINE envoy_config_listener_v3_Listener *envoy_config_listener_v3_Listener_ UPB_INLINE envoy_config_listener_v3_Listener *envoy_config_listener_v3_Listener_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Listener *ret = envoy_config_listener_v3_Listener_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Listener *envoy_config_listener_v3_Listener_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Listener *ret = envoy_config_listener_v3_Listener_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Listener_serialize(const envoy_config_listener_v3_Listener *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Listener_msginit, arena, len); @@ -480,13 +492,19 @@ UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1 *envoy_config_listener UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1 *envoy_config_listener_v3_Listener_DeprecatedV1_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Listener_DeprecatedV1 *ret = envoy_config_listener_v3_Listener_DeprecatedV1_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Listener_DeprecatedV1 *envoy_config_listener_v3_Listener_DeprecatedV1_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Listener_DeprecatedV1 *ret = envoy_config_listener_v3_Listener_DeprecatedV1_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_DeprecatedV1_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Listener_DeprecatedV1_serialize(const envoy_config_listener_v3_Listener_DeprecatedV1 *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Listener_DeprecatedV1_msginit, arena, len); @@ -517,13 +535,19 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig *envoy_conf UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Listener_ConnectionBalanceConfig *ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Listener_ConnectionBalanceConfig *ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_serialize(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_msginit, arena, len); @@ -559,13 +583,19 @@ UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalanc UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance *ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance *ret = envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_serialize(const envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, arena, len); @@ -581,13 +611,19 @@ UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig *envoy_confi UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig *envoy_config_listener_v3_Listener_InternalListenerConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Listener_InternalListenerConfig *ret = envoy_config_listener_v3_Listener_InternalListenerConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Listener_InternalListenerConfig *envoy_config_listener_v3_Listener_InternalListenerConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Listener_InternalListenerConfig *ret = envoy_config_listener_v3_Listener_InternalListenerConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Listener_InternalListenerConfig_serialize(const envoy_config_listener_v3_Listener_InternalListenerConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Listener_InternalListenerConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c index e31eab43b4..dda5ed7d67 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/listener/v3/listener_components.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" @@ -29,15 +29,15 @@ static const upb_msglayout *const envoy_config_listener_v3_Filter_submsgs[2] = { }; static const upb_msglayout_field envoy_config_listener_v3_Filter__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_Filter_msginit = { &envoy_config_listener_v3_Filter_submsgs[0], &envoy_config_listener_v3_Filter__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_FilterChainMatch_submsgs[2] = { @@ -46,23 +46,23 @@ static const upb_msglayout *const envoy_config_listener_v3_FilterChainMatch_subm }; static const upb_msglayout_field envoy_config_listener_v3_FilterChainMatch__fields[11] = { - {3, UPB_SIZE(32, 56), 0, 0, 11, 3}, - {4, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {5, UPB_SIZE(24, 40), 1, 1, 11, 1}, - {6, UPB_SIZE(36, 64), 0, 0, 11, 3}, - {7, UPB_SIZE(40, 72), 0, 0, 13, _UPB_LABEL_PACKED}, - {8, UPB_SIZE(28, 48), 2, 1, 11, 1}, - {9, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {10, UPB_SIZE(44, 80), 0, 0, 9, 3}, - {11, UPB_SIZE(48, 88), 0, 0, 9, 3}, - {12, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {13, UPB_SIZE(52, 96), 0, 0, 11, 3}, + {3, UPB_SIZE(32, 56), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(24, 40), 1, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(36, 64), 0, 0, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(40, 72), 0, 0, 13, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {8, UPB_SIZE(28, 48), 2, 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(44, 80), 0, 0, 9, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(48, 88), 0, 0, 9, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(52, 96), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_listener_v3_FilterChainMatch_msginit = { &envoy_config_listener_v3_FilterChainMatch_submsgs[0], &envoy_config_listener_v3_FilterChainMatch__fields[0], - UPB_SIZE(56, 112), 11, false, 255, + UPB_SIZE(56, 112), 11, false, 0, 255, }; static const upb_msglayout *const envoy_config_listener_v3_FilterChain_submsgs[7] = { @@ -76,20 +76,20 @@ static const upb_msglayout *const envoy_config_listener_v3_FilterChain_submsgs[7 }; static const upb_msglayout_field envoy_config_listener_v3_FilterChain__fields[8] = { - {1, UPB_SIZE(12, 24), 1, 4, 11, 1}, - {3, UPB_SIZE(36, 72), 0, 2, 11, 3}, - {4, UPB_SIZE(16, 32), 2, 5, 11, 1}, - {5, UPB_SIZE(20, 40), 3, 0, 11, 1}, - {6, UPB_SIZE(24, 48), 4, 1, 11, 1}, - {7, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {8, UPB_SIZE(28, 56), 5, 3, 11, 1}, - {9, UPB_SIZE(32, 64), 6, 6, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 4, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(36, 72), 0, 2, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(16, 32), 2, 5, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 3, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 48), 4, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(28, 56), 5, 3, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 64), 6, 6, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_FilterChain_msginit = { &envoy_config_listener_v3_FilterChain_submsgs[0], &envoy_config_listener_v3_FilterChain__fields[0], - UPB_SIZE(40, 80), 8, false, 255, + UPB_SIZE(40, 80), 8, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = { @@ -97,13 +97,13 @@ static const upb_msglayout *const envoy_config_listener_v3_FilterChain_OnDemandC }; static const upb_msglayout_field envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit = { &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0], &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[3] = { @@ -113,17 +113,17 @@ static const upb_msglayout *const envoy_config_listener_v3_ListenerFilterChainMa }; static const upb_msglayout_field envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[5] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 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), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit = { &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0], - UPB_SIZE(8, 16), 5, false, 255, + UPB_SIZE(8, 16), 5, false, 5, 255, }; static const upb_msglayout *const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = { @@ -131,13 +131,13 @@ static const upb_msglayout *const envoy_config_listener_v3_ListenerFilterChainMa }; static const upb_msglayout_field envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit = { &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_listener_v3_ListenerFilter_submsgs[2] = { @@ -146,15 +146,15 @@ static const upb_msglayout *const envoy_config_listener_v3_ListenerFilter_submsg }; static const upb_msglayout_field envoy_config_listener_v3_ListenerFilter__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, 1}, - {4, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_ListenerFilter_msginit = { &envoy_config_listener_v3_ListenerFilter_submsgs[0], &envoy_config_listener_v3_ListenerFilter__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h b/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h index f8ff80885f..17afbdc227 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_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" @@ -75,13 +75,19 @@ UPB_INLINE envoy_config_listener_v3_Filter *envoy_config_listener_v3_Filter_new( UPB_INLINE envoy_config_listener_v3_Filter *envoy_config_listener_v3_Filter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_Filter *ret = envoy_config_listener_v3_Filter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_Filter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_Filter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_Filter *envoy_config_listener_v3_Filter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_Filter *ret = envoy_config_listener_v3_Filter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_Filter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_Filter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_Filter_serialize(const envoy_config_listener_v3_Filter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_Filter_msginit, arena, len); @@ -136,13 +142,19 @@ UPB_INLINE envoy_config_listener_v3_FilterChainMatch *envoy_config_listener_v3_F UPB_INLINE envoy_config_listener_v3_FilterChainMatch *envoy_config_listener_v3_FilterChainMatch_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_FilterChainMatch *ret = envoy_config_listener_v3_FilterChainMatch_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_FilterChainMatch *envoy_config_listener_v3_FilterChainMatch_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_FilterChainMatch *ret = envoy_config_listener_v3_FilterChainMatch_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChainMatch_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_FilterChainMatch_serialize(const envoy_config_listener_v3_FilterChainMatch *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_FilterChainMatch_msginit, arena, len); @@ -278,13 +290,19 @@ UPB_INLINE envoy_config_listener_v3_FilterChain *envoy_config_listener_v3_Filter UPB_INLINE envoy_config_listener_v3_FilterChain *envoy_config_listener_v3_FilterChain_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_FilterChain *ret = envoy_config_listener_v3_FilterChain_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_FilterChain *envoy_config_listener_v3_FilterChain_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_FilterChain *ret = envoy_config_listener_v3_FilterChain_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_FilterChain_serialize(const envoy_config_listener_v3_FilterChain *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_FilterChain_msginit, arena, len); @@ -409,13 +427,19 @@ UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration *envoy_con UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration *envoy_config_listener_v3_FilterChain_OnDemandConfiguration_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_FilterChain_OnDemandConfiguration *ret = envoy_config_listener_v3_FilterChain_OnDemandConfiguration_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_FilterChain_OnDemandConfiguration *envoy_config_listener_v3_FilterChain_OnDemandConfiguration_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_FilterChain_OnDemandConfiguration *ret = envoy_config_listener_v3_FilterChain_OnDemandConfiguration_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_FilterChain_OnDemandConfiguration_serialize(const envoy_config_listener_v3_FilterChain_OnDemandConfiguration *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, arena, len); @@ -446,13 +470,19 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate *envoy_con UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ListenerFilterChainMatchPredicate *ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ListenerFilterChainMatchPredicate *ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_serialize(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_msginit, arena, len); @@ -539,13 +569,19 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet * UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet *ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet *ret = envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_serialize(const envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit, arena, len); @@ -576,13 +612,19 @@ UPB_INLINE envoy_config_listener_v3_ListenerFilter *envoy_config_listener_v3_Lis UPB_INLINE envoy_config_listener_v3_ListenerFilter *envoy_config_listener_v3_ListenerFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ListenerFilter *ret = envoy_config_listener_v3_ListenerFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ListenerFilter *envoy_config_listener_v3_ListenerFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ListenerFilter *ret = envoy_config_listener_v3_ListenerFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ListenerFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ListenerFilter_serialize(const envoy_config_listener_v3_ListenerFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ListenerFilter_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c index 5ecd130fd3..7e3cdb0a84 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/listener/v3/quic_config.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/extension.upb.h" @@ -29,19 +29,19 @@ static const upb_msglayout *const envoy_config_listener_v3_QuicProtocolOptions_s }; static const upb_msglayout_field envoy_config_listener_v3_QuicProtocolOptions__fields[7] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 3, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 3, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 1, 11, 1}, - {5, UPB_SIZE(20, 40), 5, 4, 11, 1}, - {6, UPB_SIZE(24, 48), 6, 2, 11, 1}, - {7, UPB_SIZE(28, 56), 7, 2, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 5, 4, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 48), 6, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 56), 7, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_QuicProtocolOptions_msginit = { &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0], &envoy_config_listener_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(32, 64), 7, false, 255, + UPB_SIZE(32, 64), 7, false, 7, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h b/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h index a2fb916766..8a0f954c48 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_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" @@ -43,13 +43,19 @@ UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions *envoy_config_listener_v UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions *envoy_config_listener_v3_QuicProtocolOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_QuicProtocolOptions *ret = envoy_config_listener_v3_QuicProtocolOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_QuicProtocolOptions *envoy_config_listener_v3_QuicProtocolOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_QuicProtocolOptions *ret = envoy_config_listener_v3_QuicProtocolOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_QuicProtocolOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_QuicProtocolOptions_serialize(const envoy_config_listener_v3_QuicProtocolOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_QuicProtocolOptions_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c b/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c index 14dcdbfcd6..b34cac3a31 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/listener/v3/udp_listener_config.upb.h" #include "envoy/config/core/v3/udp_socket_config.upb.h" #include "envoy/config/listener/v3/quic_config.upb.h" @@ -22,20 +22,20 @@ static const upb_msglayout *const envoy_config_listener_v3_UdpListenerConfig_sub }; static const upb_msglayout_field envoy_config_listener_v3_UdpListenerConfig__fields[2] = { - {5, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {7, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {5, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_listener_v3_UdpListenerConfig_msginit = { &envoy_config_listener_v3_UdpListenerConfig_submsgs[0], &envoy_config_listener_v3_UdpListenerConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 0, 255, }; const upb_msglayout envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h b/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h index 7dc472dc22..0f284678c7 100644 --- a/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h +++ b/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ #define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_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 envoy_config_listener_v3_UdpListenerConfig *envoy_config_listener_v3_ UPB_INLINE envoy_config_listener_v3_UdpListenerConfig *envoy_config_listener_v3_UdpListenerConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_UdpListenerConfig *ret = envoy_config_listener_v3_UdpListenerConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_UdpListenerConfig *envoy_config_listener_v3_UdpListenerConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_UdpListenerConfig *ret = envoy_config_listener_v3_UdpListenerConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_UdpListenerConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_UdpListenerConfig_serialize(const envoy_config_listener_v3_UdpListenerConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_UdpListenerConfig_msginit, arena, len); @@ -92,13 +98,19 @@ UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig *envoy_config_lis UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig *envoy_config_listener_v3_ActiveRawUdpListenerConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_listener_v3_ActiveRawUdpListenerConfig *ret = envoy_config_listener_v3_ActiveRawUdpListenerConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_listener_v3_ActiveRawUdpListenerConfig *envoy_config_listener_v3_ActiveRawUdpListenerConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_listener_v3_ActiveRawUdpListenerConfig *ret = envoy_config_listener_v3_ActiveRawUdpListenerConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize(const envoy_config_listener_v3_ActiveRawUdpListenerConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c b/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c index 26d00f14ea..d92cf58aa3 100644 --- a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c +++ b/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/metrics/v3/stats.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/type/matcher/v3/string.upb.h" @@ -24,14 +24,14 @@ static const upb_msglayout *const envoy_config_metrics_v3_StatsSink_submsgs[1] = }; static const upb_msglayout_field envoy_config_metrics_v3_StatsSink__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_StatsSink_msginit = { &envoy_config_metrics_v3_StatsSink_submsgs[0], &envoy_config_metrics_v3_StatsSink__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_config_metrics_v3_StatsConfig_submsgs[4] = { @@ -42,16 +42,16 @@ static const upb_msglayout *const envoy_config_metrics_v3_StatsConfig_submsgs[4] }; static const upb_msglayout_field envoy_config_metrics_v3_StatsConfig__fields[4] = { - {1, UPB_SIZE(12, 24), 0, 2, 11, 3}, - {2, UPB_SIZE(4, 8), 1, 3, 11, 1}, - {3, UPB_SIZE(8, 16), 2, 1, 11, 1}, - {4, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {1, UPB_SIZE(12, 24), 0, 2, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_metrics_v3_StatsConfig_msginit = { &envoy_config_metrics_v3_StatsConfig_submsgs[0], &envoy_config_metrics_v3_StatsConfig__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_metrics_v3_StatsMatcher_submsgs[1] = { @@ -59,27 +59,27 @@ static const upb_msglayout *const envoy_config_metrics_v3_StatsMatcher_submsgs[1 }; static const upb_msglayout_field envoy_config_metrics_v3_StatsMatcher__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_StatsMatcher_msginit = { &envoy_config_metrics_v3_StatsMatcher_submsgs[0], &envoy_config_metrics_v3_StatsMatcher__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 3, 255, }; static const upb_msglayout_field envoy_config_metrics_v3_TagSpecifier__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_TagSpecifier_msginit = { NULL, &envoy_config_metrics_v3_TagSpecifier__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = { @@ -87,14 +87,14 @@ static const upb_msglayout *const envoy_config_metrics_v3_HistogramBucketSetting }; static const upb_msglayout_field envoy_config_metrics_v3_HistogramBucketSettings__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 1, _UPB_LABEL_PACKED}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 1, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, }; const upb_msglayout envoy_config_metrics_v3_HistogramBucketSettings_msginit = { &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0], &envoy_config_metrics_v3_HistogramBucketSettings__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_metrics_v3_StatsdSink_submsgs[1] = { @@ -102,15 +102,15 @@ static const upb_msglayout *const envoy_config_metrics_v3_StatsdSink_submsgs[1] }; static const upb_msglayout_field envoy_config_metrics_v3_StatsdSink__fields[3] = { - {1, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 11, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_StatsdSink_msginit = { &envoy_config_metrics_v3_StatsdSink_submsgs[0], &envoy_config_metrics_v3_StatsdSink__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = { @@ -119,25 +119,25 @@ static const upb_msglayout *const envoy_config_metrics_v3_DogStatsdSink_submsgs[ }; static const upb_msglayout_field envoy_config_metrics_v3_DogStatsdSink__fields[3] = { - {1, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_DogStatsdSink_msginit = { &envoy_config_metrics_v3_DogStatsdSink_submsgs[0], &envoy_config_metrics_v3_DogStatsdSink__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 1, 255, }; static const upb_msglayout_field envoy_config_metrics_v3_HystrixSink__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_metrics_v3_HystrixSink_msginit = { NULL, &envoy_config_metrics_v3_HystrixSink__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h b/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h index dab0415ed6..4172af8bcc 100644 --- a/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h +++ b/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ #define ENVOY_CONFIG_METRICS_V3_STATS_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" @@ -66,13 +66,19 @@ UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_ UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_StatsSink *ret = envoy_config_metrics_v3_StatsSink_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_StatsSink *ret = envoy_config_metrics_v3_StatsSink_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_StatsSink_serialize(const envoy_config_metrics_v3_StatsSink *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_StatsSink_msginit, arena, len); @@ -112,13 +118,19 @@ UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsCon UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_StatsConfig *ret = envoy_config_metrics_v3_StatsConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_StatsConfig *ret = envoy_config_metrics_v3_StatsConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_StatsConfig_serialize(const envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_StatsConfig_msginit, arena, len); @@ -194,13 +206,19 @@ UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMa UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_StatsMatcher *ret = envoy_config_metrics_v3_StatsMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_StatsMatcher *ret = envoy_config_metrics_v3_StatsMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_StatsMatcher_serialize(const envoy_config_metrics_v3_StatsMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_StatsMatcher_msginit, arena, len); @@ -257,13 +275,19 @@ UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpec UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpecifier_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_TagSpecifier *ret = envoy_config_metrics_v3_TagSpecifier_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpecifier_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_TagSpecifier *ret = envoy_config_metrics_v3_TagSpecifier_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_TagSpecifier_serialize(const envoy_config_metrics_v3_TagSpecifier *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_TagSpecifier_msginit, arena, len); @@ -300,13 +324,19 @@ UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics_v3_HistogramBucketSettings_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_HistogramBucketSettings *ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics_v3_HistogramBucketSettings_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_HistogramBucketSettings *ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_HistogramBucketSettings_serialize(const envoy_config_metrics_v3_HistogramBucketSettings *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena, len); @@ -348,13 +378,19 @@ UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSin UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSink_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_StatsdSink *ret = envoy_config_metrics_v3_StatsdSink_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSink_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_StatsdSink *ret = envoy_config_metrics_v3_StatsdSink_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_StatsdSink_serialize(const envoy_config_metrics_v3_StatsdSink *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_StatsdSink_msginit, arena, len); @@ -400,13 +436,19 @@ UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogSta UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogStatsdSink_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_DogStatsdSink *ret = envoy_config_metrics_v3_DogStatsdSink_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogStatsdSink_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_DogStatsdSink *ret = envoy_config_metrics_v3_DogStatsdSink_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_DogStatsdSink_serialize(const envoy_config_metrics_v3_DogStatsdSink *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena, len); @@ -461,13 +503,19 @@ UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixS UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixSink_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_metrics_v3_HystrixSink *ret = envoy_config_metrics_v3_HystrixSink_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixSink_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_metrics_v3_HystrixSink *ret = envoy_config_metrics_v3_HystrixSink_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_metrics_v3_HystrixSink_serialize(const envoy_config_metrics_v3_HystrixSink *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_metrics_v3_HystrixSink_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c b/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c index a306e71e8a..832d33985b 100644 --- a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c +++ b/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/overload/v3/overload.upb.h" #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/any.upb.h" @@ -23,35 +23,35 @@ static const upb_msglayout *const envoy_config_overload_v3_ResourceMonitor_subms }; static const upb_msglayout_field envoy_config_overload_v3_ResourceMonitor__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_ResourceMonitor_msginit = { &envoy_config_overload_v3_ResourceMonitor_submsgs[0], &envoy_config_overload_v3_ResourceMonitor__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout_field envoy_config_overload_v3_ThresholdTrigger__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_ThresholdTrigger_msginit = { NULL, &envoy_config_overload_v3_ThresholdTrigger__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_overload_v3_ScaledTrigger__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_ScaledTrigger_msginit = { NULL, &envoy_config_overload_v3_ScaledTrigger__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_overload_v3_Trigger_submsgs[2] = { @@ -60,15 +60,15 @@ static const upb_msglayout *const envoy_config_overload_v3_Trigger_submsgs[2] = }; static const upb_msglayout_field envoy_config_overload_v3_Trigger__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_Trigger_msginit = { &envoy_config_overload_v3_Trigger_submsgs[0], &envoy_config_overload_v3_Trigger__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = { @@ -76,13 +76,13 @@ static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadAc }; static const upb_msglayout_field envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit = { &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = { @@ -91,15 +91,15 @@ static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadAc }; static const upb_msglayout_field envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 1, 11, 1}, - {3, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit = { &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_overload_v3_OverloadAction_submsgs[2] = { @@ -108,15 +108,15 @@ static const upb_msglayout *const envoy_config_overload_v3_OverloadAction_submsg }; static const upb_msglayout_field envoy_config_overload_v3_OverloadAction__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_overload_v3_OverloadAction_msginit = { &envoy_config_overload_v3_OverloadAction_submsgs[0], &envoy_config_overload_v3_OverloadAction__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_overload_v3_OverloadManager_submsgs[3] = { @@ -126,15 +126,15 @@ static const upb_msglayout *const envoy_config_overload_v3_OverloadManager_subms }; static const upb_msglayout_field envoy_config_overload_v3_OverloadManager__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, - {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_overload_v3_OverloadManager_msginit = { &envoy_config_overload_v3_OverloadManager_submsgs[0], &envoy_config_overload_v3_OverloadManager__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h b/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h index d800aa9736..71baa8fcf4 100644 --- a/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h +++ b/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ #define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_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" @@ -67,13 +67,19 @@ UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_Re UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_ResourceMonitor_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_ResourceMonitor *ret = envoy_config_overload_v3_ResourceMonitor_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_ResourceMonitor_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_ResourceMonitor *ret = envoy_config_overload_v3_ResourceMonitor_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_ResourceMonitor_serialize(const envoy_config_overload_v3_ResourceMonitor *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_ResourceMonitor_msginit, arena, len); @@ -113,13 +119,19 @@ UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_T UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_ThresholdTrigger_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_ThresholdTrigger *ret = envoy_config_overload_v3_ThresholdTrigger_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_ThresholdTrigger_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_ThresholdTrigger *ret = envoy_config_overload_v3_ThresholdTrigger_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_ThresholdTrigger_serialize(const envoy_config_overload_v3_ThresholdTrigger *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena, len); @@ -139,13 +151,19 @@ UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_Scal UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_ScaledTrigger_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_ScaledTrigger *ret = envoy_config_overload_v3_ScaledTrigger_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_ScaledTrigger_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_ScaledTrigger *ret = envoy_config_overload_v3_ScaledTrigger_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_ScaledTrigger_serialize(const envoy_config_overload_v3_ScaledTrigger *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_ScaledTrigger_msginit, arena, len); @@ -169,13 +187,19 @@ UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_ne UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_Trigger *ret = envoy_config_overload_v3_Trigger_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_Trigger *ret = envoy_config_overload_v3_Trigger_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_Trigger_serialize(const envoy_config_overload_v3_Trigger *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_Trigger_msginit, arena, len); @@ -230,13 +254,19 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_confi UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_ScaleTimersOverloadActionConfig *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_ScaleTimersOverloadActionConfig *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena, len); @@ -267,13 +297,19 @@ UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer * UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena, len); @@ -328,13 +364,19 @@ UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_Ove UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_OverloadAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_OverloadAction *ret = envoy_config_overload_v3_OverloadAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_OverloadAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_OverloadAction *ret = envoy_config_overload_v3_OverloadAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_OverloadAction_serialize(const envoy_config_overload_v3_OverloadAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_OverloadAction_msginit, arena, len); @@ -384,13 +426,19 @@ UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_Ov UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_OverloadManager_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_overload_v3_OverloadManager *ret = envoy_config_overload_v3_OverloadManager_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_OverloadManager_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_overload_v3_OverloadManager *ret = envoy_config_overload_v3_OverloadManager_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_overload_v3_OverloadManager_serialize(const envoy_config_overload_v3_OverloadManager *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_overload_v3_OverloadManager_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c index d4c81d1a5e..ccecd64609 100644 --- a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c +++ b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/rbac/v3/rbac.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/route/v3/route_components.upb.h" @@ -29,14 +29,14 @@ static const upb_msglayout *const envoy_config_rbac_v3_RBAC_submsgs[1] = { }; static const upb_msglayout_field envoy_config_rbac_v3_RBAC__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_MAP}, }; const upb_msglayout envoy_config_rbac_v3_RBAC_msginit = { &envoy_config_rbac_v3_RBAC_submsgs[0], &envoy_config_rbac_v3_RBAC__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = { @@ -44,14 +44,14 @@ static const upb_msglayout *const envoy_config_rbac_v3_RBAC_PoliciesEntry_submsg }; static const upb_msglayout_field envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_rbac_v3_RBAC_PoliciesEntry_msginit = { &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0], &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Policy_submsgs[4] = { @@ -62,16 +62,16 @@ static const upb_msglayout *const envoy_config_rbac_v3_Policy_submsgs[4] = { }; static const upb_msglayout_field envoy_config_rbac_v3_Policy__fields[4] = { - {1, UPB_SIZE(12, 24), 0, 0, 11, 3}, - {2, UPB_SIZE(16, 32), 0, 1, 11, 3}, - {3, UPB_SIZE(4, 8), 1, 3, 11, 1}, - {4, UPB_SIZE(8, 16), 2, 2, 11, 1}, + {1, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(16, 32), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(4, 8), 1, 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), 2, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_rbac_v3_Policy_msginit = { &envoy_config_rbac_v3_Policy_submsgs[0], &envoy_config_rbac_v3_Policy__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Permission_submsgs[7] = { @@ -85,22 +85,22 @@ static const upb_msglayout *const envoy_config_rbac_v3_Permission_submsgs[7] = { }; static const upb_msglayout_field envoy_config_rbac_v3_Permission__fields[10] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 13, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, - {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 13, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_rbac_v3_Permission_msginit = { &envoy_config_rbac_v3_Permission_submsgs[0], &envoy_config_rbac_v3_Permission__fields[0], - UPB_SIZE(8, 16), 10, false, 255, + UPB_SIZE(8, 16), 10, false, 10, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Permission_Set_submsgs[1] = { @@ -108,13 +108,13 @@ static const upb_msglayout *const envoy_config_rbac_v3_Permission_Set_submsgs[1] }; static const upb_msglayout_field envoy_config_rbac_v3_Permission_Set__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_rbac_v3_Permission_Set_msginit = { &envoy_config_rbac_v3_Permission_Set_submsgs[0], &envoy_config_rbac_v3_Permission_Set__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Principal_submsgs[7] = { @@ -128,23 +128,23 @@ static const upb_msglayout *const envoy_config_rbac_v3_Principal_submsgs[7] = { }; static const upb_msglayout_field envoy_config_rbac_v3_Principal__fields[11] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, - {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {11, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_rbac_v3_Principal_msginit = { &envoy_config_rbac_v3_Principal_submsgs[0], &envoy_config_rbac_v3_Principal__fields[0], - UPB_SIZE(8, 16), 11, false, 255, + UPB_SIZE(8, 16), 11, false, 11, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Principal_Set_submsgs[1] = { @@ -152,13 +152,13 @@ static const upb_msglayout *const envoy_config_rbac_v3_Principal_Set_submsgs[1] }; static const upb_msglayout_field envoy_config_rbac_v3_Principal_Set__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_rbac_v3_Principal_Set_msginit = { &envoy_config_rbac_v3_Principal_Set_submsgs[0], &envoy_config_rbac_v3_Principal_Set__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = { @@ -166,13 +166,13 @@ static const upb_msglayout *const envoy_config_rbac_v3_Principal_Authenticated_s }; static const upb_msglayout_field envoy_config_rbac_v3_Principal_Authenticated__fields[1] = { - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_rbac_v3_Principal_Authenticated_msginit = { &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0], &envoy_config_rbac_v3_Principal_Authenticated__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h index befa31f625..e651df89f0 100644 --- a/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h +++ b/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ #define ENVOY_CONFIG_RBAC_V3_RBAC_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" @@ -74,13 +74,19 @@ UPB_INLINE envoy_config_rbac_v3_RBAC *envoy_config_rbac_v3_RBAC_new(upb_arena *a UPB_INLINE envoy_config_rbac_v3_RBAC *envoy_config_rbac_v3_RBAC_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_RBAC *ret = envoy_config_rbac_v3_RBAC_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_RBAC *envoy_config_rbac_v3_RBAC_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_RBAC *ret = envoy_config_rbac_v3_RBAC_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_RBAC_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_RBAC_serialize(const envoy_config_rbac_v3_RBAC *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_RBAC_msginit, arena, len); @@ -126,13 +132,19 @@ UPB_INLINE envoy_config_rbac_v3_Policy *envoy_config_rbac_v3_Policy_new(upb_aren UPB_INLINE envoy_config_rbac_v3_Policy *envoy_config_rbac_v3_Policy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Policy *ret = envoy_config_rbac_v3_Policy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Policy *envoy_config_rbac_v3_Policy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Policy *ret = envoy_config_rbac_v3_Policy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Policy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Policy_serialize(const envoy_config_rbac_v3_Policy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Policy_msginit, arena, len); @@ -208,13 +220,19 @@ UPB_INLINE envoy_config_rbac_v3_Permission *envoy_config_rbac_v3_Permission_new( UPB_INLINE envoy_config_rbac_v3_Permission *envoy_config_rbac_v3_Permission_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Permission *ret = envoy_config_rbac_v3_Permission_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Permission *envoy_config_rbac_v3_Permission_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Permission *ret = envoy_config_rbac_v3_Permission_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Permission_serialize(const envoy_config_rbac_v3_Permission *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Permission_msginit, arena, len); @@ -367,13 +385,19 @@ UPB_INLINE envoy_config_rbac_v3_Permission_Set *envoy_config_rbac_v3_Permission_ UPB_INLINE envoy_config_rbac_v3_Permission_Set *envoy_config_rbac_v3_Permission_Set_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Permission_Set *ret = envoy_config_rbac_v3_Permission_Set_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Permission_Set *envoy_config_rbac_v3_Permission_Set_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Permission_Set *ret = envoy_config_rbac_v3_Permission_Set_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Permission_Set_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Permission_Set_serialize(const envoy_config_rbac_v3_Permission_Set *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Permission_Set_msginit, arena, len); @@ -404,13 +428,19 @@ UPB_INLINE envoy_config_rbac_v3_Principal *envoy_config_rbac_v3_Principal_new(up UPB_INLINE envoy_config_rbac_v3_Principal *envoy_config_rbac_v3_Principal_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Principal *ret = envoy_config_rbac_v3_Principal_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Principal *envoy_config_rbac_v3_Principal_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Principal *ret = envoy_config_rbac_v3_Principal_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Principal_serialize(const envoy_config_rbac_v3_Principal *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Principal_msginit, arena, len); @@ -587,13 +617,19 @@ UPB_INLINE envoy_config_rbac_v3_Principal_Set *envoy_config_rbac_v3_Principal_Se UPB_INLINE envoy_config_rbac_v3_Principal_Set *envoy_config_rbac_v3_Principal_Set_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Principal_Set *ret = envoy_config_rbac_v3_Principal_Set_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Principal_Set *envoy_config_rbac_v3_Principal_Set_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Principal_Set *ret = envoy_config_rbac_v3_Principal_Set_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Set_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Principal_Set_serialize(const envoy_config_rbac_v3_Principal_Set *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Principal_Set_msginit, arena, len); @@ -624,13 +660,19 @@ UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated *envoy_config_rbac_v3_Pr UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated *envoy_config_rbac_v3_Principal_Authenticated_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_rbac_v3_Principal_Authenticated *ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_rbac_v3_Principal_Authenticated *envoy_config_rbac_v3_Principal_Authenticated_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_rbac_v3_Principal_Authenticated *ret = envoy_config_rbac_v3_Principal_Authenticated_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_rbac_v3_Principal_Authenticated_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_rbac_v3_Principal_Authenticated_serialize(const envoy_config_rbac_v3_Principal_Authenticated *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_rbac_v3_Principal_Authenticated_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c index d82eb1de41..4bd3447b67 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c +++ b/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/route/v3/route.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/config_source.upb.h" @@ -30,24 +30,24 @@ static const upb_msglayout *const envoy_config_route_v3_RouteConfiguration_subms }; static const upb_msglayout_field envoy_config_route_v3_RouteConfiguration__fields[12] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 48), 0, 3, 11, 3}, - {3, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {4, UPB_SIZE(32, 64), 0, 0, 11, 3}, - {5, UPB_SIZE(36, 72), 0, 0, 9, 3}, - {6, UPB_SIZE(40, 80), 0, 0, 11, 3}, - {7, UPB_SIZE(12, 24), 1, 4, 11, 1}, - {8, UPB_SIZE(44, 88), 0, 0, 9, 3}, - {9, UPB_SIZE(16, 32), 2, 2, 11, 1}, - {10, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {11, UPB_SIZE(20, 40), 3, 5, 11, 1}, - {12, UPB_SIZE(48, 96), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 48), 0, 3, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(28, 56), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(32, 64), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(36, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(40, 80), 0, 0, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(12, 24), 1, 4, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(44, 88), 0, 0, 9, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(16, 32), 2, 2, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(20, 40), 3, 5, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(48, 96), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_RouteConfiguration_msginit = { &envoy_config_route_v3_RouteConfiguration_submsgs[0], &envoy_config_route_v3_RouteConfiguration__fields[0], - UPB_SIZE(56, 112), 12, false, 255, + UPB_SIZE(56, 112), 12, false, 12, 255, }; static const upb_msglayout *const envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = { @@ -55,13 +55,13 @@ static const upb_msglayout *const envoy_config_route_v3_ClusterSpecifierPlugin_s }; static const upb_msglayout_field envoy_config_route_v3_ClusterSpecifierPlugin__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_ClusterSpecifierPlugin_msginit = { &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0], &envoy_config_route_v3_ClusterSpecifierPlugin__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_Vhds_submsgs[1] = { @@ -69,13 +69,13 @@ static const upb_msglayout *const envoy_config_route_v3_Vhds_submsgs[1] = { }; static const upb_msglayout_field envoy_config_route_v3_Vhds__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_Vhds_msginit = { &envoy_config_route_v3_Vhds_submsgs[0], &envoy_config_route_v3_Vhds__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h b/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h index af2ed7ea87..c9127c48a3 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h +++ b/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_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" @@ -51,13 +51,19 @@ UPB_INLINE envoy_config_route_v3_RouteConfiguration *envoy_config_route_v3_Route UPB_INLINE envoy_config_route_v3_RouteConfiguration *envoy_config_route_v3_RouteConfiguration_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteConfiguration *ret = envoy_config_route_v3_RouteConfiguration_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteConfiguration *envoy_config_route_v3_RouteConfiguration_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteConfiguration *ret = envoy_config_route_v3_RouteConfiguration_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteConfiguration_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteConfiguration_serialize(const envoy_config_route_v3_RouteConfiguration *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteConfiguration_msginit, arena, len); @@ -219,13 +225,19 @@ UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin *envoy_config_route_v3_C UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin *envoy_config_route_v3_ClusterSpecifierPlugin_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_ClusterSpecifierPlugin *ret = envoy_config_route_v3_ClusterSpecifierPlugin_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_ClusterSpecifierPlugin *envoy_config_route_v3_ClusterSpecifierPlugin_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_ClusterSpecifierPlugin *ret = envoy_config_route_v3_ClusterSpecifierPlugin_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_ClusterSpecifierPlugin_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_ClusterSpecifierPlugin_serialize(const envoy_config_route_v3_ClusterSpecifierPlugin *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_ClusterSpecifierPlugin_msginit, arena, len); @@ -256,13 +268,19 @@ UPB_INLINE envoy_config_route_v3_Vhds *envoy_config_route_v3_Vhds_new(upb_arena UPB_INLINE envoy_config_route_v3_Vhds *envoy_config_route_v3_Vhds_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_Vhds *ret = envoy_config_route_v3_Vhds_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_Vhds_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_Vhds_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_Vhds *envoy_config_route_v3_Vhds_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_Vhds *ret = envoy_config_route_v3_Vhds_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_Vhds_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_Vhds_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_Vhds_serialize(const envoy_config_route_v3_Vhds *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_Vhds_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c index ca05b29d7b..308a374702 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +++ b/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/route/v3/route_components.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/extension.upb.h" @@ -43,30 +43,30 @@ static const upb_msglayout *const envoy_config_route_v3_VirtualHost_submsgs[10] }; static const upb_msglayout_field envoy_config_route_v3_VirtualHost__fields[18] = { - {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(40, 72), 0, 0, 9, 3}, - {3, UPB_SIZE(44, 80), 0, 5, 11, 3}, - {4, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {5, UPB_SIZE(48, 88), 0, 6, 11, 3}, - {6, UPB_SIZE(52, 96), 0, 3, 11, 3}, - {7, UPB_SIZE(56, 104), 0, 0, 11, 3}, - {8, UPB_SIZE(20, 32), 1, 1, 11, 1}, - {10, UPB_SIZE(60, 112), 0, 0, 11, 3}, - {11, UPB_SIZE(64, 120), 0, 0, 9, 3}, - {13, UPB_SIZE(68, 128), 0, 0, 9, 3}, - {14, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {15, UPB_SIZE(72, 136), 0, 7, 11, _UPB_LABEL_MAP}, - {16, UPB_SIZE(24, 40), 2, 4, 11, 1}, - {17, UPB_SIZE(28, 48), 3, 2, 11, 1}, - {18, UPB_SIZE(32, 56), 4, 9, 11, 1}, - {19, UPB_SIZE(9, 9), 0, 0, 8, 1}, - {20, UPB_SIZE(36, 64), 5, 8, 11, 1}, + {1, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(40, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(44, 80), 0, 5, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(48, 88), 0, 6, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(52, 96), 0, 3, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 104), 0, 0, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(20, 32), 1, 1, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(60, 112), 0, 0, 11, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(64, 120), 0, 0, 9, _UPB_MODE_ARRAY}, + {13, UPB_SIZE(68, 128), 0, 0, 9, _UPB_MODE_ARRAY}, + {14, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(72, 136), 0, 7, 11, _UPB_MODE_MAP}, + {16, UPB_SIZE(24, 40), 2, 4, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(28, 48), 3, 2, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(32, 56), 4, 9, 11, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(9, 9), 0, 0, 8, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(36, 64), 5, 8, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_VirtualHost_msginit = { &envoy_config_route_v3_VirtualHost_submsgs[0], &envoy_config_route_v3_VirtualHost__fields[0], - UPB_SIZE(80, 144), 18, false, 255, + UPB_SIZE(80, 144), 18, false, 8, 255, }; static const upb_msglayout *const envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = { @@ -74,14 +74,14 @@ static const upb_msglayout *const envoy_config_route_v3_VirtualHost_TypedPerFilt }; static const upb_msglayout_field envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msginit = { &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_FilterAction_submsgs[1] = { @@ -89,13 +89,13 @@ static const upb_msglayout *const envoy_config_route_v3_FilterAction_submsgs[1] }; static const upb_msglayout_field envoy_config_route_v3_FilterAction__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_FilterAction_msginit = { &envoy_config_route_v3_FilterAction_submsgs[0], &envoy_config_route_v3_FilterAction__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_Route_submsgs[12] = { @@ -114,28 +114,28 @@ static const upb_msglayout *const envoy_config_route_v3_Route_submsgs[12] = { }; static const upb_msglayout_field envoy_config_route_v3_Route__fields[16] = { - {1, UPB_SIZE(12, 24), 1, 9, 11, 1}, - {2, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 8, 11, 1}, - {3, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 6, 11, 1}, - {4, UPB_SIZE(16, 32), 2, 1, 11, 1}, - {5, UPB_SIZE(20, 40), 3, 2, 11, 1}, - {7, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 3, 11, 1}, - {9, UPB_SIZE(32, 64), 0, 0, 11, 3}, - {10, UPB_SIZE(36, 72), 0, 0, 11, 3}, - {11, UPB_SIZE(40, 80), 0, 0, 9, 3}, - {12, UPB_SIZE(44, 88), 0, 0, 9, 3}, - {13, UPB_SIZE(48, 96), 0, 7, 11, _UPB_LABEL_MAP}, - {14, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {15, UPB_SIZE(24, 48), 4, 10, 11, 1}, - {16, UPB_SIZE(28, 56), 5, 11, 11, 1}, - {17, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 4, 11, 1}, - {18, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 5, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 9, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 8, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 6, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 3, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 3, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 64), 0, 0, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(36, 72), 0, 0, 11, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(40, 80), 0, 0, 9, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(44, 88), 0, 0, 9, _UPB_MODE_ARRAY}, + {13, UPB_SIZE(48, 96), 0, 7, 11, _UPB_MODE_MAP}, + {14, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(24, 48), 4, 10, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(28, 56), 5, 11, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 4, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(52, 104), UPB_SIZE(-57, -113), 5, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_Route_msginit = { &envoy_config_route_v3_Route_submsgs[0], &envoy_config_route_v3_Route__fields[0], - UPB_SIZE(64, 128), 16, false, 255, + UPB_SIZE(64, 128), 16, false, 5, 255, }; static const upb_msglayout *const envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = { @@ -143,14 +143,14 @@ static const upb_msglayout *const envoy_config_route_v3_Route_TypedPerFilterConf }; static const upb_msglayout_field envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_Route_TypedPerFilterConfigEntry_msginit = { &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_submsgs[2] = { @@ -159,15 +159,15 @@ static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_submsgs[ }; static const upb_msglayout_field envoy_config_route_v3_WeightedCluster__fields[3] = { - {1, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_WeightedCluster_msginit = { &envoy_config_route_v3_WeightedCluster_submsgs[0], &envoy_config_route_v3_WeightedCluster__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[4] = { @@ -178,21 +178,21 @@ static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_ClusterW }; static const upb_msglayout_field envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[9] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 3, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, - {4, UPB_SIZE(20, 40), 0, 0, 11, 3}, - {5, UPB_SIZE(24, 48), 0, 0, 11, 3}, - {6, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {9, UPB_SIZE(32, 64), 0, 0, 9, 3}, - {10, UPB_SIZE(36, 72), 0, 2, 11, _UPB_LABEL_MAP}, - {11, UPB_SIZE(40, 80), UPB_SIZE(-49, -97), 0, 9, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 40), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(24, 48), 0, 0, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(28, 56), 0, 0, 9, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(32, 64), 0, 0, 9, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(36, 72), 0, 2, 11, _UPB_MODE_MAP}, + {11, UPB_SIZE(40, 80), UPB_SIZE(-49, -97), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit = { &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0], - UPB_SIZE(56, 112), 9, false, 255, + UPB_SIZE(56, 112), 9, false, 6, 255, }; static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = { @@ -200,14 +200,14 @@ static const upb_msglayout *const envoy_config_route_v3_WeightedCluster_ClusterW }; static const upb_msglayout_field envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_msginit = { &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteMatch_submsgs[8] = { @@ -222,28 +222,28 @@ static const upb_msglayout *const envoy_config_route_v3_RouteMatch_submsgs[8] = }; static const upb_msglayout_field envoy_config_route_v3_RouteMatch__fields[10] = { - {1, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {2, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {4, UPB_SIZE(4, 8), 1, 7, 11, 1}, - {6, UPB_SIZE(20, 40), 0, 1, 11, 3}, - {7, UPB_SIZE(24, 48), 0, 2, 11, 3}, - {8, UPB_SIZE(8, 16), 2, 4, 11, 1}, - {9, UPB_SIZE(12, 24), 3, 0, 11, 1}, - {10, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 6, 11, 1}, - {11, UPB_SIZE(16, 32), 4, 5, 11, 1}, - {12, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 3, 11, 1}, + {1, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 8), 1, 7, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(20, 40), 0, 1, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(24, 48), 0, 2, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(8, 16), 2, 4, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 6, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(16, 32), 4, 5, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 3, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteMatch_msginit = { &envoy_config_route_v3_RouteMatch_submsgs[0], &envoy_config_route_v3_RouteMatch__fields[0], - UPB_SIZE(40, 80), 10, false, 255, + UPB_SIZE(40, 80), 10, false, 2, 255, }; const upb_msglayout envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[1] = { @@ -251,20 +251,20 @@ static const upb_msglayout *const envoy_config_route_v3_RouteMatch_TlsContextMat }; static const upb_msglayout_field envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit = { &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0], &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; const upb_msglayout envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_route_v3_CorsPolicy_submsgs[3] = { @@ -274,20 +274,20 @@ static const upb_msglayout *const envoy_config_route_v3_CorsPolicy_submsgs[3] = }; static const upb_msglayout_field envoy_config_route_v3_CorsPolicy__fields[8] = { - {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(28, 56), 0, 0, 9, 1}, - {6, UPB_SIZE(36, 72), 1, 2, 11, 1}, - {9, UPB_SIZE(48, 96), UPB_SIZE(-53, -105), 0, 11, 1}, - {10, UPB_SIZE(40, 80), 2, 0, 11, 1}, - {11, UPB_SIZE(44, 88), 0, 1, 11, 3}, + {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(28, 56), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(36, 72), 1, 2, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(48, 96), UPB_SIZE(-53, -105), 0, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(40, 80), 2, 0, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(44, 88), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_CorsPolicy_msginit = { &envoy_config_route_v3_CorsPolicy_submsgs[0], &envoy_config_route_v3_CorsPolicy__fields[0], - UPB_SIZE(56, 112), 8, false, 255, + UPB_SIZE(56, 112), 8, false, 0, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_submsgs[16] = { @@ -310,42 +310,42 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_submsgs[16] }; static const upb_msglayout_field envoy_config_route_v3_RouteAction__fields[30] = { - {1, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, 1}, - {2, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, 1}, - {3, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 10, 11, 1}, - {4, UPB_SIZE(24, 32), 1, 0, 11, 1}, - {5, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {6, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 0, 9, 1}, - {7, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 13, 11, 1}, - {8, UPB_SIZE(28, 40), 2, 14, 11, 1}, - {9, UPB_SIZE(32, 48), 3, 5, 11, 1}, - {11, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {13, UPB_SIZE(80, 144), 0, 4, 11, 3}, - {14, UPB_SIZE(36, 56), 4, 13, 11, 1}, - {15, UPB_SIZE(84, 152), 0, 6, 11, 3}, - {17, UPB_SIZE(40, 64), 5, 1, 11, 1}, - {20, UPB_SIZE(8, 8), 0, 0, 14, 1}, - {23, UPB_SIZE(44, 72), 6, 14, 11, 1}, - {24, UPB_SIZE(48, 80), 7, 14, 11, 1}, - {25, UPB_SIZE(88, 160), 0, 9, 11, 3}, - {26, UPB_SIZE(12, 12), 0, 0, 14, 1}, - {27, UPB_SIZE(52, 88), 8, 2, 11, 1}, - {28, UPB_SIZE(56, 96), 9, 14, 11, 1}, - {29, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 0, 9, 1}, - {30, UPB_SIZE(92, 168), 0, 8, 11, 3}, - {31, UPB_SIZE(60, 104), 10, 15, 11, 1}, - {32, UPB_SIZE(64, 112), 11, 11, 11, 1}, - {33, UPB_SIZE(68, 120), 12, 12, 11, 1}, - {34, UPB_SIZE(72, 128), 13, 3, 11, 1}, - {35, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 11, 11, 1}, - {36, UPB_SIZE(76, 136), 14, 7, 11, 1}, - {37, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, 1}, + {1, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 10, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 32), 1, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 13, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(28, 40), 2, 14, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 48), 3, 5, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(80, 144), 0, 4, 11, _UPB_MODE_ARRAY}, + {14, UPB_SIZE(36, 56), 4, 13, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(84, 152), 0, 6, 11, _UPB_MODE_ARRAY}, + {17, UPB_SIZE(40, 64), 5, 1, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(44, 72), 6, 14, 11, _UPB_MODE_SCALAR}, + {24, UPB_SIZE(48, 80), 7, 14, 11, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(88, 160), 0, 9, 11, _UPB_MODE_ARRAY}, + {26, UPB_SIZE(12, 12), 0, 0, 14, _UPB_MODE_SCALAR}, + {27, UPB_SIZE(52, 88), 8, 2, 11, _UPB_MODE_SCALAR}, + {28, UPB_SIZE(56, 96), 9, 14, 11, _UPB_MODE_SCALAR}, + {29, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 0, 9, _UPB_MODE_SCALAR}, + {30, UPB_SIZE(92, 168), 0, 8, 11, _UPB_MODE_ARRAY}, + {31, UPB_SIZE(60, 104), 10, 15, 11, _UPB_MODE_SCALAR}, + {32, UPB_SIZE(64, 112), 11, 11, 11, _UPB_MODE_SCALAR}, + {33, UPB_SIZE(68, 120), 12, 12, 11, _UPB_MODE_SCALAR}, + {34, UPB_SIZE(72, 128), 13, 3, 11, _UPB_MODE_SCALAR}, + {35, UPB_SIZE(108, 200), UPB_SIZE(-117, -217), 11, 11, _UPB_MODE_SCALAR}, + {36, UPB_SIZE(76, 136), 14, 7, 11, _UPB_MODE_SCALAR}, + {37, UPB_SIZE(96, 176), UPB_SIZE(-105, -193), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_msginit = { &envoy_config_route_v3_RouteAction_submsgs[0], &envoy_config_route_v3_RouteAction__fields[0], - UPB_SIZE(120, 224), 30, false, 255, + UPB_SIZE(120, 224), 30, false, 9, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = { @@ -354,15 +354,15 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_RequestMirro }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {4, UPB_SIZE(16, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit = { &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = { @@ -374,18 +374,18 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_s }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy__fields[6] = { - {1, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 3, 11, 1}, - {2, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 1, 11, 1}, - {3, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 0, 11, 1}, - {4, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {5, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 4, 11, 1}, - {6, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 2, 11, 1}, + {1, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 3, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 4, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_msginit = { &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy__fields[0], - UPB_SIZE(16, 24), 6, false, 255, + UPB_SIZE(16, 24), 6, false, 6, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = { @@ -393,14 +393,14 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_H }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit = { &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[1] = { @@ -408,45 +408,45 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_HashPolicy_C }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit = { &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit = { NULL, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit = { NULL, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit = { NULL, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = { @@ -455,15 +455,15 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_UpgradeConfi }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_UpgradeConfig__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_UpgradeConfig_msginit = { &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = { @@ -471,14 +471,14 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_UpgradeConfi }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit = { &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[1] = { @@ -486,15 +486,15 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_MaxStreamDur }; static const upb_msglayout_field envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit = { &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0], &envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_submsgs[7] = { @@ -508,23 +508,23 @@ static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_submsgs[7] = }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy__fields[11] = { - {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 32), 1, 6, 11, 1}, - {3, UPB_SIZE(28, 40), 2, 5, 11, 1}, - {4, UPB_SIZE(32, 48), 3, 4, 11, 1}, - {5, UPB_SIZE(44, 72), 0, 3, 11, 3}, - {6, UPB_SIZE(8, 8), 0, 0, 3, 1}, - {7, UPB_SIZE(48, 80), 0, 0, 13, _UPB_LABEL_PACKED}, - {8, UPB_SIZE(36, 56), 4, 2, 11, 1}, - {9, UPB_SIZE(52, 88), 0, 0, 11, 3}, - {10, UPB_SIZE(56, 96), 0, 0, 11, 3}, - {11, UPB_SIZE(40, 64), 5, 1, 11, 1}, + {1, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 32), 1, 6, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 40), 2, 5, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 48), 3, 4, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(44, 72), 0, 3, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(8, 8), 0, 0, 3, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(48, 80), 0, 0, 13, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {8, UPB_SIZE(36, 56), 4, 2, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(52, 88), 0, 0, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(56, 96), 0, 0, 11, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(40, 64), 5, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_msginit = { &envoy_config_route_v3_RetryPolicy_submsgs[0], &envoy_config_route_v3_RetryPolicy__fields[0], - UPB_SIZE(64, 112), 11, false, 255, + UPB_SIZE(64, 112), 11, false, 11, 255, }; static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = { @@ -532,14 +532,14 @@ static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryPriorit }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy_RetryPriority__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_RetryPriority_msginit = { &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { @@ -547,14 +547,14 @@ static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryHostPre }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit = { &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[1] = { @@ -562,25 +562,25 @@ static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RetryBackOff }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit = { &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_ResetHeader_msginit = { NULL, &envoy_config_route_v3_RetryPolicy_ResetHeader__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = { @@ -589,14 +589,14 @@ static const upb_msglayout *const envoy_config_route_v3_RetryPolicy_RateLimitedR }; static const upb_msglayout_field envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[2] = { - {1, UPB_SIZE(8, 16), 0, 0, 11, 3}, - {2, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {1, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit = { &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_HedgePolicy_submsgs[2] = { @@ -605,15 +605,15 @@ static const upb_msglayout *const envoy_config_route_v3_HedgePolicy_submsgs[2] = }; static const upb_msglayout_field envoy_config_route_v3_HedgePolicy__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_HedgePolicy_msginit = { &envoy_config_route_v3_HedgePolicy_submsgs[0], &envoy_config_route_v3_HedgePolicy__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_RedirectAction_submsgs[1] = { @@ -621,21 +621,21 @@ static const upb_msglayout *const envoy_config_route_v3_RedirectAction_submsgs[1 }; static const upb_msglayout_field envoy_config_route_v3_RedirectAction__fields[9] = { - {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 9, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {4, UPB_SIZE(32, 56), UPB_SIZE(-41, -73), 0, 8, 1}, - {5, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 9, 1}, - {6, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {7, UPB_SIZE(32, 56), UPB_SIZE(-41, -73), 0, 9, 1}, - {8, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {9, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 11, 1}, + {1, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 56), UPB_SIZE(-41, -73), 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(32, 56), UPB_SIZE(-41, -73), 0, 9, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RedirectAction_msginit = { &envoy_config_route_v3_RedirectAction_submsgs[0], &envoy_config_route_v3_RedirectAction__fields[0], - UPB_SIZE(48, 80), 9, false, 255, + UPB_SIZE(48, 80), 9, false, 9, 255, }; static const upb_msglayout *const envoy_config_route_v3_DirectResponseAction_submsgs[1] = { @@ -643,20 +643,20 @@ static const upb_msglayout *const envoy_config_route_v3_DirectResponseAction_sub }; static const upb_msglayout_field envoy_config_route_v3_DirectResponseAction__fields[2] = { - {1, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {2, UPB_SIZE(8, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_DirectResponseAction_msginit = { &envoy_config_route_v3_DirectResponseAction_submsgs[0], &envoy_config_route_v3_DirectResponseAction__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; const upb_msglayout envoy_config_route_v3_NonForwardingAction_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_config_route_v3_Decorator_submsgs[1] = { @@ -664,14 +664,14 @@ static const upb_msglayout *const envoy_config_route_v3_Decorator_submsgs[1] = { }; static const upb_msglayout_field envoy_config_route_v3_Decorator__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_Decorator_msginit = { &envoy_config_route_v3_Decorator_submsgs[0], &envoy_config_route_v3_Decorator__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_Tracing_submsgs[2] = { @@ -680,16 +680,16 @@ static const upb_msglayout *const envoy_config_route_v3_Tracing_submsgs[2] = { }; static const upb_msglayout_field envoy_config_route_v3_Tracing__fields[4] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 1, 11, 1}, - {4, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_Tracing_msginit = { &envoy_config_route_v3_Tracing_submsgs[0], &envoy_config_route_v3_Tracing__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_route_v3_VirtualCluster_submsgs[1] = { @@ -697,14 +697,14 @@ static const upb_msglayout *const envoy_config_route_v3_VirtualCluster_submsgs[1 }; static const upb_msglayout_field envoy_config_route_v3_VirtualCluster__fields[2] = { - {2, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {4, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {2, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_VirtualCluster_msginit = { &envoy_config_route_v3_VirtualCluster_submsgs[0], &envoy_config_route_v3_VirtualCluster__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 0, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_submsgs[3] = { @@ -714,16 +714,16 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_submsgs[3] = { }; static const upb_msglayout_field envoy_config_route_v3_RateLimit__fields[4] = { - {1, UPB_SIZE(12, 24), 1, 2, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(20, 40), 0, 0, 11, 3}, - {4, UPB_SIZE(16, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 40), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_msginit = { &envoy_config_route_v3_RateLimit_submsgs[0], &envoy_config_route_v3_RateLimit__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_submsgs[9] = { @@ -739,62 +739,62 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_submsgs }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action__fields[9] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 8, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 7, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 8, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 7, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_msginit = { &envoy_config_route_v3_RateLimit_Action_submsgs[0], &envoy_config_route_v3_RateLimit_Action__fields[0], - UPB_SIZE(8, 16), 9, false, 255, + UPB_SIZE(8, 16), 9, false, 9, 255, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 8, 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(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit = { NULL, &envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_GenericKey__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 envoy_config_route_v3_RateLimit_Action_GenericKey_msginit = { NULL, &envoy_config_route_v3_RateLimit_Action_GenericKey__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = { @@ -803,15 +803,15 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_HeaderV }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {3, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit = { &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0], &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = { @@ -819,15 +819,15 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_Dynamic }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit = { &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = { @@ -835,16 +835,16 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_MetaDat }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_MetaData__fields[4] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 40), 1, 0, 11, 1}, - {3, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_MetaData_msginit = { &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0], - UPB_SIZE(32, 48), 4, false, 255, + UPB_SIZE(32, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Override_submsgs[1] = { @@ -852,13 +852,13 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Override_subms }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Override__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Override_msginit = { &envoy_config_route_v3_RateLimit_Override_submsgs[0], &envoy_config_route_v3_RateLimit_Override__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = { @@ -866,13 +866,13 @@ static const upb_msglayout *const envoy_config_route_v3_RateLimit_Override_Dynam }; static const upb_msglayout_field envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit = { &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0], &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_HeaderMatcher_submsgs[3] = { @@ -882,22 +882,22 @@ static const upb_msglayout *const envoy_config_route_v3_HeaderMatcher_submsgs[3] }; static const upb_msglayout_field envoy_config_route_v3_HeaderMatcher__fields[10] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, 1}, - {6, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 2, 11, 1}, - {7, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 8, 1}, - {8, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {9, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, 1}, - {10, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, 1}, - {11, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 11, 1}, - {12, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, 1}, - {13, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 8, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_HeaderMatcher_msginit = { &envoy_config_route_v3_HeaderMatcher_submsgs[0], &envoy_config_route_v3_HeaderMatcher__fields[0], - UPB_SIZE(24, 48), 10, false, 255, + UPB_SIZE(24, 48), 10, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = { @@ -905,15 +905,15 @@ static const upb_msglayout *const envoy_config_route_v3_QueryParameterMatcher_su }; static const upb_msglayout_field envoy_config_route_v3_QueryParameterMatcher__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {6, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_QueryParameterMatcher_msginit = { &envoy_config_route_v3_QueryParameterMatcher_submsgs[0], &envoy_config_route_v3_QueryParameterMatcher__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 1, 255, }; static const upb_msglayout *const envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = { @@ -922,16 +922,16 @@ static const upb_msglayout *const envoy_config_route_v3_InternalRedirectPolicy_s }; static const upb_msglayout_field envoy_config_route_v3_InternalRedirectPolicy__fields[4] = { - {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 13, _UPB_LABEL_PACKED}, - {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, - {4, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 13, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_InternalRedirectPolicy_msginit = { &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0], &envoy_config_route_v3_InternalRedirectPolicy__fields[0], - UPB_SIZE(16, 32), 4, false, 255, + UPB_SIZE(16, 32), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_route_v3_FilterConfig_submsgs[1] = { @@ -939,14 +939,14 @@ static const upb_msglayout *const envoy_config_route_v3_FilterConfig_submsgs[1] }; static const upb_msglayout_field envoy_config_route_v3_FilterConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_FilterConfig_msginit = { &envoy_config_route_v3_FilterConfig_submsgs[0], &envoy_config_route_v3_FilterConfig__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h b/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h index f01e3596b2..00d2d251f4 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +++ b/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_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" @@ -257,13 +257,19 @@ UPB_INLINE envoy_config_route_v3_VirtualHost *envoy_config_route_v3_VirtualHost_ UPB_INLINE envoy_config_route_v3_VirtualHost *envoy_config_route_v3_VirtualHost_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_VirtualHost *ret = envoy_config_route_v3_VirtualHost_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_VirtualHost *envoy_config_route_v3_VirtualHost_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_VirtualHost *ret = envoy_config_route_v3_VirtualHost_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualHost_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_VirtualHost_serialize(const envoy_config_route_v3_VirtualHost *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_VirtualHost_msginit, arena, len); @@ -504,13 +510,19 @@ UPB_INLINE envoy_config_route_v3_FilterAction *envoy_config_route_v3_FilterActio UPB_INLINE envoy_config_route_v3_FilterAction *envoy_config_route_v3_FilterAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_FilterAction *ret = envoy_config_route_v3_FilterAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_FilterAction *envoy_config_route_v3_FilterAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_FilterAction *ret = envoy_config_route_v3_FilterAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_FilterAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_FilterAction_serialize(const envoy_config_route_v3_FilterAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_FilterAction_msginit, arena, len); @@ -541,13 +553,19 @@ UPB_INLINE envoy_config_route_v3_Route *envoy_config_route_v3_Route_new(upb_aren UPB_INLINE envoy_config_route_v3_Route *envoy_config_route_v3_Route_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_Route *ret = envoy_config_route_v3_Route_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_Route_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_Route_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_Route *envoy_config_route_v3_Route_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_Route *ret = envoy_config_route_v3_Route_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_Route_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_Route_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_Route_serialize(const envoy_config_route_v3_Route *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_Route_msginit, arena, len); @@ -800,13 +818,19 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster *envoy_config_route_v3_Weighted UPB_INLINE envoy_config_route_v3_WeightedCluster *envoy_config_route_v3_WeightedCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_WeightedCluster *ret = envoy_config_route_v3_WeightedCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_WeightedCluster *envoy_config_route_v3_WeightedCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_WeightedCluster *ret = envoy_config_route_v3_WeightedCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_WeightedCluster_serialize(const envoy_config_route_v3_WeightedCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_WeightedCluster_msginit, arena, len); @@ -856,13 +880,19 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight *envoy_config_rou UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight *envoy_config_route_v3_WeightedCluster_ClusterWeight_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_WeightedCluster_ClusterWeight *ret = envoy_config_route_v3_WeightedCluster_ClusterWeight_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight *envoy_config_route_v3_WeightedCluster_ClusterWeight_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_WeightedCluster_ClusterWeight *ret = envoy_config_route_v3_WeightedCluster_ClusterWeight_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_WeightedCluster_ClusterWeight_serialize(const envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_WeightedCluster_ClusterWeight_msginit, arena, len); @@ -1001,13 +1031,19 @@ UPB_INLINE envoy_config_route_v3_RouteMatch *envoy_config_route_v3_RouteMatch_ne UPB_INLINE envoy_config_route_v3_RouteMatch *envoy_config_route_v3_RouteMatch_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteMatch *ret = envoy_config_route_v3_RouteMatch_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteMatch *envoy_config_route_v3_RouteMatch_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteMatch *ret = envoy_config_route_v3_RouteMatch_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteMatch_serialize(const envoy_config_route_v3_RouteMatch *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteMatch_msginit, arena, len); @@ -1160,13 +1196,19 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *envoy_config_ UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *ret = envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *ret = envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_serialize(const envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions_msginit, arena, len); @@ -1182,13 +1224,19 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *envoy_config UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *ret = envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *ret = envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_serialize(const envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_msginit, arena, len); @@ -1234,13 +1282,19 @@ UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher *envoy_config_route_v UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher *envoy_config_route_v3_RouteMatch_ConnectMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteMatch_ConnectMatcher *ret = envoy_config_route_v3_RouteMatch_ConnectMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteMatch_ConnectMatcher *envoy_config_route_v3_RouteMatch_ConnectMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteMatch_ConnectMatcher *ret = envoy_config_route_v3_RouteMatch_ConnectMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteMatch_ConnectMatcher_serialize(const envoy_config_route_v3_RouteMatch_ConnectMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteMatch_ConnectMatcher_msginit, arena, len); @@ -1256,13 +1310,19 @@ UPB_INLINE envoy_config_route_v3_CorsPolicy *envoy_config_route_v3_CorsPolicy_ne UPB_INLINE envoy_config_route_v3_CorsPolicy *envoy_config_route_v3_CorsPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_CorsPolicy *ret = envoy_config_route_v3_CorsPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_CorsPolicy *envoy_config_route_v3_CorsPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_CorsPolicy *ret = envoy_config_route_v3_CorsPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_CorsPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_CorsPolicy_serialize(const envoy_config_route_v3_CorsPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_CorsPolicy_msginit, arena, len); @@ -1359,13 +1419,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction *envoy_config_route_v3_RouteAction_ UPB_INLINE envoy_config_route_v3_RouteAction *envoy_config_route_v3_RouteAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction *ret = envoy_config_route_v3_RouteAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction *envoy_config_route_v3_RouteAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction *ret = envoy_config_route_v3_RouteAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_serialize(const envoy_config_route_v3_RouteAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_msginit, arena, len); @@ -1752,13 +1818,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy *envoy_config_r UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy *envoy_config_route_v3_RouteAction_RequestMirrorPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_RequestMirrorPolicy *ret = envoy_config_route_v3_RouteAction_RequestMirrorPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy *envoy_config_route_v3_RouteAction_RequestMirrorPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_RequestMirrorPolicy *ret = envoy_config_route_v3_RouteAction_RequestMirrorPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_RequestMirrorPolicy_serialize(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_msginit, arena, len); @@ -1808,13 +1880,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy *envoy_config_route_v3_R UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy *envoy_config_route_v3_RouteAction_HashPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy *ret = envoy_config_route_v3_RouteAction_HashPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy *envoy_config_route_v3_RouteAction_HashPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy *ret = envoy_config_route_v3_RouteAction_HashPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_serialize(const envoy_config_route_v3_RouteAction_HashPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_msginit, arena, len); @@ -1914,13 +1992,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header *envoy_config_rou UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header *envoy_config_route_v3_RouteAction_HashPolicy_Header_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_Header *ret = envoy_config_route_v3_RouteAction_HashPolicy_Header_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Header *envoy_config_route_v3_RouteAction_HashPolicy_Header_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_Header *ret = envoy_config_route_v3_RouteAction_HashPolicy_Header_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_Header_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_Header *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Header_msginit, arena, len); @@ -1955,13 +2039,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie *envoy_config_rou UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie *envoy_config_route_v3_RouteAction_HashPolicy_Cookie_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_Cookie *ret = envoy_config_route_v3_RouteAction_HashPolicy_Cookie_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_Cookie *envoy_config_route_v3_RouteAction_HashPolicy_Cookie_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_Cookie *ret = envoy_config_route_v3_RouteAction_HashPolicy_Cookie_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_Cookie_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_msginit, arena, len); @@ -2000,13 +2090,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *en UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *ret = envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *ret = envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_msginit, arena, len); @@ -2026,13 +2122,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *envoy_co UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *ret = envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *ret = envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_msginit, arena, len); @@ -2052,13 +2154,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState *envoy_confi UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState *envoy_config_route_v3_RouteAction_HashPolicy_FilterState_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_FilterState *ret = envoy_config_route_v3_RouteAction_HashPolicy_FilterState_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_FilterState *envoy_config_route_v3_RouteAction_HashPolicy_FilterState_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_HashPolicy_FilterState *ret = envoy_config_route_v3_RouteAction_HashPolicy_FilterState_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_HashPolicy_FilterState_serialize(const envoy_config_route_v3_RouteAction_HashPolicy_FilterState *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState_msginit, arena, len); @@ -2078,13 +2186,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig *envoy_config_route_v UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig *envoy_config_route_v3_RouteAction_UpgradeConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_UpgradeConfig *ret = envoy_config_route_v3_RouteAction_UpgradeConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig *envoy_config_route_v3_RouteAction_UpgradeConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_UpgradeConfig *ret = envoy_config_route_v3_RouteAction_UpgradeConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_UpgradeConfig_serialize(const envoy_config_route_v3_RouteAction_UpgradeConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_msginit, arena, len); @@ -2134,13 +2248,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *envoy_ UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *ret = envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *ret = envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_serialize(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit, arena, len); @@ -2175,13 +2295,19 @@ UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration *envoy_config_rou UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration *envoy_config_route_v3_RouteAction_MaxStreamDuration_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RouteAction_MaxStreamDuration *ret = envoy_config_route_v3_RouteAction_MaxStreamDuration_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RouteAction_MaxStreamDuration *envoy_config_route_v3_RouteAction_MaxStreamDuration_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RouteAction_MaxStreamDuration *ret = envoy_config_route_v3_RouteAction_MaxStreamDuration_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RouteAction_MaxStreamDuration_serialize(const envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RouteAction_MaxStreamDuration_msginit, arena, len); @@ -2242,13 +2368,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy *envoy_config_route_v3_RetryPolicy_ UPB_INLINE envoy_config_route_v3_RetryPolicy *envoy_config_route_v3_RetryPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy *ret = envoy_config_route_v3_RetryPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy *envoy_config_route_v3_RetryPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy *ret = envoy_config_route_v3_RetryPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_serialize(const envoy_config_route_v3_RetryPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_msginit, arena, len); @@ -2403,13 +2535,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority *envoy_config_route_v UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority *envoy_config_route_v3_RetryPolicy_RetryPriority_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryPriority *ret = envoy_config_route_v3_RetryPolicy_RetryPriority_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryPriority *envoy_config_route_v3_RetryPolicy_RetryPriority_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryPriority *ret = envoy_config_route_v3_RetryPolicy_RetryPriority_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryPriority_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_RetryPriority_serialize(const envoy_config_route_v3_RetryPolicy_RetryPriority *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_RetryPriority_msginit, arena, len); @@ -2449,13 +2587,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate *envoy_config_ro UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate *envoy_config_route_v3_RetryPolicy_RetryHostPredicate_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryHostPredicate *ret = envoy_config_route_v3_RetryPolicy_RetryHostPredicate_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryHostPredicate *envoy_config_route_v3_RetryPolicy_RetryHostPredicate_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryHostPredicate *ret = envoy_config_route_v3_RetryPolicy_RetryHostPredicate_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_RetryHostPredicate_serialize(const envoy_config_route_v3_RetryPolicy_RetryHostPredicate *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_msginit, arena, len); @@ -2495,13 +2639,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff *envoy_config_route_v3 UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff *envoy_config_route_v3_RetryPolicy_RetryBackOff_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryBackOff *ret = envoy_config_route_v3_RetryPolicy_RetryBackOff_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy_RetryBackOff *envoy_config_route_v3_RetryPolicy_RetryBackOff_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RetryBackOff *ret = envoy_config_route_v3_RetryPolicy_RetryBackOff_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_RetryBackOff_serialize(const envoy_config_route_v3_RetryPolicy_RetryBackOff *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_RetryBackOff_msginit, arena, len); @@ -2547,13 +2697,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader *envoy_config_route_v3_ UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader *envoy_config_route_v3_RetryPolicy_ResetHeader_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy_ResetHeader *ret = envoy_config_route_v3_RetryPolicy_ResetHeader_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy_ResetHeader *envoy_config_route_v3_RetryPolicy_ResetHeader_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy_ResetHeader *ret = envoy_config_route_v3_RetryPolicy_ResetHeader_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_ResetHeader_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_ResetHeader_serialize(const envoy_config_route_v3_RetryPolicy_ResetHeader *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_ResetHeader_msginit, arena, len); @@ -2577,13 +2733,19 @@ UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *envoy_conf UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *ret = envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *ret = envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_serialize(const envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_msginit, arena, len); @@ -2629,13 +2791,19 @@ UPB_INLINE envoy_config_route_v3_HedgePolicy *envoy_config_route_v3_HedgePolicy_ UPB_INLINE envoy_config_route_v3_HedgePolicy *envoy_config_route_v3_HedgePolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_HedgePolicy *ret = envoy_config_route_v3_HedgePolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_HedgePolicy *envoy_config_route_v3_HedgePolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_HedgePolicy *ret = envoy_config_route_v3_HedgePolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_HedgePolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_HedgePolicy_serialize(const envoy_config_route_v3_HedgePolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_HedgePolicy_msginit, arena, len); @@ -2685,13 +2853,19 @@ UPB_INLINE envoy_config_route_v3_RedirectAction *envoy_config_route_v3_RedirectA UPB_INLINE envoy_config_route_v3_RedirectAction *envoy_config_route_v3_RedirectAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RedirectAction *ret = envoy_config_route_v3_RedirectAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RedirectAction *envoy_config_route_v3_RedirectAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RedirectAction *ret = envoy_config_route_v3_RedirectAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RedirectAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RedirectAction_serialize(const envoy_config_route_v3_RedirectAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RedirectAction_msginit, arena, len); @@ -2772,13 +2946,19 @@ UPB_INLINE envoy_config_route_v3_DirectResponseAction *envoy_config_route_v3_Dir UPB_INLINE envoy_config_route_v3_DirectResponseAction *envoy_config_route_v3_DirectResponseAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_DirectResponseAction *ret = envoy_config_route_v3_DirectResponseAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_DirectResponseAction *envoy_config_route_v3_DirectResponseAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_DirectResponseAction *ret = envoy_config_route_v3_DirectResponseAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_DirectResponseAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_DirectResponseAction_serialize(const envoy_config_route_v3_DirectResponseAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_DirectResponseAction_msginit, arena, len); @@ -2813,13 +2993,19 @@ UPB_INLINE envoy_config_route_v3_NonForwardingAction *envoy_config_route_v3_NonF UPB_INLINE envoy_config_route_v3_NonForwardingAction *envoy_config_route_v3_NonForwardingAction_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_NonForwardingAction *ret = envoy_config_route_v3_NonForwardingAction_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_NonForwardingAction *envoy_config_route_v3_NonForwardingAction_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_NonForwardingAction *ret = envoy_config_route_v3_NonForwardingAction_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_NonForwardingAction_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_NonForwardingAction_serialize(const envoy_config_route_v3_NonForwardingAction *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_NonForwardingAction_msginit, arena, len); @@ -2835,13 +3021,19 @@ UPB_INLINE envoy_config_route_v3_Decorator *envoy_config_route_v3_Decorator_new( UPB_INLINE envoy_config_route_v3_Decorator *envoy_config_route_v3_Decorator_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_Decorator *ret = envoy_config_route_v3_Decorator_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_Decorator_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_Decorator_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_Decorator *envoy_config_route_v3_Decorator_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_Decorator *ret = envoy_config_route_v3_Decorator_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_Decorator_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_Decorator_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_Decorator_serialize(const envoy_config_route_v3_Decorator *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_Decorator_msginit, arena, len); @@ -2876,13 +3068,19 @@ UPB_INLINE envoy_config_route_v3_Tracing *envoy_config_route_v3_Tracing_new(upb_ UPB_INLINE envoy_config_route_v3_Tracing *envoy_config_route_v3_Tracing_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_Tracing *ret = envoy_config_route_v3_Tracing_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_Tracing_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_Tracing_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_Tracing *envoy_config_route_v3_Tracing_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_Tracing *ret = envoy_config_route_v3_Tracing_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_Tracing_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_Tracing_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_Tracing_serialize(const envoy_config_route_v3_Tracing *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_Tracing_msginit, arena, len); @@ -2958,13 +3156,19 @@ UPB_INLINE envoy_config_route_v3_VirtualCluster *envoy_config_route_v3_VirtualCl UPB_INLINE envoy_config_route_v3_VirtualCluster *envoy_config_route_v3_VirtualCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_VirtualCluster *ret = envoy_config_route_v3_VirtualCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_VirtualCluster *envoy_config_route_v3_VirtualCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_VirtualCluster *ret = envoy_config_route_v3_VirtualCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_VirtualCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_VirtualCluster_serialize(const envoy_config_route_v3_VirtualCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_VirtualCluster_msginit, arena, len); @@ -2999,13 +3203,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit *envoy_config_route_v3_RateLimit_new( UPB_INLINE envoy_config_route_v3_RateLimit *envoy_config_route_v3_RateLimit_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit *ret = envoy_config_route_v3_RateLimit_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit *envoy_config_route_v3_RateLimit_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit *ret = envoy_config_route_v3_RateLimit_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_serialize(const envoy_config_route_v3_RateLimit *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_msginit, arena, len); @@ -3070,13 +3280,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action *envoy_config_route_v3_RateLim UPB_INLINE envoy_config_route_v3_RateLimit_Action *envoy_config_route_v3_RateLimit_Action_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action *ret = envoy_config_route_v3_RateLimit_Action_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action *envoy_config_route_v3_RateLimit_Action_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action *ret = envoy_config_route_v3_RateLimit_Action_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_serialize(const envoy_config_route_v3_RateLimit_Action *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_msginit, arena, len); @@ -3232,13 +3448,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster *envoy_config_ro UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster *envoy_config_route_v3_RateLimit_Action_SourceCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_SourceCluster *ret = envoy_config_route_v3_RateLimit_Action_SourceCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_SourceCluster *envoy_config_route_v3_RateLimit_Action_SourceCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_SourceCluster *ret = envoy_config_route_v3_RateLimit_Action_SourceCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_SourceCluster_serialize(const envoy_config_route_v3_RateLimit_Action_SourceCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, arena, len); @@ -3254,13 +3476,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster *envoy_conf UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster *envoy_config_route_v3_RateLimit_Action_DestinationCluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_DestinationCluster *ret = envoy_config_route_v3_RateLimit_Action_DestinationCluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_DestinationCluster *envoy_config_route_v3_RateLimit_Action_DestinationCluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_DestinationCluster *ret = envoy_config_route_v3_RateLimit_Action_DestinationCluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_DestinationCluster_serialize(const envoy_config_route_v3_RateLimit_Action_DestinationCluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, arena, len); @@ -3276,13 +3504,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders *envoy_config_r UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders *envoy_config_route_v3_RateLimit_Action_RequestHeaders_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_RequestHeaders *ret = envoy_config_route_v3_RateLimit_Action_RequestHeaders_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_RequestHeaders *envoy_config_route_v3_RateLimit_Action_RequestHeaders_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_RequestHeaders *ret = envoy_config_route_v3_RateLimit_Action_RequestHeaders_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_RequestHeaders_serialize(const envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, arena, len); @@ -3310,13 +3544,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress *envoy_config_ro UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress *envoy_config_route_v3_RateLimit_Action_RemoteAddress_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_RemoteAddress *ret = envoy_config_route_v3_RateLimit_Action_RemoteAddress_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_RemoteAddress *envoy_config_route_v3_RateLimit_Action_RemoteAddress_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_RemoteAddress *ret = envoy_config_route_v3_RateLimit_Action_RemoteAddress_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_RemoteAddress_serialize(const envoy_config_route_v3_RateLimit_Action_RemoteAddress *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, arena, len); @@ -3332,13 +3572,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey *envoy_config_route UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey *envoy_config_route_v3_RateLimit_Action_GenericKey_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_GenericKey *ret = envoy_config_route_v3_RateLimit_Action_GenericKey_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_GenericKey *envoy_config_route_v3_RateLimit_Action_GenericKey_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_GenericKey *ret = envoy_config_route_v3_RateLimit_Action_GenericKey_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_GenericKey_serialize(const envoy_config_route_v3_RateLimit_Action_GenericKey *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, arena, len); @@ -3362,13 +3608,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *envoy_config UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *ret = envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *ret = envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_serialize(const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, arena, len); @@ -3418,13 +3670,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData *envoy_config_ UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData *envoy_config_route_v3_RateLimit_Action_DynamicMetaData_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_DynamicMetaData *ret = envoy_config_route_v3_RateLimit_Action_DynamicMetaData_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_DynamicMetaData *envoy_config_route_v3_RateLimit_Action_DynamicMetaData_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_DynamicMetaData *ret = envoy_config_route_v3_RateLimit_Action_DynamicMetaData_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_DynamicMetaData_serialize(const envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, arena, len); @@ -3463,13 +3721,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v3_RateLimit_Action_MetaData_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_MetaData *ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v3_RateLimit_Action_MetaData_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Action_MetaData *ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_MetaData_serialize(const envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena, len); @@ -3512,13 +3776,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override *envoy_config_route_v3_RateL UPB_INLINE envoy_config_route_v3_RateLimit_Override *envoy_config_route_v3_RateLimit_Override_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Override *ret = envoy_config_route_v3_RateLimit_Override_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Override *envoy_config_route_v3_RateLimit_Override_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Override *ret = envoy_config_route_v3_RateLimit_Override_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Override_serialize(const envoy_config_route_v3_RateLimit_Override *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Override_msginit, arena, len); @@ -3554,13 +3824,19 @@ UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata *envoy_confi UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata *envoy_config_route_v3_RateLimit_Override_DynamicMetadata_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_RateLimit_Override_DynamicMetadata *ret = envoy_config_route_v3_RateLimit_Override_DynamicMetadata_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_RateLimit_Override_DynamicMetadata *envoy_config_route_v3_RateLimit_Override_DynamicMetadata_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_RateLimit_Override_DynamicMetadata *ret = envoy_config_route_v3_RateLimit_Override_DynamicMetadata_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_RateLimit_Override_DynamicMetadata_serialize(const envoy_config_route_v3_RateLimit_Override_DynamicMetadata *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, arena, len); @@ -3591,13 +3867,19 @@ UPB_INLINE envoy_config_route_v3_HeaderMatcher *envoy_config_route_v3_HeaderMatc UPB_INLINE envoy_config_route_v3_HeaderMatcher *envoy_config_route_v3_HeaderMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_HeaderMatcher *ret = envoy_config_route_v3_HeaderMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_HeaderMatcher *envoy_config_route_v3_HeaderMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_HeaderMatcher *ret = envoy_config_route_v3_HeaderMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_HeaderMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_HeaderMatcher_serialize(const envoy_config_route_v3_HeaderMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_HeaderMatcher_msginit, arena, len); @@ -3701,13 +3983,19 @@ UPB_INLINE envoy_config_route_v3_QueryParameterMatcher *envoy_config_route_v3_Qu UPB_INLINE envoy_config_route_v3_QueryParameterMatcher *envoy_config_route_v3_QueryParameterMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_QueryParameterMatcher *ret = envoy_config_route_v3_QueryParameterMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_QueryParameterMatcher *envoy_config_route_v3_QueryParameterMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_QueryParameterMatcher *ret = envoy_config_route_v3_QueryParameterMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_QueryParameterMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_QueryParameterMatcher_serialize(const envoy_config_route_v3_QueryParameterMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_QueryParameterMatcher_msginit, arena, len); @@ -3753,13 +4041,19 @@ UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy *envoy_config_route_v3_I UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy *envoy_config_route_v3_InternalRedirectPolicy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_InternalRedirectPolicy *ret = envoy_config_route_v3_InternalRedirectPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_InternalRedirectPolicy *envoy_config_route_v3_InternalRedirectPolicy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_InternalRedirectPolicy *ret = envoy_config_route_v3_InternalRedirectPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_InternalRedirectPolicy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_InternalRedirectPolicy_serialize(const envoy_config_route_v3_InternalRedirectPolicy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_InternalRedirectPolicy_msginit, arena, len); @@ -3820,13 +4114,19 @@ UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfi UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_FilterConfig *ret = envoy_config_route_v3_FilterConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_FilterConfig *ret = envoy_config_route_v3_FilterConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_FilterConfig_serialize(const envoy_config_route_v3_FilterConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_FilterConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c b/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c index 301441e3c4..6553b0d889 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c +++ b/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/route/v3/scoped_route.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -20,16 +20,16 @@ static const upb_msglayout *const envoy_config_route_v3_ScopedRouteConfiguration }; static const upb_msglayout_field envoy_config_route_v3_ScopedRouteConfiguration__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), 1, 0, 11, 1}, - {4, UPB_SIZE(1, 1), 0, 0, 8, 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}, + {4, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_ScopedRouteConfiguration_msginit = { &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = { @@ -37,23 +37,23 @@ static const upb_msglayout *const envoy_config_route_v3_ScopedRouteConfiguration }; static const upb_msglayout_field envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit = { &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit = { NULL, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h b/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h index 72d1622841..83b76560cd 100644 --- a/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h +++ b/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ #define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_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" @@ -39,13 +39,19 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration *envoy_config_route_v3 UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration *envoy_config_route_v3_ScopedRouteConfiguration_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration *ret = envoy_config_route_v3_ScopedRouteConfiguration_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration *envoy_config_route_v3_ScopedRouteConfiguration_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration *ret = envoy_config_route_v3_ScopedRouteConfiguration_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_ScopedRouteConfiguration_serialize(const envoy_config_route_v3_ScopedRouteConfiguration *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_msginit, arena, len); @@ -88,13 +94,19 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key *envoy_config_rout UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key *envoy_config_route_v3_ScopedRouteConfiguration_Key_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration_Key *ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key *envoy_config_route_v3_ScopedRouteConfiguration_Key_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration_Key *ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_ScopedRouteConfiguration_Key_serialize(const envoy_config_route_v3_ScopedRouteConfiguration_Key *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_msginit, arena, len); @@ -125,13 +137,19 @@ UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *envoy_co UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *ret = envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_serialize(const envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c b/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c index 52cb6b72ba..a22b93982e 100644 --- a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c +++ b/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/config/trace/v3/http_tracer.upb.h" #include "google/protobuf/any.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,13 +21,13 @@ static const upb_msglayout *const envoy_config_trace_v3_Tracing_submsgs[1] = { }; static const upb_msglayout_field envoy_config_trace_v3_Tracing__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_trace_v3_Tracing_msginit = { &envoy_config_trace_v3_Tracing_submsgs[0], &envoy_config_trace_v3_Tracing__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_config_trace_v3_Tracing_Http_submsgs[1] = { @@ -35,14 +35,14 @@ static const upb_msglayout *const envoy_config_trace_v3_Tracing_Http_submsgs[1] }; static const upb_msglayout_field envoy_config_trace_v3_Tracing_Http__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_config_trace_v3_Tracing_Http_msginit = { &envoy_config_trace_v3_Tracing_Http_submsgs[0], &envoy_config_trace_v3_Tracing_Http__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h b/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h index 21240fa0e4..fdba74ab30 100644 --- a/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h +++ b/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ #define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_config_trace_v3_Tracing *envoy_config_trace_v3_Tracing_new(upb_ UPB_INLINE envoy_config_trace_v3_Tracing *envoy_config_trace_v3_Tracing_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_trace_v3_Tracing *ret = envoy_config_trace_v3_Tracing_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_trace_v3_Tracing *envoy_config_trace_v3_Tracing_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_trace_v3_Tracing *ret = envoy_config_trace_v3_Tracing_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_trace_v3_Tracing_serialize(const envoy_config_trace_v3_Tracing *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_trace_v3_Tracing_msginit, arena, len); @@ -75,13 +81,19 @@ UPB_INLINE envoy_config_trace_v3_Tracing_Http *envoy_config_trace_v3_Tracing_Htt UPB_INLINE envoy_config_trace_v3_Tracing_Http *envoy_config_trace_v3_Tracing_Http_parse(const char *buf, size_t size, upb_arena *arena) { envoy_config_trace_v3_Tracing_Http *ret = envoy_config_trace_v3_Tracing_Http_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_config_trace_v3_Tracing_Http *envoy_config_trace_v3_Tracing_Http_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_config_trace_v3_Tracing_Http *ret = envoy_config_trace_v3_Tracing_Http_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_config_trace_v3_Tracing_Http_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_config_trace_v3_Tracing_Http_serialize(const envoy_config_trace_v3_Tracing_Http *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_config_trace_v3_Tracing_Http_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c index 308e8b5338..57a0f17168 100644 --- a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -16,13 +16,13 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit = { NULL, &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h index ffa4ccbca2..cb61c5bdbd 100644 --- a/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extension UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_clusters_aggregate_v3_ClusterConfig *ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_clusters_aggregate_v3_ClusterConfig *ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize(const envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c index 5f92b8d00b..58e0ddfadb 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/filters/common/fault/v3/fault.upb.h" #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/duration.upb.h" @@ -24,21 +24,21 @@ static const upb_msglayout *const envoy_extensions_filters_common_fault_v3_Fault }; static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultDelay__fields[3] = { - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, - {4, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_msginit = { &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 0, 255, }; const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { @@ -48,31 +48,31 @@ static const upb_msglayout *const envoy_extensions_filters_common_fault_v3_Fault }; static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[3] = { - {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {2, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, + {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit = { &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 4, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit = { NULL, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h index 8c609170d4..d20e41a8a9 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_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" @@ -53,13 +53,19 @@ UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena, len); @@ -125,13 +131,19 @@ UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envo UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena, len); @@ -147,13 +159,19 @@ UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extens UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena, len); @@ -219,13 +237,19 @@ UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *e UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena, len); @@ -245,13 +269,19 @@ UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit * UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c index e363a2c402..d2eaa40417 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/filters/http/fault/v3/fault.upb.h" #include "envoy/config/route/v3/route_components.upb.h" #include "envoy/extensions/filters/common/fault/v3/fault.upb.h" @@ -25,22 +25,22 @@ static const upb_msglayout *const envoy_extensions_filters_http_fault_v3_FaultAb }; static const upb_msglayout_field envoy_extensions_filters_http_fault_v3_FaultAbort__fields[4] = { - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, 1}, - {3, UPB_SIZE(4, 8), 1, 1, 11, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, 1}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_msginit = { &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0], &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0], - UPB_SIZE(16, 32), 4, false, 255, + UPB_SIZE(16, 32), 4, false, 0, 255, }; const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[5] = { @@ -52,27 +52,27 @@ static const upb_msglayout *const envoy_extensions_filters_http_fault_v3_HTTPFau }; static const upb_msglayout_field envoy_extensions_filters_http_fault_v3_HTTPFault__fields[15] = { - {1, UPB_SIZE(68, 136), 1, 1, 11, 1}, - {2, UPB_SIZE(72, 144), 2, 3, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(84, 168), 0, 0, 11, 3}, - {5, UPB_SIZE(88, 176), 0, 0, 9, 3}, - {6, UPB_SIZE(76, 152), 3, 4, 11, 1}, - {7, UPB_SIZE(80, 160), 4, 2, 11, 1}, - {8, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {9, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {10, UPB_SIZE(28, 56), 0, 0, 9, 1}, - {11, UPB_SIZE(36, 72), 0, 0, 9, 1}, - {12, UPB_SIZE(44, 88), 0, 0, 9, 1}, - {13, UPB_SIZE(52, 104), 0, 0, 9, 1}, - {14, UPB_SIZE(60, 120), 0, 0, 9, 1}, - {15, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(68, 136), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(72, 144), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(84, 168), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(88, 176), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(76, 152), 3, 4, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(80, 160), 4, 2, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(28, 56), 0, 0, 9, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(36, 72), 0, 0, 9, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(44, 88), 0, 0, 9, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(52, 104), 0, 0, 9, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(60, 120), 0, 0, 9, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_http_fault_v3_HTTPFault_msginit = { &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0], &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0], - UPB_SIZE(96, 192), 15, false, 255, + UPB_SIZE(96, 192), 15, false, 15, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h index 08e71d4c4d..f5c45dc0e8 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_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" @@ -49,13 +49,19 @@ UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_f UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_http_fault_v3_FaultAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_http_fault_v3_FaultAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_http_fault_v3_FaultAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena, len); @@ -118,13 +124,19 @@ UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_ UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena, len); @@ -140,13 +152,19 @@ UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_fi UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_filters_http_fault_v3_HTTPFault_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_http_fault_v3_HTTPFault *ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_filters_http_fault_v3_HTTPFault_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_http_fault_v3_HTTPFault *ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_http_fault_v3_HTTPFault_serialize(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c index b69c2cda3f..e8a1462297 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/filters/http/router/v3/router.upb.h" #include "envoy/config/accesslog/v3/accesslog.upb.h" #include "google/protobuf/wrappers.upb.h" @@ -23,19 +23,19 @@ static const upb_msglayout *const envoy_extensions_filters_http_router_v3_Router }; static const upb_msglayout_field envoy_extensions_filters_http_router_v3_Router__fields[7] = { - {1, UPB_SIZE(8, 8), 1, 1, 11, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {3, UPB_SIZE(12, 16), 0, 0, 11, 3}, - {4, UPB_SIZE(2, 2), 0, 0, 8, 1}, - {5, UPB_SIZE(16, 24), 0, 0, 9, 3}, - {6, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {7, UPB_SIZE(4, 4), 0, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 16), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_http_router_v3_Router_msginit = { &envoy_extensions_filters_http_router_v3_Router_submsgs[0], &envoy_extensions_filters_http_router_v3_Router__fields[0], - UPB_SIZE(24, 32), 7, false, 255, + UPB_SIZE(24, 32), 7, false, 7, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h index 7174b6c2b0..57100fbcf0 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_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 envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filt UPB_INLINE envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filters_http_router_v3_Router_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_http_router_v3_Router *ret = envoy_extensions_filters_http_router_v3_Router_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filters_http_router_v3_Router_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_http_router_v3_Router *ret = envoy_extensions_filters_http_router_v3_Router_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_http_router_v3_Router_serialize(const envoy_extensions_filters_http_router_v3_Router *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_http_router_v3_Router_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c b/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c index 26db63b660..91839bf89e 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h" #include "envoy/config/accesslog/v3/accesslog.upb.h" #include "envoy/config/core/v3/base.upb.h" @@ -58,58 +58,58 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[46] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(32, 32), 0, 0, 9, 1}, - {3, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 15, 11, 1}, - {4, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 7, 11, 1}, - {5, UPB_SIZE(144, 256), 0, 13, 11, 3}, - {6, UPB_SIZE(56, 80), 1, 18, 11, 1}, - {7, UPB_SIZE(60, 88), 2, 11, 11, 1}, - {8, UPB_SIZE(64, 96), 3, 1, 11, 1}, - {9, UPB_SIZE(68, 104), 4, 2, 11, 1}, - {10, UPB_SIZE(40, 48), 0, 0, 9, 1}, - {12, UPB_SIZE(72, 112), 5, 19, 11, 1}, - {13, UPB_SIZE(148, 264), 0, 0, 11, 3}, - {14, UPB_SIZE(76, 120), 6, 18, 11, 1}, - {15, UPB_SIZE(80, 128), 7, 18, 11, 1}, - {16, UPB_SIZE(8, 8), 0, 0, 14, 1}, - {17, UPB_SIZE(84, 136), 8, 10, 11, 1}, - {18, UPB_SIZE(24, 24), 0, 0, 8, 1}, - {19, UPB_SIZE(20, 20), 0, 0, 13, 1}, - {20, UPB_SIZE(25, 25), 0, 0, 8, 1}, - {21, UPB_SIZE(26, 26), 0, 0, 8, 1}, - {22, UPB_SIZE(48, 64), 0, 0, 9, 1}, - {23, UPB_SIZE(152, 272), 0, 12, 11, 3}, - {24, UPB_SIZE(88, 144), 9, 19, 11, 1}, - {25, UPB_SIZE(92, 152), 10, 8, 11, 1}, - {26, UPB_SIZE(96, 160), 11, 19, 11, 1}, - {28, UPB_SIZE(100, 168), 12, 19, 11, 1}, - {29, UPB_SIZE(104, 176), 13, 20, 11, 1}, - {30, UPB_SIZE(108, 184), 14, 18, 11, 1}, - {31, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 17, 11, 1}, - {32, UPB_SIZE(27, 27), 0, 0, 8, 1}, - {33, UPB_SIZE(28, 28), 0, 0, 8, 1}, - {34, UPB_SIZE(12, 12), 0, 0, 14, 1}, - {35, UPB_SIZE(112, 192), 15, 4, 11, 1}, - {36, UPB_SIZE(116, 200), 16, 16, 11, 1}, - {37, UPB_SIZE(29, 29), 0, 0, 8, 1}, - {38, UPB_SIZE(120, 208), 17, 14, 11, 1}, - {39, UPB_SIZE(30, 30), 0, 0, 8, 1}, - {40, UPB_SIZE(124, 216), 18, 18, 11, 1}, - {41, UPB_SIZE(128, 224), 19, 19, 11, 1}, - {42, UPB_SIZE(168, 300), UPB_SIZE(-173, -305), 0, 8, 1}, - {43, UPB_SIZE(132, 232), 20, 9, 11, 1}, - {44, UPB_SIZE(136, 240), 21, 3, 11, 1}, - {45, UPB_SIZE(16, 16), 0, 0, 14, 1}, - {46, UPB_SIZE(156, 280), 0, 6, 11, 3}, - {47, UPB_SIZE(31, 31), 0, 0, 8, 1}, - {48, UPB_SIZE(140, 248), 22, 5, 11, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 32), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 15, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 7, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(144, 256), 0, 13, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(56, 80), 1, 18, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(60, 88), 2, 11, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(64, 96), 3, 1, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(68, 104), 4, 2, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(40, 48), 0, 0, 9, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(72, 112), 5, 19, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(148, 264), 0, 0, 11, _UPB_MODE_ARRAY}, + {14, UPB_SIZE(76, 120), 6, 18, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(80, 128), 7, 18, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(84, 136), 8, 10, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(24, 24), 0, 0, 8, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(20, 20), 0, 0, 13, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(25, 25), 0, 0, 8, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(26, 26), 0, 0, 8, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(48, 64), 0, 0, 9, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(152, 272), 0, 12, 11, _UPB_MODE_ARRAY}, + {24, UPB_SIZE(88, 144), 9, 19, 11, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(92, 152), 10, 8, 11, _UPB_MODE_SCALAR}, + {26, UPB_SIZE(96, 160), 11, 19, 11, _UPB_MODE_SCALAR}, + {28, UPB_SIZE(100, 168), 12, 19, 11, _UPB_MODE_SCALAR}, + {29, UPB_SIZE(104, 176), 13, 20, 11, _UPB_MODE_SCALAR}, + {30, UPB_SIZE(108, 184), 14, 18, 11, _UPB_MODE_SCALAR}, + {31, UPB_SIZE(160, 288), UPB_SIZE(-165, -297), 17, 11, _UPB_MODE_SCALAR}, + {32, UPB_SIZE(27, 27), 0, 0, 8, _UPB_MODE_SCALAR}, + {33, UPB_SIZE(28, 28), 0, 0, 8, _UPB_MODE_SCALAR}, + {34, UPB_SIZE(12, 12), 0, 0, 14, _UPB_MODE_SCALAR}, + {35, UPB_SIZE(112, 192), 15, 4, 11, _UPB_MODE_SCALAR}, + {36, UPB_SIZE(116, 200), 16, 16, 11, _UPB_MODE_SCALAR}, + {37, UPB_SIZE(29, 29), 0, 0, 8, _UPB_MODE_SCALAR}, + {38, UPB_SIZE(120, 208), 17, 14, 11, _UPB_MODE_SCALAR}, + {39, UPB_SIZE(30, 30), 0, 0, 8, _UPB_MODE_SCALAR}, + {40, UPB_SIZE(124, 216), 18, 18, 11, _UPB_MODE_SCALAR}, + {41, UPB_SIZE(128, 224), 19, 19, 11, _UPB_MODE_SCALAR}, + {42, UPB_SIZE(168, 300), UPB_SIZE(-173, -305), 0, 8, _UPB_MODE_SCALAR}, + {43, UPB_SIZE(132, 232), 20, 9, 11, _UPB_MODE_SCALAR}, + {44, UPB_SIZE(136, 240), 21, 3, 11, _UPB_MODE_SCALAR}, + {45, UPB_SIZE(16, 16), 0, 0, 14, _UPB_MODE_SCALAR}, + {46, UPB_SIZE(156, 280), 0, 6, 11, _UPB_MODE_ARRAY}, + {47, UPB_SIZE(31, 31), 0, 0, 8, _UPB_MODE_SCALAR}, + {48, UPB_SIZE(140, 248), 22, 5, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0], - UPB_SIZE(176, 320), 46, false, 255, + UPB_SIZE(176, 320), 46, false, 10, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[4] = { @@ -120,29 +120,29 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[7] = { - {3, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {4, UPB_SIZE(8, 16), 2, 2, 11, 1}, - {5, UPB_SIZE(12, 24), 3, 2, 11, 1}, - {6, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {7, UPB_SIZE(16, 32), 4, 3, 11, 1}, - {8, UPB_SIZE(24, 48), 0, 1, 11, 3}, - {9, UPB_SIZE(20, 40), 5, 0, 11, 1}, + {3, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(12, 24), 3, 2, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(16, 32), 4, 3, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(24, 48), 0, 1, 11, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(20, 40), 5, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[0], - UPB_SIZE(32, 56), 7, false, 255, + UPB_SIZE(32, 56), 7, false, 0, 255, }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit = { NULL, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = { @@ -150,17 +150,17 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[5] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {4, UPB_SIZE(2, 2), 0, 0, 8, 1}, - {5, UPB_SIZE(3, 3), 0, 0, 8, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(3, 3), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0], - UPB_SIZE(16, 16), 5, false, 255, + UPB_SIZE(16, 16), 5, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = { @@ -169,15 +169,15 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[1] = { @@ -185,14 +185,14 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = { @@ -201,14 +201,14 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[2] = { - {1, UPB_SIZE(8, 16), 0, 1, 11, 3}, - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = { @@ -220,17 +220,17 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[5] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 4, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 1, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 3, 11, 1}, - {5, UPB_SIZE(20, 40), 0, 2, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 4, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 2, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0], - UPB_SIZE(24, 48), 5, false, 255, + UPB_SIZE(24, 48), 5, false, 5, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = { @@ -238,14 +238,14 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = { @@ -253,13 +253,13 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = { @@ -270,17 +270,17 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[5] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 3, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, - {4, UPB_SIZE(20, 40), UPB_SIZE(-25, -49), 2, 11, 1}, - {5, UPB_SIZE(20, 40), UPB_SIZE(-25, -49), 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 40), UPB_SIZE(-25, -49), 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), UPB_SIZE(-25, -49), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 5, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = { @@ -288,13 +288,13 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = { @@ -302,13 +302,13 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = { @@ -316,27 +316,27 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[4] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 13, 1}, - {4, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 13, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__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 envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit = { NULL, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = { @@ -344,14 +344,14 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = { @@ -360,16 +360,16 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[4] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 1, 11, 1}, - {5, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 0, 11, 1}, - {6, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = { @@ -377,13 +377,13 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { @@ -391,13 +391,13 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti }; static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h index 3695e2a2cd..a331e53619 100644 --- a/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_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" @@ -167,13 +167,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit, arena, len); @@ -704,13 +710,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_msginit, arena, len); @@ -820,13 +832,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_msginit, arena, len); @@ -846,13 +864,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_msginit, arena, len); @@ -899,13 +923,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, arena, len); @@ -955,13 +985,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConne UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_msginit, arena, len); @@ -1007,13 +1043,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalRepl UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *ret = envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_msginit, arena, len); @@ -1059,13 +1101,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseM UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *ret = envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *ret = envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_msginit, arena, len); @@ -1156,13 +1204,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds *envo UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds *envoy_extensions_filters_network_http_connection_manager_v3_Rds_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_Rds *ret = envoy_extensions_filters_network_http_connection_manager_v3_Rds_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_Rds *envoy_extensions_filters_network_http_connection_manager_v3_Rds_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_Rds *ret = envoy_extensions_filters_network_http_connection_manager_v3_Rds_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_Rds_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit, arena, len); @@ -1197,13 +1251,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_msginit, arena, len); @@ -1234,13 +1294,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_msginit, arena, len); @@ -1325,13 +1391,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_msginit, arena, len); @@ -1362,13 +1434,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_msginit, arena, len); @@ -1404,13 +1482,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_msginit, arena, len); @@ -1460,13 +1544,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRou UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_msginit, arena, len); @@ -1490,13 +1580,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *ret = envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_msginit, arena, len); @@ -1531,13 +1627,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilte UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *ret = envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, arena, len); @@ -1596,13 +1698,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestID UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *ret = envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *ret = envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, arena, len); @@ -1633,13 +1741,19 @@ UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobi UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *ret = envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *ret = envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_serialize(const envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c index 44d63a4938..daf1765ccc 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h" diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h index f1b24af9e6..0b4d12fa3f 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_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" diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c index 6bd4e8d781..0bfb93c548 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/extension.upb.h" @@ -22,16 +22,16 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[4] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {3, UPB_SIZE(8, 8), 0, 0, 9, 3}, - {4, UPB_SIZE(12, 16), 0, 0, 9, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit = { NULL, &envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[0], - UPB_SIZE(16, 24), 4, false, 255, + UPB_SIZE(16, 24), 4, false, 4, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = { @@ -39,14 +39,14 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Priv }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit = { &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[3] = { @@ -56,19 +56,19 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsC }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[7] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 0, 11, 1}, - {5, UPB_SIZE(28, 56), 0, 0, 11, 3}, - {6, UPB_SIZE(20, 40), 5, 2, 11, 1}, - {7, UPB_SIZE(24, 48), 6, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(28, 56), 0, 0, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(20, 40), 5, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(24, 48), 6, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit = { &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0], - UPB_SIZE(32, 64), 7, false, 255, + UPB_SIZE(32, 64), 7, false, 7, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = { @@ -76,13 +76,13 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsS }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit = { &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[5] = { @@ -94,22 +94,22 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Cert }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[10] = { - {1, UPB_SIZE(12, 16), 1, 0, 11, 1}, - {2, UPB_SIZE(32, 56), 0, 0, 9, 3}, - {3, UPB_SIZE(36, 64), 0, 0, 9, 3}, - {6, UPB_SIZE(16, 24), 2, 4, 11, 1}, - {7, UPB_SIZE(20, 32), 3, 0, 11, 1}, - {8, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {9, UPB_SIZE(40, 72), 0, 3, 11, 3}, - {10, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {11, UPB_SIZE(24, 40), 4, 2, 11, 1}, - {12, UPB_SIZE(28, 48), 5, 1, 11, 1}, + {1, UPB_SIZE(12, 16), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 56), 0, 0, 9, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(36, 64), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(16, 24), 2, 4, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(20, 32), 3, 0, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(40, 72), 0, 3, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(24, 40), 4, 2, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(28, 48), 5, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0], - UPB_SIZE(48, 80), 10, false, 255, + UPB_SIZE(48, 80), 10, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h index e85f14b341..e554939cc3 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_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" @@ -70,13 +70,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters *envoy_extens UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters *envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsParameters *ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsParameters *envoy_extensions_transport_sockets_tls_v3_TlsParameters_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsParameters *ret = envoy_extensions_transport_sockets_tls_v3_TlsParameters_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_TlsParameters_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsParameters_msginit, arena, len); @@ -122,13 +128,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *envoy_e UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *ret = envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_serialize(const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, arena, len); @@ -168,13 +180,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate *envoy_exten UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate *envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsCertificate *ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsCertificate *envoy_extensions_transport_sockets_tls_v3_TlsCertificate_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsCertificate *ret = envoy_extensions_transport_sockets_tls_v3_TlsCertificate_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_TlsCertificate_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit, arena, len); @@ -295,13 +313,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *envoy UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *ret = envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_serialize(const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit, arena, len); @@ -332,13 +356,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContex UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c index 6717a17a02..9b0410c96a 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/config_source.upb.h" @@ -24,13 +24,13 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Gene }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit = { &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { @@ -38,14 +38,14 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_SdsS }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit = { &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = { @@ -56,17 +56,17 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Secr }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_Secret__fields[5] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_Secret_msginit = { &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_Secret__fields[0], - UPB_SIZE(16, 32), 5, false, 255, + UPB_SIZE(16, 32), 5, false, 5, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h index c576e0adce..07d2e11aae 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_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" @@ -49,13 +49,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret *envoy_extens UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret *envoy_extensions_transport_sockets_tls_v3_GenericSecret_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_GenericSecret *ret = envoy_extensions_transport_sockets_tls_v3_GenericSecret_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_GenericSecret *envoy_extensions_transport_sockets_tls_v3_GenericSecret_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_GenericSecret *ret = envoy_extensions_transport_sockets_tls_v3_GenericSecret_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_GenericSecret_serialize(const envoy_extensions_transport_sockets_tls_v3_GenericSecret *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit, arena, len); @@ -86,13 +92,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *envoy_exte UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *ret = envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *ret = envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_serialize(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit, arena, len); @@ -127,13 +139,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret *envoy_extensions_tr UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret *envoy_extensions_transport_sockets_tls_v3_Secret_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_Secret *ret = envoy_extensions_transport_sockets_tls_v3_Secret_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_Secret *envoy_extensions_transport_sockets_tls_v3_Secret_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_Secret *ret = envoy_extensions_transport_sockets_tls_v3_Secret_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_Secret_serialize(const envoy_extensions_transport_sockets_tls_v3_Secret *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c index ad5494ce2e..e9688999a2 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h" #include "envoy/config/core/v3/extension.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" @@ -27,16 +27,16 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Upst }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[4] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {4, UPB_SIZE(16, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[5] = { @@ -48,20 +48,20 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Down }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(12, 16), 2, 3, 11, 1}, - {3, UPB_SIZE(16, 24), 3, 3, 11, 1}, - {4, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 2, 11, 1}, - {5, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 1, 11, 1}, - {6, UPB_SIZE(20, 32), 4, 4, 11, 1}, - {7, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 0, 8, 1}, - {8, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 16), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 3, 3, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(20, 32), 4, 4, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(24, 40), UPB_SIZE(-29, -49), 0, 8, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0], - UPB_SIZE(32, 56), 8, false, 255, + UPB_SIZE(32, 56), 8, false, 8, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[8] = { @@ -76,24 +76,24 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Comm }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[12] = { - {1, UPB_SIZE(4, 8), 1, 7, 11, 1}, - {2, UPB_SIZE(20, 40), 0, 6, 11, 3}, - {3, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 1, 11, 1}, - {4, UPB_SIZE(24, 48), 0, 0, 9, 3}, - {6, UPB_SIZE(28, 56), 0, 5, 11, 3}, - {7, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 5, 11, 1}, - {8, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 4, 11, 1}, - {9, UPB_SIZE(8, 16), 2, 2, 11, 1}, - {10, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 2, 11, 1}, - {11, UPB_SIZE(12, 24), 3, 3, 11, 1}, - {12, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 3, 11, 1}, - {13, UPB_SIZE(16, 32), 4, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 7, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 40), 0, 6, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 48), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(28, 56), 0, 5, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 5, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 4, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(8, 16), 2, 2, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 2, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(12, 24), 3, 3, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 3, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(16, 32), 4, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0], - UPB_SIZE(40, 80), 12, false, 255, + UPB_SIZE(40, 80), 12, false, 4, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = { @@ -101,25 +101,25 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Comm }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit = { &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__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 envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit = { NULL, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = { @@ -130,16 +130,16 @@ static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Comm }; static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[4] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 3, 11, 1}, - {3, UPB_SIZE(12, 24), 3, 1, 11, 1}, - {4, UPB_SIZE(16, 32), 4, 2, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 3, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 32), 4, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h index 8a8ba90b7b..3b60270ae4 100644 --- a/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +++ b/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ #define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_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" @@ -72,13 +72,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *envoy_e UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_msginit, arena, len); @@ -132,13 +138,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *envoy UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_msginit, arena, len); @@ -259,13 +271,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *envoy_ext UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_msginit, arena, len); @@ -462,13 +480,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_msginit, arena, len); @@ -508,13 +532,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certificat UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_msginit, arena, len); @@ -538,13 +568,19 @@ UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCe UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_parse(const char *buf, size_t size, upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *ret = envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_serialize(const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c b/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c index cc8dcc4f56..737242bb89 100644 --- a/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/cluster/v3/cds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" @@ -20,7 +20,7 @@ const upb_msglayout envoy_service_cluster_v3_CdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h b/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h index 86fa3022b2..e716c68ae1 100644 --- a/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_CLUSTER_V3_CDS_PROTO_UPB_H_ #define ENVOY_SERVICE_CLUSTER_V3_CDS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_cluster_v3_CdsDummy *envoy_service_cluster_v3_CdsDummy_ UPB_INLINE envoy_service_cluster_v3_CdsDummy *envoy_service_cluster_v3_CdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_cluster_v3_CdsDummy *ret = envoy_service_cluster_v3_CdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_cluster_v3_CdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_cluster_v3_CdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_cluster_v3_CdsDummy *envoy_service_cluster_v3_CdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_cluster_v3_CdsDummy *ret = envoy_service_cluster_v3_CdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_cluster_v3_CdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_cluster_v3_CdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_cluster_v3_CdsDummy_serialize(const envoy_service_cluster_v3_CdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_cluster_v3_CdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c index 7fb8ac990d..f7535f70a9 100644 --- a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c +++ b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/discovery/v3/ads.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "udpa/annotations/status.upb.h" @@ -18,7 +18,7 @@ const upb_msglayout envoy_service_discovery_v3_AdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h index 0d26bd97dc..d2ed589620 100644 --- a/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h +++ b/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ #define ENVOY_SERVICE_DISCOVERY_V3_ADS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_discovery_v3_AdsDummy *envoy_service_discovery_v3_AdsDu UPB_INLINE envoy_service_discovery_v3_AdsDummy *envoy_service_discovery_v3_AdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_AdsDummy *ret = envoy_service_discovery_v3_AdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_AdsDummy *envoy_service_discovery_v3_AdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_AdsDummy *ret = envoy_service_discovery_v3_AdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_AdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_AdsDummy_serialize(const envoy_service_discovery_v3_AdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_AdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c b/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c index a5b6ac46aa..24795272fd 100644 --- a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c +++ b/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "google/protobuf/any.upb.h" @@ -24,18 +24,18 @@ static const upb_msglayout *const envoy_service_discovery_v3_DiscoveryRequest_su }; static const upb_msglayout_field envoy_service_discovery_v3_DiscoveryRequest__fields[6] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(28, 56), 1, 0, 11, 1}, - {3, UPB_SIZE(36, 72), 0, 0, 9, 3}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {5, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {6, UPB_SIZE(32, 64), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(28, 56), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(36, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(32, 64), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_DiscoveryRequest_msginit = { &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DiscoveryRequest__fields[0], - UPB_SIZE(40, 80), 6, false, 255, + UPB_SIZE(40, 80), 6, false, 6, 255, }; static const upb_msglayout *const envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = { @@ -44,18 +44,18 @@ static const upb_msglayout *const envoy_service_discovery_v3_DiscoveryResponse_s }; static const upb_msglayout_field envoy_service_discovery_v3_DiscoveryResponse__fields[6] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(32, 64), 0, 1, 11, 3}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {5, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {6, UPB_SIZE(28, 56), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 64), 0, 1, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 56), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_DiscoveryResponse_msginit = { &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DiscoveryResponse__fields[0], - UPB_SIZE(40, 80), 6, false, 255, + UPB_SIZE(40, 80), 6, false, 6, 255, }; static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[3] = { @@ -65,30 +65,30 @@ static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryReque }; static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[7] = { - {1, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {4, UPB_SIZE(32, 64), 0, 0, 9, 3}, - {5, UPB_SIZE(36, 72), 0, 1, 11, _UPB_LABEL_MAP}, - {6, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {7, UPB_SIZE(24, 48), 2, 2, 11, 1}, + {1, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 56), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(32, 64), 0, 0, 9, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(36, 72), 0, 1, 11, _UPB_MODE_MAP}, + {6, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(24, 48), 2, 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit = { &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0], - UPB_SIZE(40, 80), 7, false, 255, + UPB_SIZE(40, 80), 7, false, 7, 255, }; static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__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 envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msginit = { NULL, &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[2] = { @@ -97,18 +97,18 @@ static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryRespo }; static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[6] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(32, 64), 0, 1, 11, 3}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {5, UPB_SIZE(20, 40), 0, 0, 9, 1}, - {6, UPB_SIZE(36, 72), 0, 0, 9, 3}, - {7, UPB_SIZE(28, 56), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 64), 0, 1, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(36, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(28, 56), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit = { &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0], - UPB_SIZE(40, 80), 6, false, 255, + UPB_SIZE(40, 80), 6, false, 2, 255, }; static const upb_msglayout *const envoy_service_discovery_v3_Resource_submsgs[3] = { @@ -118,28 +118,28 @@ static const upb_msglayout *const envoy_service_discovery_v3_Resource_submsgs[3] }; static const upb_msglayout_field envoy_service_discovery_v3_Resource__fields[6] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 1, 1, 11, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(32, 64), 0, 0, 9, 3}, - {6, UPB_SIZE(24, 48), 2, 2, 11, 1}, - {7, UPB_SIZE(28, 56), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 40), 1, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 64), 0, 0, 9, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(24, 48), 2, 2, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 56), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_Resource_msginit = { &envoy_service_discovery_v3_Resource_submsgs[0], &envoy_service_discovery_v3_Resource__fields[0], - UPB_SIZE(40, 80), 6, false, 255, + UPB_SIZE(40, 80), 6, false, 4, 255, }; static const upb_msglayout_field envoy_service_discovery_v3_Resource_CacheControl__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_discovery_v3_Resource_CacheControl_msginit = { NULL, &envoy_service_discovery_v3_Resource_CacheControl__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h b/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h index def2787639..105e033058 100644 --- a/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h +++ b/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ #define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_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" @@ -61,13 +61,19 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest *envoy_service_discovery_ UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest *envoy_service_discovery_v3_DiscoveryRequest_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_DiscoveryRequest *ret = envoy_service_discovery_v3_DiscoveryRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_DiscoveryRequest *envoy_service_discovery_v3_DiscoveryRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_DiscoveryRequest *ret = envoy_service_discovery_v3_DiscoveryRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_DiscoveryRequest_serialize(const envoy_service_discovery_v3_DiscoveryRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_DiscoveryRequest_msginit, arena, len); @@ -136,13 +142,19 @@ UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse *envoy_service_discovery UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse *envoy_service_discovery_v3_DiscoveryResponse_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_DiscoveryResponse *ret = envoy_service_discovery_v3_DiscoveryResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_DiscoveryResponse *envoy_service_discovery_v3_DiscoveryResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_DiscoveryResponse *ret = envoy_service_discovery_v3_DiscoveryResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_DiscoveryResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_DiscoveryResponse_serialize(const envoy_service_discovery_v3_DiscoveryResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_DiscoveryResponse_msginit, arena, len); @@ -204,13 +216,19 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest *envoy_service_disco UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest *envoy_service_discovery_v3_DeltaDiscoveryRequest_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_DeltaDiscoveryRequest *ret = envoy_service_discovery_v3_DeltaDiscoveryRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest *envoy_service_discovery_v3_DeltaDiscoveryRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_DeltaDiscoveryRequest *ret = envoy_service_discovery_v3_DeltaDiscoveryRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_DeltaDiscoveryRequest_serialize(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, arena, len); @@ -311,13 +329,19 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse *envoy_service_disc UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse *envoy_service_discovery_v3_DeltaDiscoveryResponse_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_DeltaDiscoveryResponse *ret = envoy_service_discovery_v3_DeltaDiscoveryResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryResponse *envoy_service_discovery_v3_DeltaDiscoveryResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_DeltaDiscoveryResponse *ret = envoy_service_discovery_v3_DeltaDiscoveryResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_DeltaDiscoveryResponse_serialize(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, arena, len); @@ -386,13 +410,19 @@ UPB_INLINE envoy_service_discovery_v3_Resource *envoy_service_discovery_v3_Resou UPB_INLINE envoy_service_discovery_v3_Resource *envoy_service_discovery_v3_Resource_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_Resource *ret = envoy_service_discovery_v3_Resource_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_Resource *envoy_service_discovery_v3_Resource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_Resource *ret = envoy_service_discovery_v3_Resource_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_Resource_serialize(const envoy_service_discovery_v3_Resource *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_Resource_msginit, arena, len); @@ -472,13 +502,19 @@ UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_disco UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_discovery_v3_Resource_CacheControl_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_discovery_v3_Resource_CacheControl *ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_discovery_v3_Resource_CacheControl_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_discovery_v3_Resource_CacheControl *ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_discovery_v3_Resource_CacheControl_serialize(const envoy_service_discovery_v3_Resource_CacheControl *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c b/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c index 0af0480487..7ceb472338 100644 --- a/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/endpoint/v3/eds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" @@ -20,7 +20,7 @@ const upb_msglayout envoy_service_endpoint_v3_EdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h b/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h index 1b1fd3d0a1..565f669f85 100644 --- a/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_ENDPOINT_V3_EDS_PROTO_UPB_H_ #define ENVOY_SERVICE_ENDPOINT_V3_EDS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_endpoint_v3_EdsDummy *envoy_service_endpoint_v3_EdsDumm UPB_INLINE envoy_service_endpoint_v3_EdsDummy *envoy_service_endpoint_v3_EdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_endpoint_v3_EdsDummy *ret = envoy_service_endpoint_v3_EdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_endpoint_v3_EdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_endpoint_v3_EdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_endpoint_v3_EdsDummy *envoy_service_endpoint_v3_EdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_endpoint_v3_EdsDummy *ret = envoy_service_endpoint_v3_EdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_endpoint_v3_EdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_endpoint_v3_EdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_endpoint_v3_EdsDummy_serialize(const envoy_service_endpoint_v3_EdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_endpoint_v3_EdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c b/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c index 404bfa414f..87b690955c 100644 --- a/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/listener/v3/lds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" @@ -20,7 +20,7 @@ const upb_msglayout envoy_service_listener_v3_LdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h b/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h index 9b8988c1ad..1a20545deb 100644 --- a/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_LISTENER_V3_LDS_PROTO_UPB_H_ #define ENVOY_SERVICE_LISTENER_V3_LDS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_listener_v3_LdsDummy *envoy_service_listener_v3_LdsDumm UPB_INLINE envoy_service_listener_v3_LdsDummy *envoy_service_listener_v3_LdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_listener_v3_LdsDummy *ret = envoy_service_listener_v3_LdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_listener_v3_LdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_listener_v3_LdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_listener_v3_LdsDummy *envoy_service_listener_v3_LdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_listener_v3_LdsDummy *ret = envoy_service_listener_v3_LdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_listener_v3_LdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_listener_v3_LdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_listener_v3_LdsDummy_serialize(const envoy_service_listener_v3_LdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_listener_v3_LdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c b/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c index 68fe078f09..679b3c3274 100644 --- a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c +++ b/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/load_stats/v3/lrs.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/endpoint/v3/load_report.upb.h" @@ -23,14 +23,14 @@ static const upb_msglayout *const envoy_service_load_stats_v3_LoadStatsRequest_s }; static const upb_msglayout_field envoy_service_load_stats_v3_LoadStatsRequest__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_service_load_stats_v3_LoadStatsRequest_msginit = { &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0], &envoy_service_load_stats_v3_LoadStatsRequest__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = { @@ -38,16 +38,16 @@ static const upb_msglayout *const envoy_service_load_stats_v3_LoadStatsResponse_ }; static const upb_msglayout_field envoy_service_load_stats_v3_LoadStatsResponse__fields[4] = { - {1, UPB_SIZE(8, 16), 0, 0, 9, 3}, - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {4, UPB_SIZE(2, 2), 0, 0, 8, 1}, + {1, UPB_SIZE(8, 16), 0, 0, 9, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(2, 2), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_load_stats_v3_LoadStatsResponse_msginit = { &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0], &envoy_service_load_stats_v3_LoadStatsResponse__fields[0], - UPB_SIZE(16, 24), 4, false, 255, + UPB_SIZE(16, 24), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h b/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h index f74a023120..5146f494f9 100644 --- a/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h +++ b/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ #define ENVOY_SERVICE_LOAD_STATS_V3_LRS_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" @@ -42,13 +42,19 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest *envoy_service_load_stat UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest *envoy_service_load_stats_v3_LoadStatsRequest_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_load_stats_v3_LoadStatsRequest *ret = envoy_service_load_stats_v3_LoadStatsRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_load_stats_v3_LoadStatsRequest *envoy_service_load_stats_v3_LoadStatsRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_load_stats_v3_LoadStatsRequest *ret = envoy_service_load_stats_v3_LoadStatsRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_load_stats_v3_LoadStatsRequest_serialize(const envoy_service_load_stats_v3_LoadStatsRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_load_stats_v3_LoadStatsRequest_msginit, arena, len); @@ -94,13 +100,19 @@ UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse *envoy_service_load_sta UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse *envoy_service_load_stats_v3_LoadStatsResponse_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_load_stats_v3_LoadStatsResponse *ret = envoy_service_load_stats_v3_LoadStatsResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_load_stats_v3_LoadStatsResponse *envoy_service_load_stats_v3_LoadStatsResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_load_stats_v3_LoadStatsResponse *ret = envoy_service_load_stats_v3_LoadStatsResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_load_stats_v3_LoadStatsResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_load_stats_v3_LoadStatsResponse_serialize(const envoy_service_load_stats_v3_LoadStatsResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_load_stats_v3_LoadStatsResponse_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c b/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c index 07d17f6127..37234550f8 100644 --- a/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/route/v3/rds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" @@ -20,7 +20,7 @@ const upb_msglayout envoy_service_route_v3_RdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h b/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h index 40a6d42563..20eeb8bcbb 100644 --- a/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_ROUTE_V3_RDS_PROTO_UPB_H_ #define ENVOY_SERVICE_ROUTE_V3_RDS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_route_v3_RdsDummy *envoy_service_route_v3_RdsDummy_new( UPB_INLINE envoy_service_route_v3_RdsDummy *envoy_service_route_v3_RdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_route_v3_RdsDummy *ret = envoy_service_route_v3_RdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_route_v3_RdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_route_v3_RdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_route_v3_RdsDummy *envoy_service_route_v3_RdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_route_v3_RdsDummy *ret = envoy_service_route_v3_RdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_route_v3_RdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_route_v3_RdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_route_v3_RdsDummy_serialize(const envoy_service_route_v3_RdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_route_v3_RdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c b/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c index 6dbaa817c9..01e3110b0f 100644 --- a/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/route/v3/srds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" @@ -20,7 +20,7 @@ const upb_msglayout envoy_service_route_v3_SrdsDummy_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h b/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h index e86154b742..a8486d54fb 100644 --- a/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_ROUTE_V3_SRDS_PROTO_UPB_H_ #define ENVOY_SERVICE_ROUTE_V3_SRDS_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_service_route_v3_SrdsDummy *envoy_service_route_v3_SrdsDummy_ne UPB_INLINE envoy_service_route_v3_SrdsDummy *envoy_service_route_v3_SrdsDummy_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_route_v3_SrdsDummy *ret = envoy_service_route_v3_SrdsDummy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_route_v3_SrdsDummy_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_route_v3_SrdsDummy_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_route_v3_SrdsDummy *envoy_service_route_v3_SrdsDummy_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_route_v3_SrdsDummy *ret = envoy_service_route_v3_SrdsDummy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_route_v3_SrdsDummy_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_route_v3_SrdsDummy_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_route_v3_SrdsDummy_serialize(const envoy_service_route_v3_SrdsDummy *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_route_v3_SrdsDummy_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c b/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c index fa36211f0b..dae701e8cc 100644 --- a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c +++ b/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/service/status/v3/csds.upb.h" #include "envoy/admin/v3/config_dump.upb.h" #include "envoy/config/core/v3/base.upb.h" @@ -27,14 +27,14 @@ static const upb_msglayout *const envoy_service_status_v3_ClientStatusRequest_su }; static const upb_msglayout_field envoy_service_status_v3_ClientStatusRequest__fields[2] = { - {1, UPB_SIZE(8, 16), 0, 1, 11, 3}, - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_status_v3_ClientStatusRequest_msginit = { &envoy_service_status_v3_ClientStatusRequest_submsgs[0], &envoy_service_status_v3_ClientStatusRequest__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const envoy_service_status_v3_PerXdsConfig_submsgs[5] = { @@ -46,19 +46,19 @@ static const upb_msglayout *const envoy_service_status_v3_PerXdsConfig_submsgs[5 }; static const upb_msglayout_field envoy_service_status_v3_PerXdsConfig__fields[7] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 2, 11, 1}, - {3, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 0, 11, 1}, - {4, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 3, 11, 1}, - {5, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 4, 11, 1}, - {6, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 1, 11, 1}, - {7, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 3, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 4, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_status_v3_PerXdsConfig_msginit = { &envoy_service_status_v3_PerXdsConfig_submsgs[0], &envoy_service_status_v3_PerXdsConfig__fields[0], - UPB_SIZE(16, 24), 7, false, 255, + UPB_SIZE(16, 24), 7, false, 7, 255, }; static const upb_msglayout *const envoy_service_status_v3_ClientConfig_submsgs[3] = { @@ -68,15 +68,15 @@ static const upb_msglayout *const envoy_service_status_v3_ClientConfig_submsgs[3 }; static const upb_msglayout_field envoy_service_status_v3_ClientConfig__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 2, 11, 3}, - {3, UPB_SIZE(12, 24), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 2, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_service_status_v3_ClientConfig_msginit = { &envoy_service_status_v3_ClientConfig_submsgs[0], &envoy_service_status_v3_ClientConfig__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = { @@ -86,21 +86,21 @@ static const upb_msglayout *const envoy_service_status_v3_ClientConfig_GenericXd }; static const upb_msglayout_field envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[9] = { - {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 32), 0, 0, 9, 1}, - {3, UPB_SIZE(32, 48), 0, 0, 9, 1}, - {4, UPB_SIZE(40, 64), 1, 1, 11, 1}, - {5, UPB_SIZE(44, 72), 2, 2, 11, 1}, - {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {7, UPB_SIZE(8, 8), 0, 0, 14, 1}, - {8, UPB_SIZE(48, 80), 3, 0, 11, 1}, - {9, UPB_SIZE(12, 12), 0, 0, 8, 1}, + {1, UPB_SIZE(16, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 32), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(32, 48), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(40, 64), 1, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(44, 72), 2, 2, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(8, 8), 0, 0, 14, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(48, 80), 3, 0, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(12, 12), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit = { &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0], &envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0], - UPB_SIZE(56, 96), 9, false, 255, + UPB_SIZE(56, 96), 9, false, 9, 255, }; static const upb_msglayout *const envoy_service_status_v3_ClientStatusResponse_submsgs[1] = { @@ -108,13 +108,13 @@ static const upb_msglayout *const envoy_service_status_v3_ClientStatusResponse_s }; static const upb_msglayout_field envoy_service_status_v3_ClientStatusResponse__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_service_status_v3_ClientStatusResponse_msginit = { &envoy_service_status_v3_ClientStatusResponse_submsgs[0], &envoy_service_status_v3_ClientStatusResponse__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h b/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h index ffc61cddcd..56b60471a2 100644 --- a/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h +++ b/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ #define ENVOY_SERVICE_STATUS_V3_CSDS_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" @@ -80,13 +80,19 @@ UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ClientStatusRequest_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_status_v3_ClientStatusRequest *ret = envoy_service_status_v3_ClientStatusRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ClientStatusRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_status_v3_ClientStatusRequest *ret = envoy_service_status_v3_ClientStatusRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_status_v3_ClientStatusRequest_serialize(const envoy_service_status_v3_ClientStatusRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_status_v3_ClientStatusRequest_msginit, arena, len); @@ -132,13 +138,19 @@ UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsC UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_status_v3_PerXdsConfig *ret = envoy_service_status_v3_PerXdsConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_status_v3_PerXdsConfig *ret = envoy_service_status_v3_PerXdsConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_status_v3_PerXdsConfig_serialize(const envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_status_v3_PerXdsConfig_msginit, arena, len); @@ -242,13 +254,19 @@ UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientC UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_status_v3_ClientConfig *ret = envoy_service_status_v3_ClientConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_status_v3_ClientConfig *ret = envoy_service_status_v3_ClientConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_status_v3_ClientConfig_serialize(const envoy_service_status_v3_ClientConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_status_v3_ClientConfig_msginit, arena, len); @@ -309,13 +327,19 @@ UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig *envoy_service_ UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig *envoy_service_status_v3_ClientConfig_GenericXdsConfig_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_status_v3_ClientConfig_GenericXdsConfig *ret = envoy_service_status_v3_ClientConfig_GenericXdsConfig_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_status_v3_ClientConfig_GenericXdsConfig *envoy_service_status_v3_ClientConfig_GenericXdsConfig_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_status_v3_ClientConfig_GenericXdsConfig *ret = envoy_service_status_v3_ClientConfig_GenericXdsConfig_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_status_v3_ClientConfig_GenericXdsConfig_serialize(const envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit, arena, len); @@ -400,13 +424,19 @@ UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3 UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3_ClientStatusResponse_parse(const char *buf, size_t size, upb_arena *arena) { envoy_service_status_v3_ClientStatusResponse *ret = envoy_service_status_v3_ClientStatusResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3_ClientStatusResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_service_status_v3_ClientStatusResponse *ret = envoy_service_status_v3_ClientStatusResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_service_status_v3_ClientStatusResponse_serialize(const envoy_service_status_v3_ClientStatusResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_service_status_v3_ClientStatusResponse_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c b/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c index 77d6d9a40e..f3e2dc918c 100644 --- a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c +++ b/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/http/v3/path_transformation.upb.h" #include "udpa/annotations/status.upb.h" #include "validate/validate.upb.h" @@ -19,13 +19,13 @@ static const upb_msglayout *const envoy_type_http_v3_PathTransformation_submsgs[ }; static const upb_msglayout_field envoy_type_http_v3_PathTransformation__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_type_http_v3_PathTransformation_msginit = { &envoy_type_http_v3_PathTransformation_submsgs[0], &envoy_type_http_v3_PathTransformation__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = { @@ -34,26 +34,26 @@ static const upb_msglayout *const envoy_type_http_v3_PathTransformation_Operatio }; static const upb_msglayout_field envoy_type_http_v3_PathTransformation_Operation__fields[2] = { - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_msginit = { &envoy_type_http_v3_PathTransformation_Operation_submsgs[0], &envoy_type_http_v3_PathTransformation_Operation__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 0, 255, }; const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h b/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h index 2aa31596dc..725573e644 100644 --- a/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h +++ b/src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ #define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_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" @@ -42,13 +42,19 @@ UPB_INLINE envoy_type_http_v3_PathTransformation *envoy_type_http_v3_PathTransfo UPB_INLINE envoy_type_http_v3_PathTransformation *envoy_type_http_v3_PathTransformation_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_http_v3_PathTransformation *ret = envoy_type_http_v3_PathTransformation_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_http_v3_PathTransformation *envoy_type_http_v3_PathTransformation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_http_v3_PathTransformation *ret = envoy_type_http_v3_PathTransformation_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_http_v3_PathTransformation_serialize(const envoy_type_http_v3_PathTransformation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_http_v3_PathTransformation_msginit, arena, len); @@ -79,13 +85,19 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation *envoy_type_http_v3_P UPB_INLINE envoy_type_http_v3_PathTransformation_Operation *envoy_type_http_v3_PathTransformation_Operation_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation *ret = envoy_type_http_v3_PathTransformation_Operation_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_http_v3_PathTransformation_Operation *envoy_type_http_v3_PathTransformation_Operation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation *ret = envoy_type_http_v3_PathTransformation_Operation_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_http_v3_PathTransformation_Operation_serialize(const envoy_type_http_v3_PathTransformation_Operation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_http_v3_PathTransformation_Operation_msginit, arena, len); @@ -136,13 +148,19 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 *envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 *ret = envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 *envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 *ret = envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_serialize(const envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986 *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit, arena, len); @@ -158,13 +176,19 @@ UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *envoy_t UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *ret = envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *ret = envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_serialize(const envoy_type_http_v3_PathTransformation_Operation_MergeSlashes *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c index 7fdf5b9fea..054823949a 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/metadata.upb.h" #include "envoy/type/matcher/v3/value.upb.h" #include "udpa/annotations/status.upb.h" @@ -22,25 +22,25 @@ static const upb_msglayout *const envoy_type_matcher_v3_MetadataMatcher_submsgs[ }; static const upb_msglayout_field envoy_type_matcher_v3_MetadataMatcher__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_MetadataMatcher_msginit = { &envoy_type_matcher_v3_MetadataMatcher_submsgs[0], &envoy_type_matcher_v3_MetadataMatcher__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout_field envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit = { NULL, &envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h index a7f17c1448..18209e03e9 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_METADATA_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_type_matcher_v3_MetadataMatcher *envoy_type_matcher_v3_Metadata UPB_INLINE envoy_type_matcher_v3_MetadataMatcher *envoy_type_matcher_v3_MetadataMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_MetadataMatcher *ret = envoy_type_matcher_v3_MetadataMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_MetadataMatcher *envoy_type_matcher_v3_MetadataMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_MetadataMatcher *ret = envoy_type_matcher_v3_MetadataMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_MetadataMatcher_serialize(const envoy_type_matcher_v3_MetadataMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_MetadataMatcher_msginit, arena, len); @@ -94,13 +100,19 @@ UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment *envoy_type_matcher UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment *envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_MetadataMatcher_PathSegment *ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment *envoy_type_matcher_v3_MetadataMatcher_PathSegment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_MetadataMatcher_PathSegment *ret = envoy_type_matcher_v3_MetadataMatcher_PathSegment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_MetadataMatcher_PathSegment_serialize(const envoy_type_matcher_v3_MetadataMatcher_PathSegment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c index 8ef51fb91e..3ae84d4d13 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/node.upb.h" #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/matcher/v3/struct.upb.h" @@ -22,14 +22,14 @@ static const upb_msglayout *const envoy_type_matcher_v3_NodeMatcher_submsgs[2] = }; static const upb_msglayout_field envoy_type_matcher_v3_NodeMatcher__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit = { &envoy_type_matcher_v3_NodeMatcher_submsgs[0], &envoy_type_matcher_v3_NodeMatcher__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h index 94e2257fdf..78873ad32d 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_NODE_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 envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_ UPB_INLINE envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_NodeMatcher *ret = envoy_type_matcher_v3_NodeMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_NodeMatcher *ret = envoy_type_matcher_v3_NodeMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_NodeMatcher_serialize(const envoy_type_matcher_v3_NodeMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_NodeMatcher_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c index 516755b0bf..cb116d0560 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/number.upb.h" #include "envoy/type/v3/range.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const envoy_type_matcher_v3_DoubleMatcher_submsgs[1] }; static const upb_msglayout_field envoy_type_matcher_v3_DoubleMatcher__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -9), 0, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -9), 0, 1, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -9), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -9), 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_DoubleMatcher_msginit = { &envoy_type_matcher_v3_DoubleMatcher_submsgs[0], &envoy_type_matcher_v3_DoubleMatcher__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h index ebca3037aa..1a4c14587f 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_NUMBER_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 envoy_type_matcher_v3_DoubleMatcher *envoy_type_matcher_v3_DoubleMatc UPB_INLINE envoy_type_matcher_v3_DoubleMatcher *envoy_type_matcher_v3_DoubleMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_DoubleMatcher *ret = envoy_type_matcher_v3_DoubleMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_DoubleMatcher *envoy_type_matcher_v3_DoubleMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_DoubleMatcher *ret = envoy_type_matcher_v3_DoubleMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_DoubleMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_DoubleMatcher_serialize(const envoy_type_matcher_v3_DoubleMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_DoubleMatcher_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c index caef339563..822084c096 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/path.upb.h" #include "envoy/type/matcher/v3/string.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,13 +21,13 @@ static const upb_msglayout *const envoy_type_matcher_v3_PathMatcher_submsgs[1] = }; static const upb_msglayout_field envoy_type_matcher_v3_PathMatcher__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_PathMatcher_msginit = { &envoy_type_matcher_v3_PathMatcher_submsgs[0], &envoy_type_matcher_v3_PathMatcher__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h index defbcf0264..1c0e40bd8e 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_PATH_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 envoy_type_matcher_v3_PathMatcher *envoy_type_matcher_v3_PathMatcher_ UPB_INLINE envoy_type_matcher_v3_PathMatcher *envoy_type_matcher_v3_PathMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_PathMatcher *ret = envoy_type_matcher_v3_PathMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_PathMatcher *envoy_type_matcher_v3_PathMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_PathMatcher *ret = envoy_type_matcher_v3_PathMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_PathMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_PathMatcher_serialize(const envoy_type_matcher_v3_PathMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_PathMatcher_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c index d7d645ad96..115fa08425 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/regex.upb.h" #include "google/protobuf/wrappers.upb.h" #include "envoy/annotations/deprecation.upb.h" @@ -22,14 +22,14 @@ static const upb_msglayout *const envoy_type_matcher_v3_RegexMatcher_submsgs[1] }; static const upb_msglayout_field envoy_type_matcher_v3_RegexMatcher__fields[2] = { - {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_RegexMatcher_msginit = { &envoy_type_matcher_v3_RegexMatcher_submsgs[0], &envoy_type_matcher_v3_RegexMatcher__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = { @@ -37,13 +37,13 @@ static const upb_msglayout *const envoy_type_matcher_v3_RegexMatcher_GoogleRE2_s }; static const upb_msglayout_field envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit = { &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0], &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { @@ -51,14 +51,14 @@ static const upb_msglayout *const envoy_type_matcher_v3_RegexMatchAndSubstitute_ }; static const upb_msglayout_field envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[2] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit = { &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0], &envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h index 5e00d13f18..ce7d14ec71 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_REGEX_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" @@ -41,13 +41,19 @@ UPB_INLINE envoy_type_matcher_v3_RegexMatcher *envoy_type_matcher_v3_RegexMatche UPB_INLINE envoy_type_matcher_v3_RegexMatcher *envoy_type_matcher_v3_RegexMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_RegexMatcher *ret = envoy_type_matcher_v3_RegexMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_RegexMatcher *envoy_type_matcher_v3_RegexMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_RegexMatcher *ret = envoy_type_matcher_v3_RegexMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_RegexMatcher_serialize(const envoy_type_matcher_v3_RegexMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_RegexMatcher_msginit, arena, len); @@ -87,13 +93,19 @@ UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *envoy_type_matcher_v3_R UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *envoy_type_matcher_v3_RegexMatcher_GoogleRE2_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *ret = envoy_type_matcher_v3_RegexMatcher_GoogleRE2_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_RegexMatcher_GoogleRE2_serialize(const envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit, arena, len); @@ -124,13 +136,19 @@ UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute *envoy_type_matcher_v3_ UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute *envoy_type_matcher_v3_RegexMatchAndSubstitute_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_RegexMatchAndSubstitute *ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_RegexMatchAndSubstitute *envoy_type_matcher_v3_RegexMatchAndSubstitute_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_RegexMatchAndSubstitute *ret = envoy_type_matcher_v3_RegexMatchAndSubstitute_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_RegexMatchAndSubstitute_serialize(const envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c index e84e4f7c92..a0c367d0a1 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/matcher/v3/regex.upb.h" #include "udpa/annotations/status.upb.h" @@ -21,18 +21,18 @@ static const upb_msglayout *const envoy_type_matcher_v3_StringMatcher_submsgs[1] }; static const upb_msglayout_field envoy_type_matcher_v3_StringMatcher__fields[6] = { - {1, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, - {2, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, - {3, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, - {5, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 11, 1}, - {6, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {7, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, + {1, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_StringMatcher_msginit = { &envoy_type_matcher_v3_StringMatcher_submsgs[0], &envoy_type_matcher_v3_StringMatcher__fields[0], - UPB_SIZE(16, 32), 6, false, 255, + UPB_SIZE(16, 32), 6, false, 3, 255, }; static const upb_msglayout *const envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = { @@ -40,13 +40,13 @@ static const upb_msglayout *const envoy_type_matcher_v3_ListStringMatcher_submsg }; static const upb_msglayout_field envoy_type_matcher_v3_ListStringMatcher__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_type_matcher_v3_ListStringMatcher_msginit = { &envoy_type_matcher_v3_ListStringMatcher_submsgs[0], &envoy_type_matcher_v3_ListStringMatcher__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h index 4bce450ca8..05313a26ae 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_STRING_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_type_matcher_v3_StringMatcher *envoy_type_matcher_v3_StringMatc UPB_INLINE envoy_type_matcher_v3_StringMatcher *envoy_type_matcher_v3_StringMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_StringMatcher *ret = envoy_type_matcher_v3_StringMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_StringMatcher *envoy_type_matcher_v3_StringMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_StringMatcher *ret = envoy_type_matcher_v3_StringMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_StringMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_StringMatcher_serialize(const envoy_type_matcher_v3_StringMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_StringMatcher_msginit, arena, len); @@ -108,13 +114,19 @@ UPB_INLINE envoy_type_matcher_v3_ListStringMatcher *envoy_type_matcher_v3_ListSt UPB_INLINE envoy_type_matcher_v3_ListStringMatcher *envoy_type_matcher_v3_ListStringMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_ListStringMatcher *ret = envoy_type_matcher_v3_ListStringMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_ListStringMatcher *envoy_type_matcher_v3_ListStringMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_ListStringMatcher *ret = envoy_type_matcher_v3_ListStringMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListStringMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_ListStringMatcher_serialize(const envoy_type_matcher_v3_ListStringMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_ListStringMatcher_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c index 05ea6a3ffc..7fef88683f 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/struct.upb.h" #include "envoy/type/matcher/v3/value.upb.h" #include "udpa/annotations/status.upb.h" @@ -22,24 +22,24 @@ static const upb_msglayout *const envoy_type_matcher_v3_StructMatcher_submsgs[2] }; static const upb_msglayout_field envoy_type_matcher_v3_StructMatcher__fields[2] = { - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, - {3, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(4, 8), 1, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_StructMatcher_msginit = { &envoy_type_matcher_v3_StructMatcher_submsgs[0], &envoy_type_matcher_v3_StructMatcher__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 0, 255, }; static const upb_msglayout_field envoy_type_matcher_v3_StructMatcher_PathSegment__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_StructMatcher_PathSegment_msginit = { NULL, &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h index 53e521385d..a7939b7c39 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_STRUCT_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" @@ -38,13 +38,19 @@ UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatc UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_StructMatcher *ret = envoy_type_matcher_v3_StructMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_StructMatcher *ret = envoy_type_matcher_v3_StructMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_StructMatcher_serialize(const envoy_type_matcher_v3_StructMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_StructMatcher_msginit, arena, len); @@ -90,13 +96,19 @@ UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v3_StructMatcher_PathSegment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_StructMatcher_PathSegment *ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v3_StructMatcher_PathSegment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_StructMatcher_PathSegment *ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_StructMatcher_PathSegment_serialize(const envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c b/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c index 0195307d0c..5f28e3503e 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/matcher/v3/value.upb.h" #include "envoy/type/matcher/v3/number.upb.h" #include "envoy/type/matcher/v3/string.upb.h" @@ -25,24 +25,24 @@ static const upb_msglayout *const envoy_type_matcher_v3_ValueMatcher_submsgs[4] }; static const upb_msglayout_field envoy_type_matcher_v3_ValueMatcher__fields[6] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_ValueMatcher_msginit = { &envoy_type_matcher_v3_ValueMatcher_submsgs[0], &envoy_type_matcher_v3_ValueMatcher__fields[0], - UPB_SIZE(8, 16), 6, false, 255, + UPB_SIZE(8, 16), 6, false, 6, 255, }; const upb_msglayout envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; static const upb_msglayout *const envoy_type_matcher_v3_ListMatcher_submsgs[1] = { @@ -50,13 +50,13 @@ static const upb_msglayout *const envoy_type_matcher_v3_ListMatcher_submsgs[1] = }; static const upb_msglayout_field envoy_type_matcher_v3_ListMatcher__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_matcher_v3_ListMatcher_msginit = { &envoy_type_matcher_v3_ListMatcher_submsgs[0], &envoy_type_matcher_v3_ListMatcher__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h b/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h index dc44445f8f..0310b45f94 100644 --- a/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h +++ b/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ #define ENVOY_TYPE_MATCHER_V3_VALUE_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" @@ -43,13 +43,19 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher *envoy_type_matcher_v3_ValueMatche UPB_INLINE envoy_type_matcher_v3_ValueMatcher *envoy_type_matcher_v3_ValueMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_ValueMatcher *ret = envoy_type_matcher_v3_ValueMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_ValueMatcher *envoy_type_matcher_v3_ValueMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_ValueMatcher *ret = envoy_type_matcher_v3_ValueMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_ValueMatcher_serialize(const envoy_type_matcher_v3_ValueMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_ValueMatcher_msginit, arena, len); @@ -142,13 +148,19 @@ UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch *envoy_type_matcher_v3_V UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch *envoy_type_matcher_v3_ValueMatcher_NullMatch_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_ValueMatcher_NullMatch *ret = envoy_type_matcher_v3_ValueMatcher_NullMatch_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_ValueMatcher_NullMatch *envoy_type_matcher_v3_ValueMatcher_NullMatch_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_ValueMatcher_NullMatch *ret = envoy_type_matcher_v3_ValueMatcher_NullMatch_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_ValueMatcher_NullMatch_serialize(const envoy_type_matcher_v3_ValueMatcher_NullMatch *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit, arena, len); @@ -164,13 +176,19 @@ UPB_INLINE envoy_type_matcher_v3_ListMatcher *envoy_type_matcher_v3_ListMatcher_ UPB_INLINE envoy_type_matcher_v3_ListMatcher *envoy_type_matcher_v3_ListMatcher_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_matcher_v3_ListMatcher *ret = envoy_type_matcher_v3_ListMatcher_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_matcher_v3_ListMatcher *envoy_type_matcher_v3_ListMatcher_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_matcher_v3_ListMatcher *ret = envoy_type_matcher_v3_ListMatcher_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_matcher_v3_ListMatcher_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_matcher_v3_ListMatcher_serialize(const envoy_type_matcher_v3_ListMatcher *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_matcher_v3_ListMatcher_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c index e692eda96f..33174f9544 100644 --- a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c +++ b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/metadata/v3/metadata.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -20,24 +20,24 @@ static const upb_msglayout *const envoy_type_metadata_v3_MetadataKey_submsgs[1] }; static const upb_msglayout_field envoy_type_metadata_v3_MetadataKey__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout envoy_type_metadata_v3_MetadataKey_msginit = { &envoy_type_metadata_v3_MetadataKey_submsgs[0], &envoy_type_metadata_v3_MetadataKey__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_type_metadata_v3_MetadataKey_PathSegment__fields[1] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_metadata_v3_MetadataKey_PathSegment_msginit = { NULL, &envoy_type_metadata_v3_MetadataKey_PathSegment__fields[0], - UPB_SIZE(16, 32), 1, false, 255, + UPB_SIZE(16, 32), 1, false, 1, 255, }; static const upb_msglayout *const envoy_type_metadata_v3_MetadataKind_submsgs[4] = { @@ -48,40 +48,40 @@ static const upb_msglayout *const envoy_type_metadata_v3_MetadataKind_submsgs[4] }; static const upb_msglayout_field envoy_type_metadata_v3_MetadataKind__fields[4] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_metadata_v3_MetadataKind_msginit = { &envoy_type_metadata_v3_MetadataKind_submsgs[0], &envoy_type_metadata_v3_MetadataKind__fields[0], - UPB_SIZE(8, 16), 4, false, 255, + UPB_SIZE(8, 16), 4, false, 4, 255, }; const upb_msglayout envoy_type_metadata_v3_MetadataKind_Request_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_type_metadata_v3_MetadataKind_Route_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_type_metadata_v3_MetadataKind_Cluster_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; const upb_msglayout envoy_type_metadata_v3_MetadataKind_Host_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h index 83ac93cf52..48a0da1af2 100644 --- a/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h +++ b/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ #define ENVOY_TYPE_METADATA_V3_METADATA_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" @@ -51,13 +51,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKey *envoy_type_metadata_v3_MetadataKe UPB_INLINE envoy_type_metadata_v3_MetadataKey *envoy_type_metadata_v3_MetadataKey_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKey *ret = envoy_type_metadata_v3_MetadataKey_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKey *envoy_type_metadata_v3_MetadataKey_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKey *ret = envoy_type_metadata_v3_MetadataKey_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKey_serialize(const envoy_type_metadata_v3_MetadataKey *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKey_msginit, arena, len); @@ -92,13 +98,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment *envoy_type_metadata_v UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment *envoy_type_metadata_v3_MetadataKey_PathSegment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKey_PathSegment *ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment *envoy_type_metadata_v3_MetadataKey_PathSegment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKey_PathSegment *ret = envoy_type_metadata_v3_MetadataKey_PathSegment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKey_PathSegment_serialize(const envoy_type_metadata_v3_MetadataKey_PathSegment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit, arena, len); @@ -125,13 +137,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKind *envoy_type_metadata_v3_MetadataK UPB_INLINE envoy_type_metadata_v3_MetadataKind *envoy_type_metadata_v3_MetadataKind_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKind *ret = envoy_type_metadata_v3_MetadataKind_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKind *envoy_type_metadata_v3_MetadataKind_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKind *ret = envoy_type_metadata_v3_MetadataKind_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKind_serialize(const envoy_type_metadata_v3_MetadataKind *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKind_msginit, arena, len); @@ -212,13 +230,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request *envoy_type_metadata_v3_M UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request *envoy_type_metadata_v3_MetadataKind_Request_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Request *ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKind_Request *envoy_type_metadata_v3_MetadataKind_Request_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Request *ret = envoy_type_metadata_v3_MetadataKind_Request_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Request_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKind_Request_serialize(const envoy_type_metadata_v3_MetadataKind_Request *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKind_Request_msginit, arena, len); @@ -234,13 +258,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route *envoy_type_metadata_v3_Met UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route *envoy_type_metadata_v3_MetadataKind_Route_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Route *ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKind_Route *envoy_type_metadata_v3_MetadataKind_Route_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Route *ret = envoy_type_metadata_v3_MetadataKind_Route_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Route_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKind_Route_serialize(const envoy_type_metadata_v3_MetadataKind_Route *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKind_Route_msginit, arena, len); @@ -256,13 +286,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster *envoy_type_metadata_v3_M UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster *envoy_type_metadata_v3_MetadataKind_Cluster_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Cluster *ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKind_Cluster *envoy_type_metadata_v3_MetadataKind_Cluster_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Cluster *ret = envoy_type_metadata_v3_MetadataKind_Cluster_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Cluster_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKind_Cluster_serialize(const envoy_type_metadata_v3_MetadataKind_Cluster *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKind_Cluster_msginit, arena, len); @@ -278,13 +314,19 @@ UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host *envoy_type_metadata_v3_Meta UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host *envoy_type_metadata_v3_MetadataKind_Host_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Host *ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_metadata_v3_MetadataKind_Host *envoy_type_metadata_v3_MetadataKind_Host_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_metadata_v3_MetadataKind_Host *ret = envoy_type_metadata_v3_MetadataKind_Host_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_metadata_v3_MetadataKind_Host_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_metadata_v3_MetadataKind_Host_serialize(const envoy_type_metadata_v3_MetadataKind_Host *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_metadata_v3_MetadataKind_Host_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c b/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c index fa53e431e6..c4cb3b26e1 100644 --- a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c +++ b/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/tracing/v3/custom_tag.upb.h" #include "envoy/type/metadata/v3/metadata.upb.h" #include "udpa/annotations/status.upb.h" @@ -24,49 +24,49 @@ static const upb_msglayout *const envoy_type_tracing_v3_CustomTag_submsgs[4] = { }; static const upb_msglayout_field envoy_type_tracing_v3_CustomTag__fields[5] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_tracing_v3_CustomTag_msginit = { &envoy_type_tracing_v3_CustomTag_submsgs[0], &envoy_type_tracing_v3_CustomTag__fields[0], - UPB_SIZE(16, 32), 5, false, 255, + UPB_SIZE(16, 32), 5, false, 5, 255, }; static const upb_msglayout_field envoy_type_tracing_v3_CustomTag_Literal__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_tracing_v3_CustomTag_Literal_msginit = { NULL, &envoy_type_tracing_v3_CustomTag_Literal__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field envoy_type_tracing_v3_CustomTag_Environment__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 envoy_type_tracing_v3_CustomTag_Environment_msginit = { NULL, &envoy_type_tracing_v3_CustomTag_Environment__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field envoy_type_tracing_v3_CustomTag_Header__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 envoy_type_tracing_v3_CustomTag_Header_msginit = { NULL, &envoy_type_tracing_v3_CustomTag_Header__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = { @@ -75,15 +75,15 @@ static const upb_msglayout *const envoy_type_tracing_v3_CustomTag_Metadata_subms }; static const upb_msglayout_field envoy_type_tracing_v3_CustomTag_Metadata__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {2, UPB_SIZE(16, 32), 2, 0, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_tracing_v3_CustomTag_Metadata_msginit = { &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0], &envoy_type_tracing_v3_CustomTag_Metadata__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h b/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h index 666ed7b11d..b382c541e5 100644 --- a/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h +++ b/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ #define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_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" @@ -49,13 +49,19 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag *envoy_type_tracing_v3_CustomTag_new( UPB_INLINE envoy_type_tracing_v3_CustomTag *envoy_type_tracing_v3_CustomTag_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_tracing_v3_CustomTag *ret = envoy_type_tracing_v3_CustomTag_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_tracing_v3_CustomTag *envoy_type_tracing_v3_CustomTag_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_tracing_v3_CustomTag *ret = envoy_type_tracing_v3_CustomTag_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_tracing_v3_CustomTag_serialize(const envoy_type_tracing_v3_CustomTag *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_tracing_v3_CustomTag_msginit, arena, len); @@ -140,13 +146,19 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal *envoy_type_tracing_v3_Custom UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal *envoy_type_tracing_v3_CustomTag_Literal_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Literal *ret = envoy_type_tracing_v3_CustomTag_Literal_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_tracing_v3_CustomTag_Literal *envoy_type_tracing_v3_CustomTag_Literal_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Literal *ret = envoy_type_tracing_v3_CustomTag_Literal_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Literal_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_tracing_v3_CustomTag_Literal_serialize(const envoy_type_tracing_v3_CustomTag_Literal *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_tracing_v3_CustomTag_Literal_msginit, arena, len); @@ -166,13 +178,19 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment *envoy_type_tracing_v3_Cu UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment *envoy_type_tracing_v3_CustomTag_Environment_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Environment *ret = envoy_type_tracing_v3_CustomTag_Environment_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_tracing_v3_CustomTag_Environment *envoy_type_tracing_v3_CustomTag_Environment_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Environment *ret = envoy_type_tracing_v3_CustomTag_Environment_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Environment_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_tracing_v3_CustomTag_Environment_serialize(const envoy_type_tracing_v3_CustomTag_Environment *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_tracing_v3_CustomTag_Environment_msginit, arena, len); @@ -196,13 +214,19 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Header *envoy_type_tracing_v3_CustomT UPB_INLINE envoy_type_tracing_v3_CustomTag_Header *envoy_type_tracing_v3_CustomTag_Header_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Header *ret = envoy_type_tracing_v3_CustomTag_Header_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_tracing_v3_CustomTag_Header *envoy_type_tracing_v3_CustomTag_Header_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Header *ret = envoy_type_tracing_v3_CustomTag_Header_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Header_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_tracing_v3_CustomTag_Header_serialize(const envoy_type_tracing_v3_CustomTag_Header *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_tracing_v3_CustomTag_Header_msginit, arena, len); @@ -226,13 +250,19 @@ UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata *envoy_type_tracing_v3_Custo UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata *envoy_type_tracing_v3_CustomTag_Metadata_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Metadata *ret = envoy_type_tracing_v3_CustomTag_Metadata_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_tracing_v3_CustomTag_Metadata *envoy_type_tracing_v3_CustomTag_Metadata_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_tracing_v3_CustomTag_Metadata *ret = envoy_type_tracing_v3_CustomTag_Metadata_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_tracing_v3_CustomTag_Metadata_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_tracing_v3_CustomTag_Metadata_serialize(const envoy_type_tracing_v3_CustomTag_Metadata *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_tracing_v3_CustomTag_Metadata_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/v3/http.upb.c b/src/core/ext/upb-generated/envoy/type/v3/http.upb.c index c4a03ae8ca..753363bc5e 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/http.upb.c +++ b/src/core/ext/upb-generated/envoy/type/v3/http.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/v3/http.upb.h" #include "udpa/annotations/status.upb.h" diff --git a/src/core/ext/upb-generated/envoy/type/v3/http.upb.h b/src/core/ext/upb-generated/envoy/type/v3/http.upb.h index 25b033f214..3464038b4f 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/http.upb.h +++ b/src/core/ext/upb-generated/envoy/type/v3/http.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ #define ENVOY_TYPE_V3_HTTP_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" diff --git a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c b/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c index 9e4a87c341..5ef8700690 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c +++ b/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/v3/percent.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -16,24 +16,24 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_type_v3_Percent__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_Percent_msginit = { NULL, &envoy_type_v3_Percent__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field envoy_type_v3_FractionalPercent__fields[2] = { - {1, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_FractionalPercent_msginit = { NULL, &envoy_type_v3_FractionalPercent__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h b/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h index 6155e2391d..3c2f7a0751 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h +++ b/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ #define ENVOY_TYPE_V3_PERCENT_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" @@ -42,13 +42,19 @@ UPB_INLINE envoy_type_v3_Percent *envoy_type_v3_Percent_new(upb_arena *arena) { UPB_INLINE envoy_type_v3_Percent *envoy_type_v3_Percent_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_Percent *ret = envoy_type_v3_Percent_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_Percent_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_Percent_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_Percent *envoy_type_v3_Percent_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_Percent *ret = envoy_type_v3_Percent_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_Percent_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_Percent_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_Percent_serialize(const envoy_type_v3_Percent *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_Percent_msginit, arena, len); @@ -68,13 +74,19 @@ UPB_INLINE envoy_type_v3_FractionalPercent *envoy_type_v3_FractionalPercent_new( UPB_INLINE envoy_type_v3_FractionalPercent *envoy_type_v3_FractionalPercent_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_FractionalPercent *ret = envoy_type_v3_FractionalPercent_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_FractionalPercent *envoy_type_v3_FractionalPercent_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_FractionalPercent *ret = envoy_type_v3_FractionalPercent_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_FractionalPercent_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_FractionalPercent_serialize(const envoy_type_v3_FractionalPercent *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_FractionalPercent_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/v3/range.upb.c b/src/core/ext/upb-generated/envoy/type/v3/range.upb.c index e4222bef5c..717fccdf6b 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/range.upb.c +++ b/src/core/ext/upb-generated/envoy/type/v3/range.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/v3/range.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -15,36 +15,36 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_type_v3_Int64Range__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 3, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 3, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_Int64Range_msginit = { NULL, &envoy_type_v3_Int64Range__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout_field envoy_type_v3_Int32Range__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 5, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 5, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_Int32Range_msginit = { NULL, &envoy_type_v3_Int32Range__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; static const upb_msglayout_field envoy_type_v3_DoubleRange__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_DoubleRange_msginit = { NULL, &envoy_type_v3_DoubleRange__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/v3/range.upb.h b/src/core/ext/upb-generated/envoy/type/v3/range.upb.h index 9ff396d9ce..32afd9ad47 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/range.upb.h +++ b/src/core/ext/upb-generated/envoy/type/v3/range.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ #define ENVOY_TYPE_V3_RANGE_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" @@ -39,13 +39,19 @@ UPB_INLINE envoy_type_v3_Int64Range *envoy_type_v3_Int64Range_new(upb_arena *are UPB_INLINE envoy_type_v3_Int64Range *envoy_type_v3_Int64Range_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_Int64Range *ret = envoy_type_v3_Int64Range_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_Int64Range_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_Int64Range_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_Int64Range *envoy_type_v3_Int64Range_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_Int64Range *ret = envoy_type_v3_Int64Range_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_Int64Range_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_Int64Range_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_Int64Range_serialize(const envoy_type_v3_Int64Range *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_Int64Range_msginit, arena, len); @@ -69,13 +75,19 @@ UPB_INLINE envoy_type_v3_Int32Range *envoy_type_v3_Int32Range_new(upb_arena *are UPB_INLINE envoy_type_v3_Int32Range *envoy_type_v3_Int32Range_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_Int32Range *ret = envoy_type_v3_Int32Range_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_Int32Range_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_Int32Range_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_Int32Range *envoy_type_v3_Int32Range_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_Int32Range *ret = envoy_type_v3_Int32Range_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_Int32Range_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_Int32Range_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_Int32Range_serialize(const envoy_type_v3_Int32Range *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_Int32Range_msginit, arena, len); @@ -99,13 +111,19 @@ UPB_INLINE envoy_type_v3_DoubleRange *envoy_type_v3_DoubleRange_new(upb_arena *a UPB_INLINE envoy_type_v3_DoubleRange *envoy_type_v3_DoubleRange_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_DoubleRange *ret = envoy_type_v3_DoubleRange_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_DoubleRange_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_DoubleRange_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_DoubleRange *envoy_type_v3_DoubleRange_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_DoubleRange *ret = envoy_type_v3_DoubleRange_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_DoubleRange_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_DoubleRange_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_DoubleRange_serialize(const envoy_type_v3_DoubleRange *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_DoubleRange_msginit, arena, len); diff --git a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c b/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c index 8984ac7fbd..94e7cb86f5 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c +++ b/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "envoy/type/v3/semantic_version.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -15,15 +15,15 @@ #include "upb/port_def.inc" static const upb_msglayout_field envoy_type_v3_SemanticVersion__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 13, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {3, UPB_SIZE(8, 8), 0, 0, 13, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout envoy_type_v3_SemanticVersion_msginit = { NULL, &envoy_type_v3_SemanticVersion__fields[0], - UPB_SIZE(16, 16), 3, false, 255, + UPB_SIZE(16, 16), 3, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h b/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h index e1dd329720..e06a6bb052 100644 --- a/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h +++ b/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h @@ -9,7 +9,7 @@ #ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ #define ENVOY_TYPE_V3_SEMANTIC_VERSION_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" @@ -33,13 +33,19 @@ UPB_INLINE envoy_type_v3_SemanticVersion *envoy_type_v3_SemanticVersion_new(upb_ UPB_INLINE envoy_type_v3_SemanticVersion *envoy_type_v3_SemanticVersion_parse(const char *buf, size_t size, upb_arena *arena) { envoy_type_v3_SemanticVersion *ret = envoy_type_v3_SemanticVersion_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msginit, arena)) return NULL; + return ret; } UPB_INLINE envoy_type_v3_SemanticVersion *envoy_type_v3_SemanticVersion_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { envoy_type_v3_SemanticVersion *ret = envoy_type_v3_SemanticVersion_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &envoy_type_v3_SemanticVersion_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *envoy_type_v3_SemanticVersion_serialize(const envoy_type_v3_SemanticVersion *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &envoy_type_v3_SemanticVersion_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/api/annotations.upb.c b/src/core/ext/upb-generated/google/api/annotations.upb.c index a1385cc3e7..d21b0941b6 100644 --- a/src/core/ext/upb-generated/google/api/annotations.upb.c +++ b/src/core/ext/upb-generated/google/api/annotations.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/api/annotations.upb.h" #include "google/api/http.upb.h" #include "google/protobuf/descriptor.upb.h" diff --git a/src/core/ext/upb-generated/google/api/annotations.upb.h b/src/core/ext/upb-generated/google/api/annotations.upb.h index fcbe640dbe..0295fbb5ed 100644 --- a/src/core/ext/upb-generated/google/api/annotations.upb.h +++ b/src/core/ext/upb-generated/google/api/annotations.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ #define GOOGLE_API_ANNOTATIONS_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" diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c b/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c index 16fd52a073..e24ce3ae72 100644 --- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c +++ b/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/api/expr/v1alpha1/checked.upb.h" #include "google/api/expr/v1alpha1/syntax.upb.h" #include "google/protobuf/empty.upb.h" @@ -23,16 +23,16 @@ static const upb_msglayout *const google_api_expr_v1alpha1_CheckedExpr_submsgs[4 }; static const upb_msglayout_field google_api_expr_v1alpha1_CheckedExpr__fields[4] = { - {2, UPB_SIZE(12, 24), 0, 0, 11, _UPB_LABEL_MAP}, - {3, UPB_SIZE(16, 32), 0, 1, 11, _UPB_LABEL_MAP}, - {4, UPB_SIZE(4, 8), 1, 2, 11, 1}, - {5, UPB_SIZE(8, 16), 2, 3, 11, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_MAP}, + {3, UPB_SIZE(16, 32), 0, 1, 11, _UPB_MODE_MAP}, + {4, UPB_SIZE(4, 8), 1, 2, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), 2, 3, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_CheckedExpr_msginit = { &google_api_expr_v1alpha1_CheckedExpr_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr__fields[0], - UPB_SIZE(24, 40), 4, false, 255, + UPB_SIZE(24, 40), 4, false, 0, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { @@ -40,14 +40,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_CheckedExpr_Reference }; static const upb_msglayout_field google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_msginit = { &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = { @@ -55,14 +55,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_CheckedExpr_TypeMapEn }; static const upb_msglayout_field google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_msginit = { &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Type_submsgs[6] = { @@ -75,25 +75,25 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Type_submsgs[6] = { }; static const upb_msglayout_field google_api_expr_v1alpha1_Type__fields[13] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 5, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 3, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 4, 11, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 2, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {10, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {11, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, - {12, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 5, 11, 1}, - {14, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 5, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 3, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 4, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 2, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 5, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Type_msginit = { &google_api_expr_v1alpha1_Type_submsgs[0], &google_api_expr_v1alpha1_Type__fields[0], - UPB_SIZE(16, 32), 13, false, 255, + UPB_SIZE(16, 32), 13, false, 12, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Type_ListType_submsgs[1] = { @@ -101,13 +101,13 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Type_ListType_submsgs }; static const upb_msglayout_field google_api_expr_v1alpha1_Type_ListType__fields[1] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Type_ListType_msginit = { &google_api_expr_v1alpha1_Type_ListType_submsgs[0], &google_api_expr_v1alpha1_Type_ListType__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Type_MapType_submsgs[1] = { @@ -115,14 +115,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Type_MapType_submsgs[ }; static const upb_msglayout_field google_api_expr_v1alpha1_Type_MapType__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Type_MapType_msginit = { &google_api_expr_v1alpha1_Type_MapType_submsgs[0], &google_api_expr_v1alpha1_Type_MapType__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Type_FunctionType_submsgs[1] = { @@ -130,14 +130,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Type_FunctionType_sub }; static const upb_msglayout_field google_api_expr_v1alpha1_Type_FunctionType__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Type_FunctionType_msginit = { &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0], &google_api_expr_v1alpha1_Type_FunctionType__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = { @@ -145,14 +145,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Type_AbstractType_sub }; static const upb_msglayout_field google_api_expr_v1alpha1_Type_AbstractType__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Type_AbstractType_msginit = { &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0], &google_api_expr_v1alpha1_Type_AbstractType__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Decl_submsgs[2] = { @@ -161,15 +161,15 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Decl_submsgs[2] = { }; static const upb_msglayout_field google_api_expr_v1alpha1_Decl__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Decl_msginit = { &google_api_expr_v1alpha1_Decl_submsgs[0], &google_api_expr_v1alpha1_Decl__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = { @@ -178,15 +178,15 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Decl_IdentDecl_submsg }; static const upb_msglayout_field google_api_expr_v1alpha1_Decl_IdentDecl__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 1, 11, 1}, - {2, UPB_SIZE(16, 32), 2, 0, 11, 1}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(12, 24), 1, 1, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Decl_IdentDecl_msginit = { &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_IdentDecl__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = { @@ -194,13 +194,13 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Decl_FunctionDecl_sub }; static const upb_msglayout_field google_api_expr_v1alpha1_Decl_FunctionDecl__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Decl_FunctionDecl_msginit = { &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[1] = { @@ -208,18 +208,18 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Decl_FunctionDecl_Ove }; static const upb_msglayout_field google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[6] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 48), 0, 0, 11, 3}, - {3, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {4, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {5, UPB_SIZE(1, 1), 0, 0, 8, 1}, - {6, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(24, 48), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(28, 56), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit = { &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0], - UPB_SIZE(32, 64), 6, false, 255, + UPB_SIZE(32, 64), 6, false, 6, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Reference_submsgs[1] = { @@ -227,15 +227,15 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Reference_submsgs[1] }; static const upb_msglayout_field google_api_expr_v1alpha1_Reference__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 0, 0, 9, 3}, - {4, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Reference_msginit = { &google_api_expr_v1alpha1_Reference_submsgs[0], &google_api_expr_v1alpha1_Reference__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h b/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h index 43a88f708b..8520b5a515 100644 --- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h +++ b/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ #define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_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" @@ -94,13 +94,19 @@ UPB_INLINE google_api_expr_v1alpha1_CheckedExpr *google_api_expr_v1alpha1_Checke UPB_INLINE google_api_expr_v1alpha1_CheckedExpr *google_api_expr_v1alpha1_CheckedExpr_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_CheckedExpr *ret = google_api_expr_v1alpha1_CheckedExpr_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_CheckedExpr *google_api_expr_v1alpha1_CheckedExpr_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_CheckedExpr *ret = google_api_expr_v1alpha1_CheckedExpr_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_CheckedExpr_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_CheckedExpr_serialize(const google_api_expr_v1alpha1_CheckedExpr *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_CheckedExpr_msginit, arena, len); @@ -198,13 +204,19 @@ UPB_INLINE google_api_expr_v1alpha1_Type *google_api_expr_v1alpha1_Type_new(upb_ UPB_INLINE google_api_expr_v1alpha1_Type *google_api_expr_v1alpha1_Type_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Type *ret = google_api_expr_v1alpha1_Type_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Type *google_api_expr_v1alpha1_Type_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Type *ret = google_api_expr_v1alpha1_Type_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Type_serialize(const google_api_expr_v1alpha1_Type *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Type_msginit, arena, len); @@ -366,13 +378,19 @@ UPB_INLINE google_api_expr_v1alpha1_Type_ListType *google_api_expr_v1alpha1_Type UPB_INLINE google_api_expr_v1alpha1_Type_ListType *google_api_expr_v1alpha1_Type_ListType_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Type_ListType *ret = google_api_expr_v1alpha1_Type_ListType_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Type_ListType *google_api_expr_v1alpha1_Type_ListType_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Type_ListType *ret = google_api_expr_v1alpha1_Type_ListType_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_ListType_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Type_ListType_serialize(const google_api_expr_v1alpha1_Type_ListType *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Type_ListType_msginit, arena, len); @@ -403,13 +421,19 @@ UPB_INLINE google_api_expr_v1alpha1_Type_MapType *google_api_expr_v1alpha1_Type_ UPB_INLINE google_api_expr_v1alpha1_Type_MapType *google_api_expr_v1alpha1_Type_MapType_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Type_MapType *ret = google_api_expr_v1alpha1_Type_MapType_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Type_MapType *google_api_expr_v1alpha1_Type_MapType_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Type_MapType *ret = google_api_expr_v1alpha1_Type_MapType_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_MapType_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Type_MapType_serialize(const google_api_expr_v1alpha1_Type_MapType *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Type_MapType_msginit, arena, len); @@ -455,13 +479,19 @@ UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType *google_api_expr_v1alpha1_ UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType *google_api_expr_v1alpha1_Type_FunctionType_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Type_FunctionType *ret = google_api_expr_v1alpha1_Type_FunctionType_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Type_FunctionType *google_api_expr_v1alpha1_Type_FunctionType_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Type_FunctionType *ret = google_api_expr_v1alpha1_Type_FunctionType_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_FunctionType_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Type_FunctionType_serialize(const google_api_expr_v1alpha1_Type_FunctionType *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Type_FunctionType_msginit, arena, len); @@ -507,13 +537,19 @@ UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType *google_api_expr_v1alpha1_ UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType *google_api_expr_v1alpha1_Type_AbstractType_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Type_AbstractType *ret = google_api_expr_v1alpha1_Type_AbstractType_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Type_AbstractType *google_api_expr_v1alpha1_Type_AbstractType_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Type_AbstractType *ret = google_api_expr_v1alpha1_Type_AbstractType_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Type_AbstractType_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Type_AbstractType_serialize(const google_api_expr_v1alpha1_Type_AbstractType *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Type_AbstractType_msginit, arena, len); @@ -548,13 +584,19 @@ UPB_INLINE google_api_expr_v1alpha1_Decl *google_api_expr_v1alpha1_Decl_new(upb_ UPB_INLINE google_api_expr_v1alpha1_Decl *google_api_expr_v1alpha1_Decl_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Decl *ret = google_api_expr_v1alpha1_Decl_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Decl *google_api_expr_v1alpha1_Decl_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Decl *ret = google_api_expr_v1alpha1_Decl_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Decl_serialize(const google_api_expr_v1alpha1_Decl *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Decl_msginit, arena, len); @@ -609,13 +651,19 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl *google_api_expr_v1alpha1_Dec UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl *google_api_expr_v1alpha1_Decl_IdentDecl_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Decl_IdentDecl *ret = google_api_expr_v1alpha1_Decl_IdentDecl_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Decl_IdentDecl *google_api_expr_v1alpha1_Decl_IdentDecl_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Decl_IdentDecl *ret = google_api_expr_v1alpha1_Decl_IdentDecl_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_IdentDecl_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Decl_IdentDecl_serialize(const google_api_expr_v1alpha1_Decl_IdentDecl *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Decl_IdentDecl_msginit, arena, len); @@ -665,13 +713,19 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl *google_api_expr_v1alpha1_ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl *google_api_expr_v1alpha1_Decl_FunctionDecl_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Decl_FunctionDecl *ret = google_api_expr_v1alpha1_Decl_FunctionDecl_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl *google_api_expr_v1alpha1_Decl_FunctionDecl_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Decl_FunctionDecl *ret = google_api_expr_v1alpha1_Decl_FunctionDecl_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Decl_FunctionDecl_serialize(const google_api_expr_v1alpha1_Decl_FunctionDecl *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_msginit, arena, len); @@ -702,13 +756,19 @@ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *google_api_expr_ UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *ret = google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *ret = google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_serialize(const google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_msginit, arena, len); @@ -777,13 +837,19 @@ UPB_INLINE google_api_expr_v1alpha1_Reference *google_api_expr_v1alpha1_Referenc UPB_INLINE google_api_expr_v1alpha1_Reference *google_api_expr_v1alpha1_Reference_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Reference *ret = google_api_expr_v1alpha1_Reference_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Reference *google_api_expr_v1alpha1_Reference_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Reference *ret = google_api_expr_v1alpha1_Reference_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Reference_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Reference_serialize(const google_api_expr_v1alpha1_Reference *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Reference_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c b/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c index 4bbf575861..c32d934eb6 100644 --- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c +++ b/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/api/expr/v1alpha1/syntax.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" @@ -21,14 +21,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_ParsedExpr_submsgs[2] }; static const upb_msglayout_field google_api_expr_v1alpha1_ParsedExpr__fields[2] = { - {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {3, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {2, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_ParsedExpr_msginit = { &google_api_expr_v1alpha1_ParsedExpr_submsgs[0], &google_api_expr_v1alpha1_ParsedExpr__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 0, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_submsgs[7] = { @@ -42,30 +42,30 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_submsgs[7] = { }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr__fields[8] = { - {2, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {3, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 0, 11, 1}, - {4, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 5, 11, 1}, - {5, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 6, 11, 1}, - {6, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 1, 11, 1}, - {7, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 3, 11, 1}, - {8, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 4, 11, 1}, - {9, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 2, 11, 1}, + {2, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 5, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 6, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 3, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 4, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 2, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_msginit = { &google_api_expr_v1alpha1_Expr_submsgs[0], &google_api_expr_v1alpha1_Expr__fields[0], - UPB_SIZE(16, 24), 8, false, 255, + UPB_SIZE(16, 24), 8, false, 0, 255, }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_Ident__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_Ident_msginit = { NULL, &google_api_expr_v1alpha1_Expr_Ident__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Select_submsgs[1] = { @@ -73,15 +73,15 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Select_submsgs[1 }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_Select__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_Select_msginit = { &google_api_expr_v1alpha1_Expr_Select_submsgs[0], &google_api_expr_v1alpha1_Expr_Select__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Call_submsgs[1] = { @@ -89,15 +89,15 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Call_submsgs[1] }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_Call__fields[3] = { - {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {1, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_Call_msginit = { &google_api_expr_v1alpha1_Expr_Call_submsgs[0], &google_api_expr_v1alpha1_Expr_Call__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = { @@ -105,13 +105,13 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateList_subms }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_CreateList__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_CreateList_msginit = { &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateList__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = { @@ -119,14 +119,14 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateStruct_sub }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_CreateStruct__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_CreateStruct_msginit = { &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[1] = { @@ -134,16 +134,16 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_CreateStruct_Ent }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[4] = { - {1, UPB_SIZE(8, 8), 0, 0, 3, 1}, - {2, UPB_SIZE(20, 24), UPB_SIZE(-29, -41), 0, 9, 1}, - {3, UPB_SIZE(20, 24), UPB_SIZE(-29, -41), 0, 11, 1}, - {4, UPB_SIZE(16, 16), 1, 0, 11, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 24), UPB_SIZE(-29, -41), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 24), UPB_SIZE(-29, -41), 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit = { &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0], - UPB_SIZE(32, 48), 4, false, 255, + UPB_SIZE(32, 48), 4, false, 4, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Comprehension_submsgs[1] = { @@ -151,19 +151,19 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Expr_Comprehension_su }; static const upb_msglayout_field google_api_expr_v1alpha1_Expr_Comprehension__fields[7] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 1, 0, 11, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(24, 48), 2, 0, 11, 1}, - {5, UPB_SIZE(28, 56), 3, 0, 11, 1}, - {6, UPB_SIZE(32, 64), 4, 0, 11, 1}, - {7, UPB_SIZE(36, 72), 5, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 48), 2, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(28, 56), 3, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(32, 64), 4, 0, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(36, 72), 5, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Expr_Comprehension_msginit = { &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0], &google_api_expr_v1alpha1_Expr_Comprehension__fields[0], - UPB_SIZE(40, 80), 7, false, 255, + UPB_SIZE(40, 80), 7, false, 7, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_Constant_submsgs[2] = { @@ -172,21 +172,21 @@ static const upb_msglayout *const google_api_expr_v1alpha1_Constant_submsgs[2] = }; static const upb_msglayout_field google_api_expr_v1alpha1_Constant__fields[9] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 8, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 3, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 4, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 1, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, 1}, - {8, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, - {9, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 3, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 1, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_Constant_msginit = { &google_api_expr_v1alpha1_Constant_submsgs[0], &google_api_expr_v1alpha1_Constant__fields[0], - UPB_SIZE(16, 32), 9, false, 255, + UPB_SIZE(16, 32), 9, false, 9, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_submsgs[2] = { @@ -195,28 +195,28 @@ static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_submsgs[2] }; static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo__fields[5] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 0, 0, 5, _UPB_LABEL_PACKED}, - {4, UPB_SIZE(20, 40), 0, 1, 11, _UPB_LABEL_MAP}, - {5, UPB_SIZE(24, 48), 0, 0, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 32), 0, 0, 5, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {4, UPB_SIZE(20, 40), 0, 1, 11, _UPB_MODE_MAP}, + {5, UPB_SIZE(24, 48), 0, 0, 11, _UPB_MODE_MAP}, }; const upb_msglayout google_api_expr_v1alpha1_SourceInfo_msginit = { &google_api_expr_v1alpha1_SourceInfo_submsgs[0], &google_api_expr_v1alpha1_SourceInfo__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 5, 255, }; static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 5, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit = { NULL, &google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = { @@ -224,27 +224,27 @@ static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_MacroCalls }; static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit = { &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0], &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field google_api_expr_v1alpha1_SourcePosition__fields[4] = { - {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 5, 1}, - {3, UPB_SIZE(4, 4), 0, 0, 5, 1}, - {4, UPB_SIZE(8, 8), 0, 0, 5, 1}, + {1, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 4), 0, 0, 5, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_expr_v1alpha1_SourcePosition_msginit = { NULL, &google_api_expr_v1alpha1_SourcePosition__fields[0], - UPB_SIZE(24, 32), 4, false, 255, + UPB_SIZE(24, 32), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h b/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h index ffa7925ab3..3460224abf 100644 --- a/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h +++ b/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ #define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_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" @@ -76,13 +76,19 @@ UPB_INLINE google_api_expr_v1alpha1_ParsedExpr *google_api_expr_v1alpha1_ParsedE UPB_INLINE google_api_expr_v1alpha1_ParsedExpr *google_api_expr_v1alpha1_ParsedExpr_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_ParsedExpr *ret = google_api_expr_v1alpha1_ParsedExpr_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_ParsedExpr *google_api_expr_v1alpha1_ParsedExpr_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_ParsedExpr *ret = google_api_expr_v1alpha1_ParsedExpr_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_ParsedExpr_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_ParsedExpr_serialize(const google_api_expr_v1alpha1_ParsedExpr *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_ParsedExpr_msginit, arena, len); @@ -128,13 +134,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr *google_api_expr_v1alpha1_Expr_new(upb_ UPB_INLINE google_api_expr_v1alpha1_Expr *google_api_expr_v1alpha1_Expr_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr *ret = google_api_expr_v1alpha1_Expr_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr *google_api_expr_v1alpha1_Expr_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr *ret = google_api_expr_v1alpha1_Expr_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_serialize(const google_api_expr_v1alpha1_Expr *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_msginit, arena, len); @@ -264,13 +276,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Ident *google_api_expr_v1alpha1_Expr_Id UPB_INLINE google_api_expr_v1alpha1_Expr_Ident *google_api_expr_v1alpha1_Expr_Ident_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_Ident *ret = google_api_expr_v1alpha1_Expr_Ident_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_Ident *google_api_expr_v1alpha1_Expr_Ident_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_Ident *ret = google_api_expr_v1alpha1_Expr_Ident_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Ident_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_Ident_serialize(const google_api_expr_v1alpha1_Expr_Ident *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_Ident_msginit, arena, len); @@ -290,13 +308,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Select *google_api_expr_v1alpha1_Expr_S UPB_INLINE google_api_expr_v1alpha1_Expr_Select *google_api_expr_v1alpha1_Expr_Select_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_Select *ret = google_api_expr_v1alpha1_Expr_Select_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_Select *google_api_expr_v1alpha1_Expr_Select_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_Select *ret = google_api_expr_v1alpha1_Expr_Select_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Select_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_Select_serialize(const google_api_expr_v1alpha1_Expr_Select *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_Select_msginit, arena, len); @@ -335,13 +359,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Call *google_api_expr_v1alpha1_Expr_Cal UPB_INLINE google_api_expr_v1alpha1_Expr_Call *google_api_expr_v1alpha1_Expr_Call_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_Call *ret = google_api_expr_v1alpha1_Expr_Call_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_Call *google_api_expr_v1alpha1_Expr_Call_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_Call *ret = google_api_expr_v1alpha1_Expr_Call_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Call_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_Call_serialize(const google_api_expr_v1alpha1_Expr_Call *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_Call_msginit, arena, len); @@ -391,13 +421,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList *google_api_expr_v1alpha1_Ex UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList *google_api_expr_v1alpha1_Expr_CreateList_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateList *ret = google_api_expr_v1alpha1_Expr_CreateList_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_CreateList *google_api_expr_v1alpha1_Expr_CreateList_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateList *ret = google_api_expr_v1alpha1_Expr_CreateList_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateList_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_CreateList_serialize(const google_api_expr_v1alpha1_Expr_CreateList *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_CreateList_msginit, arena, len); @@ -428,13 +464,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct *google_api_expr_v1alpha1_ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct *google_api_expr_v1alpha1_Expr_CreateStruct_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateStruct *ret = google_api_expr_v1alpha1_Expr_CreateStruct_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct *google_api_expr_v1alpha1_Expr_CreateStruct_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateStruct *ret = google_api_expr_v1alpha1_Expr_CreateStruct_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_CreateStruct_serialize(const google_api_expr_v1alpha1_Expr_CreateStruct *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_msginit, arena, len); @@ -469,13 +511,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry *google_api_expr_v1a UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry *google_api_expr_v1alpha1_Expr_CreateStruct_Entry_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateStruct_Entry *ret = google_api_expr_v1alpha1_Expr_CreateStruct_Entry_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry *google_api_expr_v1alpha1_Expr_CreateStruct_Entry_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_CreateStruct_Entry *ret = google_api_expr_v1alpha1_Expr_CreateStruct_Entry_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_CreateStruct_Entry_serialize(const google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_msginit, arena, len); @@ -536,13 +584,19 @@ UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension *google_api_expr_v1alpha1 UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension *google_api_expr_v1alpha1_Expr_Comprehension_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Expr_Comprehension *ret = google_api_expr_v1alpha1_Expr_Comprehension_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Expr_Comprehension *google_api_expr_v1alpha1_Expr_Comprehension_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Expr_Comprehension *ret = google_api_expr_v1alpha1_Expr_Comprehension_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Expr_Comprehension_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Expr_Comprehension_serialize(const google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Expr_Comprehension_msginit, arena, len); @@ -641,13 +695,19 @@ UPB_INLINE google_api_expr_v1alpha1_Constant *google_api_expr_v1alpha1_Constant_ UPB_INLINE google_api_expr_v1alpha1_Constant *google_api_expr_v1alpha1_Constant_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_Constant *ret = google_api_expr_v1alpha1_Constant_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_Constant *google_api_expr_v1alpha1_Constant_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_Constant *ret = google_api_expr_v1alpha1_Constant_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_Constant_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_Constant_serialize(const google_api_expr_v1alpha1_Constant *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_Constant_msginit, arena, len); @@ -740,13 +800,19 @@ UPB_INLINE google_api_expr_v1alpha1_SourceInfo *google_api_expr_v1alpha1_SourceI UPB_INLINE google_api_expr_v1alpha1_SourceInfo *google_api_expr_v1alpha1_SourceInfo_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_SourceInfo *ret = google_api_expr_v1alpha1_SourceInfo_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_SourceInfo *google_api_expr_v1alpha1_SourceInfo_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_SourceInfo *ret = google_api_expr_v1alpha1_SourceInfo_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourceInfo_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_SourceInfo_serialize(const google_api_expr_v1alpha1_SourceInfo *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_SourceInfo_msginit, arena, len); @@ -832,13 +898,19 @@ UPB_INLINE google_api_expr_v1alpha1_SourcePosition *google_api_expr_v1alpha1_Sou UPB_INLINE google_api_expr_v1alpha1_SourcePosition *google_api_expr_v1alpha1_SourcePosition_parse(const char *buf, size_t size, upb_arena *arena) { google_api_expr_v1alpha1_SourcePosition *ret = google_api_expr_v1alpha1_SourcePosition_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_expr_v1alpha1_SourcePosition *google_api_expr_v1alpha1_SourcePosition_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_expr_v1alpha1_SourcePosition *ret = google_api_expr_v1alpha1_SourcePosition_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_expr_v1alpha1_SourcePosition_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_expr_v1alpha1_SourcePosition_serialize(const google_api_expr_v1alpha1_SourcePosition *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_expr_v1alpha1_SourcePosition_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/api/http.upb.c b/src/core/ext/upb-generated/google/api/http.upb.c index f17613acb9..d064f6eddb 100644 --- a/src/core/ext/upb-generated/google/api/http.upb.c +++ b/src/core/ext/upb-generated/google/api/http.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/api/http.upb.h" #include "upb/port_def.inc" @@ -17,14 +17,14 @@ static const upb_msglayout *const google_api_Http_submsgs[1] = { }; static const upb_msglayout_field google_api_Http__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 11, 3}, - {2, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_Http_msginit = { &google_api_Http_submsgs[0], &google_api_Http__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const google_api_HttpRule_submsgs[2] = { @@ -33,33 +33,33 @@ static const upb_msglayout *const google_api_HttpRule_submsgs[2] = { }; static const upb_msglayout_field google_api_HttpRule__fields[10] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {3, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {4, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {5, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {6, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, 1}, - {7, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {8, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 11, 1}, - {11, UPB_SIZE(24, 48), 0, 1, 11, 3}, - {12, UPB_SIZE(16, 32), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 9, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(8, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(28, 56), UPB_SIZE(-37, -73), 0, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(24, 48), 0, 1, 11, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(16, 32), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout google_api_HttpRule_msginit = { &google_api_HttpRule_submsgs[0], &google_api_HttpRule__fields[0], - UPB_SIZE(40, 80), 10, false, 255, + UPB_SIZE(40, 80), 10, false, 8, 255, }; static const upb_msglayout_field google_api_CustomHttpPattern__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 google_api_CustomHttpPattern_msginit = { NULL, &google_api_CustomHttpPattern__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/api/http.upb.h b/src/core/ext/upb-generated/google/api/http.upb.h index ed4e6d10dc..b0745b988e 100644 --- a/src/core/ext/upb-generated/google/api/http.upb.h +++ b/src/core/ext/upb-generated/google/api/http.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_API_HTTP_PROTO_UPB_H_ #define GOOGLE_API_HTTP_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" @@ -39,13 +39,19 @@ UPB_INLINE google_api_Http *google_api_Http_new(upb_arena *arena) { UPB_INLINE google_api_Http *google_api_Http_parse(const char *buf, size_t size, upb_arena *arena) { google_api_Http *ret = google_api_Http_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_Http_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_Http_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_Http *google_api_Http_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_Http *ret = google_api_Http_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_Http_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_Http_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_Http_serialize(const google_api_Http *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_Http_msginit, arena, len); @@ -80,13 +86,19 @@ UPB_INLINE google_api_HttpRule *google_api_HttpRule_new(upb_arena *arena) { UPB_INLINE google_api_HttpRule *google_api_HttpRule_parse(const char *buf, size_t size, upb_arena *arena) { google_api_HttpRule *ret = google_api_HttpRule_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_HttpRule_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_HttpRule_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_HttpRule *google_api_HttpRule_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_HttpRule *ret = google_api_HttpRule_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_HttpRule_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_HttpRule_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_HttpRule_serialize(const google_api_HttpRule *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_HttpRule_msginit, arena, len); @@ -179,13 +191,19 @@ UPB_INLINE google_api_CustomHttpPattern *google_api_CustomHttpPattern_new(upb_ar UPB_INLINE google_api_CustomHttpPattern *google_api_CustomHttpPattern_parse(const char *buf, size_t size, upb_arena *arena) { google_api_CustomHttpPattern *ret = google_api_CustomHttpPattern_new(arena); - return (ret && upb_decode(buf, size, ret, &google_api_CustomHttpPattern_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_api_CustomHttpPattern_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_api_CustomHttpPattern *google_api_CustomHttpPattern_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_api_CustomHttpPattern *ret = google_api_CustomHttpPattern_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_api_CustomHttpPattern_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_api_CustomHttpPattern_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_api_CustomHttpPattern_serialize(const google_api_CustomHttpPattern *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_api_CustomHttpPattern_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/any.upb.c b/src/core/ext/upb-generated/google/protobuf/any.upb.c index 93eaa603e3..bdf0dc0561 100644 --- a/src/core/ext/upb-generated/google/protobuf/any.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/any.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/any.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field google_protobuf_Any__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 12, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Any_msginit = { NULL, &google_protobuf_Any__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/any.upb.h b/src/core/ext/upb-generated/google/protobuf/any.upb.h index 2bd44f7685..ca6a7a0f29 100644 --- a/src/core/ext/upb-generated/google/protobuf/any.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/any.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_ANY_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" @@ -33,13 +33,19 @@ UPB_INLINE google_protobuf_Any *google_protobuf_Any_new(upb_arena *arena) { UPB_INLINE google_protobuf_Any *google_protobuf_Any_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Any *ret = google_protobuf_Any_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Any_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Any_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Any *google_protobuf_Any_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Any *ret = google_protobuf_Any_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Any_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Any_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Any_serialize(const google_protobuf_Any *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Any_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c index 339fafac09..a6b9af9132 100644 --- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/descriptor.upb.h" #include "upb/port_def.inc" @@ -17,13 +17,13 @@ static const upb_msglayout *const google_protobuf_FileDescriptorSet_submsgs[1] = }; static const upb_msglayout_field google_protobuf_FileDescriptorSet__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_FileDescriptorSet_msginit = { &google_protobuf_FileDescriptorSet_submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const google_protobuf_FileDescriptorProto_submsgs[6] = { @@ -36,24 +36,24 @@ static const upb_msglayout *const google_protobuf_FileDescriptorProto_submsgs[6] }; static const upb_msglayout_field google_protobuf_FileDescriptorProto__fields[12] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(12, 24), 2, 0, 12, 1}, - {3, UPB_SIZE(36, 72), 0, 0, 12, 3}, - {4, UPB_SIZE(40, 80), 0, 0, 11, 3}, - {5, UPB_SIZE(44, 88), 0, 1, 11, 3}, - {6, UPB_SIZE(48, 96), 0, 4, 11, 3}, - {7, UPB_SIZE(52, 104), 0, 2, 11, 3}, - {8, UPB_SIZE(28, 56), 3, 3, 11, 1}, - {9, UPB_SIZE(32, 64), 4, 5, 11, 1}, - {10, UPB_SIZE(56, 112), 0, 0, 5, 3}, - {11, UPB_SIZE(60, 120), 0, 0, 5, 3}, - {12, UPB_SIZE(20, 40), 5, 0, 12, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 2, 0, 12, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(36, 72), 0, 0, 12, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(40, 80), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(44, 88), 0, 1, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(48, 96), 0, 4, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(52, 104), 0, 2, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(28, 56), 3, 3, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 64), 4, 5, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(56, 112), 0, 0, 5, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(60, 120), 0, 0, 5, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(20, 40), 5, 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_FileDescriptorProto_msginit = { &google_protobuf_FileDescriptorProto_submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], - UPB_SIZE(64, 128), 12, false, 255, + UPB_SIZE(64, 128), 12, false, 12, 255, }; static const upb_msglayout *const google_protobuf_DescriptorProto_submsgs[7] = { @@ -67,22 +67,22 @@ static const upb_msglayout *const google_protobuf_DescriptorProto_submsgs[7] = { }; static const upb_msglayout_field google_protobuf_DescriptorProto__fields[10] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(16, 32), 0, 4, 11, 3}, - {3, UPB_SIZE(20, 40), 0, 0, 11, 3}, - {4, UPB_SIZE(24, 48), 0, 3, 11, 3}, - {5, UPB_SIZE(28, 56), 0, 1, 11, 3}, - {6, UPB_SIZE(32, 64), 0, 4, 11, 3}, - {7, UPB_SIZE(12, 24), 2, 5, 11, 1}, - {8, UPB_SIZE(36, 72), 0, 6, 11, 3}, - {9, UPB_SIZE(40, 80), 0, 2, 11, 3}, - {10, UPB_SIZE(44, 88), 0, 0, 12, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 4, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(20, 40), 0, 0, 11, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(24, 48), 0, 3, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(28, 56), 0, 1, 11, _UPB_MODE_ARRAY}, + {6, UPB_SIZE(32, 64), 0, 4, 11, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(12, 24), 2, 5, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(36, 72), 0, 6, 11, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(40, 80), 0, 2, 11, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(44, 88), 0, 0, 12, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_DescriptorProto_msginit = { &google_protobuf_DescriptorProto_submsgs[0], &google_protobuf_DescriptorProto__fields[0], - UPB_SIZE(48, 96), 10, false, 255, + UPB_SIZE(48, 96), 10, false, 10, 255, }; static const upb_msglayout *const google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { @@ -90,26 +90,26 @@ static const upb_msglayout *const google_protobuf_DescriptorProto_ExtensionRange }; static const upb_msglayout_field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = { - {1, UPB_SIZE(4, 4), 1, 0, 5, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 5, 1}, - {3, UPB_SIZE(12, 16), 3, 0, 11, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 16), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_DescriptorProto_ExtensionRange_msginit = { &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout_field google_protobuf_DescriptorProto_ReservedRange__fields[2] = { - {1, UPB_SIZE(4, 4), 1, 0, 5, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 5, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_DescriptorProto_ReservedRange_msginit = { NULL, &google_protobuf_DescriptorProto_ReservedRange__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout *const google_protobuf_ExtensionRangeOptions_submsgs[1] = { @@ -117,13 +117,13 @@ static const upb_msglayout *const google_protobuf_ExtensionRangeOptions_submsgs[ }; static const upb_msglayout_field google_protobuf_ExtensionRangeOptions__fields[1] = { - {999, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {999, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_ExtensionRangeOptions_msginit = { &google_protobuf_ExtensionRangeOptions_submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 0, 255, }; static const upb_msglayout *const google_protobuf_FieldDescriptorProto_submsgs[1] = { @@ -131,23 +131,23 @@ static const upb_msglayout *const google_protobuf_FieldDescriptorProto_submsgs[1 }; static const upb_msglayout_field google_protobuf_FieldDescriptorProto__fields[11] = { - {1, UPB_SIZE(24, 24), 1, 0, 12, 1}, - {2, UPB_SIZE(32, 40), 2, 0, 12, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 5, 1}, - {4, UPB_SIZE(4, 4), 4, 0, 14, 1}, - {5, UPB_SIZE(8, 8), 5, 0, 14, 1}, - {6, UPB_SIZE(40, 56), 6, 0, 12, 1}, - {7, UPB_SIZE(48, 72), 7, 0, 12, 1}, - {8, UPB_SIZE(64, 104), 8, 0, 11, 1}, - {9, UPB_SIZE(16, 16), 9, 0, 5, 1}, - {10, UPB_SIZE(56, 88), 10, 0, 12, 1}, - {17, UPB_SIZE(20, 20), 11, 0, 8, 1}, + {1, UPB_SIZE(24, 24), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(32, 40), 2, 0, 12, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 5, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 4), 4, 0, 14, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 8), 5, 0, 14, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(40, 56), 6, 0, 12, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(48, 72), 7, 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(64, 104), 8, 0, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(16, 16), 9, 0, 5, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(56, 88), 10, 0, 12, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(20, 20), 11, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_FieldDescriptorProto_msginit = { &google_protobuf_FieldDescriptorProto_submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], - UPB_SIZE(72, 112), 11, false, 255, + UPB_SIZE(72, 112), 11, false, 10, 255, }; static const upb_msglayout *const google_protobuf_OneofDescriptorProto_submsgs[1] = { @@ -155,14 +155,14 @@ static const upb_msglayout *const google_protobuf_OneofDescriptorProto_submsgs[1 }; static const upb_msglayout_field google_protobuf_OneofDescriptorProto__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(12, 24), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_OneofDescriptorProto_msginit = { &google_protobuf_OneofDescriptorProto_submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_protobuf_EnumDescriptorProto_submsgs[3] = { @@ -172,28 +172,28 @@ static const upb_msglayout *const google_protobuf_EnumDescriptorProto_submsgs[3] }; static const upb_msglayout_field google_protobuf_EnumDescriptorProto__fields[5] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(16, 32), 0, 2, 11, 3}, - {3, UPB_SIZE(12, 24), 2, 1, 11, 1}, - {4, UPB_SIZE(20, 40), 0, 0, 11, 3}, - {5, UPB_SIZE(24, 48), 0, 0, 12, 3}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 2, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 2, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 40), 0, 0, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(24, 48), 0, 0, 12, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_EnumDescriptorProto_msginit = { &google_protobuf_EnumDescriptorProto_submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 5, 255, }; static const upb_msglayout_field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = { - {1, UPB_SIZE(4, 4), 1, 0, 5, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 5, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = { NULL, &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; static const upb_msglayout *const google_protobuf_EnumValueDescriptorProto_submsgs[1] = { @@ -201,15 +201,15 @@ static const upb_msglayout *const google_protobuf_EnumValueDescriptorProto_subms }; static const upb_msglayout_field google_protobuf_EnumValueDescriptorProto__fields[3] = { - {1, UPB_SIZE(8, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(4, 4), 2, 0, 5, 1}, - {3, UPB_SIZE(16, 24), 3, 0, 11, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 2, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 3, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_EnumValueDescriptorProto_msginit = { &google_protobuf_EnumValueDescriptorProto_submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], - UPB_SIZE(24, 32), 3, false, 255, + UPB_SIZE(24, 32), 3, false, 3, 255, }; static const upb_msglayout *const google_protobuf_ServiceDescriptorProto_submsgs[2] = { @@ -218,15 +218,15 @@ static const upb_msglayout *const google_protobuf_ServiceDescriptorProto_submsgs }; static const upb_msglayout_field google_protobuf_ServiceDescriptorProto__fields[3] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, - {3, UPB_SIZE(12, 24), 2, 1, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 32), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(12, 24), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_ServiceDescriptorProto_msginit = { &google_protobuf_ServiceDescriptorProto_submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout *const google_protobuf_MethodDescriptorProto_submsgs[1] = { @@ -234,18 +234,18 @@ static const upb_msglayout *const google_protobuf_MethodDescriptorProto_submsgs[ }; static const upb_msglayout_field google_protobuf_MethodDescriptorProto__fields[6] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {2, UPB_SIZE(12, 24), 2, 0, 12, 1}, - {3, UPB_SIZE(20, 40), 3, 0, 12, 1}, - {4, UPB_SIZE(28, 56), 4, 0, 11, 1}, - {5, UPB_SIZE(1, 1), 5, 0, 8, 1}, - {6, UPB_SIZE(2, 2), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 2, 0, 12, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(20, 40), 3, 0, 12, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 56), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(1, 1), 5, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(2, 2), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_MethodDescriptorProto_msginit = { &google_protobuf_MethodDescriptorProto_submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], - UPB_SIZE(32, 64), 6, false, 255, + UPB_SIZE(32, 64), 6, false, 6, 255, }; static const upb_msglayout *const google_protobuf_FileOptions_submsgs[1] = { @@ -253,33 +253,33 @@ static const upb_msglayout *const google_protobuf_FileOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_FileOptions__fields[21] = { - {1, UPB_SIZE(20, 24), 1, 0, 12, 1}, - {8, UPB_SIZE(28, 40), 2, 0, 12, 1}, - {9, UPB_SIZE(4, 4), 3, 0, 14, 1}, - {10, UPB_SIZE(8, 8), 4, 0, 8, 1}, - {11, UPB_SIZE(36, 56), 5, 0, 12, 1}, - {16, UPB_SIZE(9, 9), 6, 0, 8, 1}, - {17, UPB_SIZE(10, 10), 7, 0, 8, 1}, - {18, UPB_SIZE(11, 11), 8, 0, 8, 1}, - {20, UPB_SIZE(12, 12), 9, 0, 8, 1}, - {23, UPB_SIZE(13, 13), 10, 0, 8, 1}, - {27, UPB_SIZE(14, 14), 11, 0, 8, 1}, - {31, UPB_SIZE(15, 15), 12, 0, 8, 1}, - {36, UPB_SIZE(44, 72), 13, 0, 12, 1}, - {37, UPB_SIZE(52, 88), 14, 0, 12, 1}, - {39, UPB_SIZE(60, 104), 15, 0, 12, 1}, - {40, UPB_SIZE(68, 120), 16, 0, 12, 1}, - {41, UPB_SIZE(76, 136), 17, 0, 12, 1}, - {42, UPB_SIZE(16, 16), 18, 0, 8, 1}, - {44, UPB_SIZE(84, 152), 19, 0, 12, 1}, - {45, UPB_SIZE(92, 168), 20, 0, 12, 1}, - {999, UPB_SIZE(100, 184), 0, 0, 11, 3}, + {1, UPB_SIZE(20, 24), 1, 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(28, 40), 2, 0, 12, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(4, 4), 3, 0, 14, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(8, 8), 4, 0, 8, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(36, 56), 5, 0, 12, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(9, 9), 6, 0, 8, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(10, 10), 7, 0, 8, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(11, 11), 8, 0, 8, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(12, 12), 9, 0, 8, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(13, 13), 10, 0, 8, _UPB_MODE_SCALAR}, + {27, UPB_SIZE(14, 14), 11, 0, 8, _UPB_MODE_SCALAR}, + {31, UPB_SIZE(15, 15), 12, 0, 8, _UPB_MODE_SCALAR}, + {36, UPB_SIZE(44, 72), 13, 0, 12, _UPB_MODE_SCALAR}, + {37, UPB_SIZE(52, 88), 14, 0, 12, _UPB_MODE_SCALAR}, + {39, UPB_SIZE(60, 104), 15, 0, 12, _UPB_MODE_SCALAR}, + {40, UPB_SIZE(68, 120), 16, 0, 12, _UPB_MODE_SCALAR}, + {41, UPB_SIZE(76, 136), 17, 0, 12, _UPB_MODE_SCALAR}, + {42, UPB_SIZE(16, 16), 18, 0, 8, _UPB_MODE_SCALAR}, + {44, UPB_SIZE(84, 152), 19, 0, 12, _UPB_MODE_SCALAR}, + {45, UPB_SIZE(92, 168), 20, 0, 12, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(100, 184), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_FileOptions_msginit = { &google_protobuf_FileOptions_submsgs[0], &google_protobuf_FileOptions__fields[0], - UPB_SIZE(104, 192), 21, false, 255, + UPB_SIZE(104, 192), 21, false, 1, 255, }; static const upb_msglayout *const google_protobuf_MessageOptions_submsgs[1] = { @@ -287,17 +287,17 @@ static const upb_msglayout *const google_protobuf_MessageOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_MessageOptions__fields[5] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {2, UPB_SIZE(2, 2), 2, 0, 8, 1}, - {3, UPB_SIZE(3, 3), 3, 0, 8, 1}, - {7, UPB_SIZE(4, 4), 4, 0, 8, 1}, - {999, UPB_SIZE(8, 8), 0, 0, 11, 3}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(2, 2), 2, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(3, 3), 3, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 4), 4, 0, 8, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(8, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_MessageOptions_msginit = { &google_protobuf_MessageOptions_submsgs[0], &google_protobuf_MessageOptions__fields[0], - UPB_SIZE(16, 16), 5, false, 255, + UPB_SIZE(16, 16), 5, false, 3, 255, }; static const upb_msglayout *const google_protobuf_FieldOptions_submsgs[1] = { @@ -305,19 +305,19 @@ static const upb_msglayout *const google_protobuf_FieldOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_FieldOptions__fields[7] = { - {1, UPB_SIZE(4, 4), 1, 0, 14, 1}, - {2, UPB_SIZE(12, 12), 2, 0, 8, 1}, - {3, UPB_SIZE(13, 13), 3, 0, 8, 1}, - {5, UPB_SIZE(14, 14), 4, 0, 8, 1}, - {6, UPB_SIZE(8, 8), 5, 0, 14, 1}, - {10, UPB_SIZE(15, 15), 6, 0, 8, 1}, - {999, UPB_SIZE(16, 16), 0, 0, 11, 3}, + {1, UPB_SIZE(4, 4), 1, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 12), 2, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(13, 13), 3, 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(14, 14), 4, 0, 8, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), 5, 0, 14, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(15, 15), 6, 0, 8, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(16, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_FieldOptions_msginit = { &google_protobuf_FieldOptions_submsgs[0], &google_protobuf_FieldOptions__fields[0], - UPB_SIZE(24, 24), 7, false, 255, + UPB_SIZE(24, 24), 7, false, 3, 255, }; static const upb_msglayout *const google_protobuf_OneofOptions_submsgs[1] = { @@ -325,13 +325,13 @@ static const upb_msglayout *const google_protobuf_OneofOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_OneofOptions__fields[1] = { - {999, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {999, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_OneofOptions_msginit = { &google_protobuf_OneofOptions_submsgs[0], &google_protobuf_OneofOptions__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 0, 255, }; static const upb_msglayout *const google_protobuf_EnumOptions_submsgs[1] = { @@ -339,15 +339,15 @@ static const upb_msglayout *const google_protobuf_EnumOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_EnumOptions__fields[3] = { - {2, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {3, UPB_SIZE(2, 2), 2, 0, 8, 1}, - {999, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {2, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(2, 2), 2, 0, 8, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_EnumOptions_msginit = { &google_protobuf_EnumOptions_submsgs[0], &google_protobuf_EnumOptions__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 0, 255, }; static const upb_msglayout *const google_protobuf_EnumValueOptions_submsgs[1] = { @@ -355,14 +355,14 @@ static const upb_msglayout *const google_protobuf_EnumValueOptions_submsgs[1] = }; static const upb_msglayout_field google_protobuf_EnumValueOptions__fields[2] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {999, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_EnumValueOptions_msginit = { &google_protobuf_EnumValueOptions_submsgs[0], &google_protobuf_EnumValueOptions__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 1, 255, }; static const upb_msglayout *const google_protobuf_ServiceOptions_submsgs[1] = { @@ -370,14 +370,14 @@ static const upb_msglayout *const google_protobuf_ServiceOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_ServiceOptions__fields[2] = { - {33, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {999, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {33, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_ServiceOptions_msginit = { &google_protobuf_ServiceOptions_submsgs[0], &google_protobuf_ServiceOptions__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 0, 255, }; static const upb_msglayout *const google_protobuf_MethodOptions_submsgs[1] = { @@ -385,15 +385,15 @@ static const upb_msglayout *const google_protobuf_MethodOptions_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_MethodOptions__fields[3] = { - {33, UPB_SIZE(8, 8), 1, 0, 8, 1}, - {34, UPB_SIZE(4, 4), 2, 0, 14, 1}, - {999, UPB_SIZE(12, 16), 0, 0, 11, 3}, + {33, UPB_SIZE(8, 8), 1, 0, 8, _UPB_MODE_SCALAR}, + {34, UPB_SIZE(4, 4), 2, 0, 14, _UPB_MODE_SCALAR}, + {999, UPB_SIZE(12, 16), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_MethodOptions_msginit = { &google_protobuf_MethodOptions_submsgs[0], &google_protobuf_MethodOptions__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 0, 255, }; static const upb_msglayout *const google_protobuf_UninterpretedOption_submsgs[1] = { @@ -401,30 +401,30 @@ static const upb_msglayout *const google_protobuf_UninterpretedOption_submsgs[1] }; static const upb_msglayout_field google_protobuf_UninterpretedOption__fields[7] = { - {2, UPB_SIZE(56, 80), 0, 0, 11, 3}, - {3, UPB_SIZE(32, 32), 1, 0, 12, 1}, - {4, UPB_SIZE(8, 8), 2, 0, 4, 1}, - {5, UPB_SIZE(16, 16), 3, 0, 3, 1}, - {6, UPB_SIZE(24, 24), 4, 0, 1, 1}, - {7, UPB_SIZE(40, 48), 5, 0, 12, 1}, - {8, UPB_SIZE(48, 64), 6, 0, 12, 1}, + {2, UPB_SIZE(56, 80), 0, 0, 11, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(32, 32), 1, 0, 12, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), 2, 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 16), 3, 0, 3, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 24), 4, 0, 1, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(40, 48), 5, 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(48, 64), 6, 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_UninterpretedOption_msginit = { &google_protobuf_UninterpretedOption_submsgs[0], &google_protobuf_UninterpretedOption__fields[0], - UPB_SIZE(64, 96), 7, false, 255, + UPB_SIZE(64, 96), 7, false, 0, 255, }; static const upb_msglayout_field google_protobuf_UninterpretedOption_NamePart__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 12, 2}, - {2, UPB_SIZE(1, 1), 2, 0, 8, 2}, + {1, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 2, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_UninterpretedOption_NamePart_msginit = { NULL, &google_protobuf_UninterpretedOption_NamePart__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_protobuf_SourceCodeInfo_submsgs[1] = { @@ -432,27 +432,27 @@ static const upb_msglayout *const google_protobuf_SourceCodeInfo_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_SourceCodeInfo__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_SourceCodeInfo_msginit = { &google_protobuf_SourceCodeInfo_submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_SourceCodeInfo_Location__fields[5] = { - {1, UPB_SIZE(20, 40), 0, 0, 5, _UPB_LABEL_PACKED}, - {2, UPB_SIZE(24, 48), 0, 0, 5, _UPB_LABEL_PACKED}, - {3, UPB_SIZE(4, 8), 1, 0, 12, 1}, - {4, UPB_SIZE(12, 24), 2, 0, 12, 1}, - {6, UPB_SIZE(28, 56), 0, 0, 12, 3}, + {1, UPB_SIZE(20, 40), 0, 0, 5, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {2, UPB_SIZE(24, 48), 0, 0, 5, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {3, UPB_SIZE(4, 8), 1, 0, 12, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 2, 0, 12, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 56), 0, 0, 12, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_SourceCodeInfo_Location_msginit = { NULL, &google_protobuf_SourceCodeInfo_Location__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(32, 64), 5, false, 4, 255, }; static const upb_msglayout *const google_protobuf_GeneratedCodeInfo_submsgs[1] = { @@ -460,26 +460,26 @@ static const upb_msglayout *const google_protobuf_GeneratedCodeInfo_submsgs[1] = }; static const upb_msglayout_field google_protobuf_GeneratedCodeInfo__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_GeneratedCodeInfo_msginit = { &google_protobuf_GeneratedCodeInfo_submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = { - {1, UPB_SIZE(20, 32), 0, 0, 5, _UPB_LABEL_PACKED}, - {2, UPB_SIZE(12, 16), 1, 0, 12, 1}, - {3, UPB_SIZE(4, 4), 2, 0, 5, 1}, - {4, UPB_SIZE(8, 8), 3, 0, 5, 1}, + {1, UPB_SIZE(20, 32), 0, 0, 5, _UPB_MODE_ARRAY | _UPB_MODE_IS_PACKED}, + {2, UPB_SIZE(12, 16), 1, 0, 12, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 4), 2, 0, 5, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 8), 3, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit = { NULL, &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h index a8ed71a688..4767b3af68 100644 --- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_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" @@ -162,13 +162,19 @@ UPB_INLINE google_protobuf_FileDescriptorSet *google_protobuf_FileDescriptorSet_ UPB_INLINE google_protobuf_FileDescriptorSet *google_protobuf_FileDescriptorSet_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FileDescriptorSet *ret = google_protobuf_FileDescriptorSet_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FileDescriptorSet *google_protobuf_FileDescriptorSet_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FileDescriptorSet *ret = google_protobuf_FileDescriptorSet_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FileDescriptorSet_msginit, arena, len); @@ -199,13 +205,19 @@ UPB_INLINE google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorPr UPB_INLINE google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FileDescriptorProto *ret = google_protobuf_FileDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FileDescriptorProto *ret = google_protobuf_FileDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FileDescriptorProto_msginit, arena, len); @@ -362,13 +374,19 @@ UPB_INLINE google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_new( UPB_INLINE google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_DescriptorProto *ret = google_protobuf_DescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_DescriptorProto *ret = google_protobuf_DescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_DescriptorProto_msginit, arena, len); @@ -521,13 +539,19 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_Descr UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_DescriptorProto_ExtensionRange_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_DescriptorProto_ExtensionRange *ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_DescriptorProto_ExtensionRange *ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msginit, arena, len); @@ -570,13 +594,19 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange *google_protobuf_Descri UPB_INLINE google_protobuf_DescriptorProto_ReservedRange *google_protobuf_DescriptorProto_ReservedRange_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_DescriptorProto_ReservedRange *ret = google_protobuf_DescriptorProto_ReservedRange_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange *google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_DescriptorProto_ReservedRange *ret = google_protobuf_DescriptorProto_ReservedRange_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msginit, arena, len); @@ -604,13 +634,19 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions *google_protobuf_ExtensionRange UPB_INLINE google_protobuf_ExtensionRangeOptions *google_protobuf_ExtensionRangeOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_ExtensionRangeOptions *ret = google_protobuf_ExtensionRangeOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_ExtensionRangeOptions *google_protobuf_ExtensionRangeOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_ExtensionRangeOptions *ret = google_protobuf_ExtensionRangeOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_ExtensionRangeOptions_msginit, arena, len); @@ -641,13 +677,19 @@ UPB_INLINE google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptor UPB_INLINE google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FieldDescriptorProto *ret = google_protobuf_FieldDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FieldDescriptorProto *ret = google_protobuf_FieldDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FieldDescriptorProto_msginit, arena, len); @@ -738,13 +780,19 @@ UPB_INLINE google_protobuf_OneofDescriptorProto *google_protobuf_OneofDescriptor UPB_INLINE google_protobuf_OneofDescriptorProto *google_protobuf_OneofDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_OneofDescriptorProto *ret = google_protobuf_OneofDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_OneofDescriptorProto *google_protobuf_OneofDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_OneofDescriptorProto *ret = google_protobuf_OneofDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_OneofDescriptorProto_msginit, arena, len); @@ -781,13 +829,19 @@ UPB_INLINE google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorPr UPB_INLINE google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_EnumDescriptorProto *ret = google_protobuf_EnumDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_EnumDescriptorProto *ret = google_protobuf_EnumDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_EnumDescriptorProto_msginit, arena, len); @@ -865,13 +919,19 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange *google_protobu UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange *google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_EnumDescriptorProto_EnumReservedRange *ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange *google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_EnumDescriptorProto_EnumReservedRange *ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena, len); @@ -899,13 +959,19 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDe UPB_INLINE google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_EnumValueDescriptorProto *ret = google_protobuf_EnumValueDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_EnumValueDescriptorProto *ret = google_protobuf_EnumValueDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_EnumValueDescriptorProto_msginit, arena, len); @@ -948,13 +1014,19 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto *google_protobuf_ServiceDescri UPB_INLINE google_protobuf_ServiceDescriptorProto *google_protobuf_ServiceDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_ServiceDescriptorProto *ret = google_protobuf_ServiceDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_ServiceDescriptorProto *google_protobuf_ServiceDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_ServiceDescriptorProto *ret = google_protobuf_ServiceDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_ServiceDescriptorProto_msginit, arena, len); @@ -1006,13 +1078,19 @@ UPB_INLINE google_protobuf_MethodDescriptorProto *google_protobuf_MethodDescript UPB_INLINE google_protobuf_MethodDescriptorProto *google_protobuf_MethodDescriptorProto_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_MethodDescriptorProto *ret = google_protobuf_MethodDescriptorProto_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_MethodDescriptorProto *google_protobuf_MethodDescriptorProto_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_MethodDescriptorProto *ret = google_protobuf_MethodDescriptorProto_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_MethodDescriptorProto_msginit, arena, len); @@ -1073,13 +1151,19 @@ UPB_INLINE google_protobuf_FileOptions *google_protobuf_FileOptions_new(upb_aren UPB_INLINE google_protobuf_FileOptions *google_protobuf_FileOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FileOptions *ret = google_protobuf_FileOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FileOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FileOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FileOptions *google_protobuf_FileOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FileOptions *ret = google_protobuf_FileOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FileOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FileOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FileOptions_msginit, arena, len); @@ -1230,13 +1314,19 @@ UPB_INLINE google_protobuf_MessageOptions *google_protobuf_MessageOptions_new(up UPB_INLINE google_protobuf_MessageOptions *google_protobuf_MessageOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_MessageOptions *ret = google_protobuf_MessageOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_MessageOptions *google_protobuf_MessageOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_MessageOptions *ret = google_protobuf_MessageOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_MessageOptions_msginit, arena, len); @@ -1291,13 +1381,19 @@ UPB_INLINE google_protobuf_FieldOptions *google_protobuf_FieldOptions_new(upb_ar UPB_INLINE google_protobuf_FieldOptions *google_protobuf_FieldOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FieldOptions *ret = google_protobuf_FieldOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FieldOptions *google_protobuf_FieldOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FieldOptions *ret = google_protobuf_FieldOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FieldOptions_msginit, arena, len); @@ -1364,13 +1460,19 @@ UPB_INLINE google_protobuf_OneofOptions *google_protobuf_OneofOptions_new(upb_ar UPB_INLINE google_protobuf_OneofOptions *google_protobuf_OneofOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_OneofOptions *ret = google_protobuf_OneofOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_OneofOptions *google_protobuf_OneofOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_OneofOptions *ret = google_protobuf_OneofOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_OneofOptions_msginit, arena, len); @@ -1401,13 +1503,19 @@ UPB_INLINE google_protobuf_EnumOptions *google_protobuf_EnumOptions_new(upb_aren UPB_INLINE google_protobuf_EnumOptions *google_protobuf_EnumOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_EnumOptions *ret = google_protobuf_EnumOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_EnumOptions *google_protobuf_EnumOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_EnumOptions *ret = google_protobuf_EnumOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_EnumOptions_msginit, arena, len); @@ -1450,13 +1558,19 @@ UPB_INLINE google_protobuf_EnumValueOptions *google_protobuf_EnumValueOptions_ne UPB_INLINE google_protobuf_EnumValueOptions *google_protobuf_EnumValueOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_EnumValueOptions *ret = google_protobuf_EnumValueOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_EnumValueOptions *google_protobuf_EnumValueOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_EnumValueOptions *ret = google_protobuf_EnumValueOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_EnumValueOptions_msginit, arena, len); @@ -1493,13 +1607,19 @@ UPB_INLINE google_protobuf_ServiceOptions *google_protobuf_ServiceOptions_new(up UPB_INLINE google_protobuf_ServiceOptions *google_protobuf_ServiceOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_ServiceOptions *ret = google_protobuf_ServiceOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_ServiceOptions *google_protobuf_ServiceOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_ServiceOptions *ret = google_protobuf_ServiceOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_ServiceOptions_msginit, arena, len); @@ -1536,13 +1656,19 @@ UPB_INLINE google_protobuf_MethodOptions *google_protobuf_MethodOptions_new(upb_ UPB_INLINE google_protobuf_MethodOptions *google_protobuf_MethodOptions_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_MethodOptions *ret = google_protobuf_MethodOptions_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_MethodOptions *google_protobuf_MethodOptions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_MethodOptions *ret = google_protobuf_MethodOptions_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_MethodOptions_msginit, arena, len); @@ -1585,13 +1711,19 @@ UPB_INLINE google_protobuf_UninterpretedOption *google_protobuf_UninterpretedOpt UPB_INLINE google_protobuf_UninterpretedOption *google_protobuf_UninterpretedOption_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_UninterpretedOption *ret = google_protobuf_UninterpretedOption_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_UninterpretedOption *google_protobuf_UninterpretedOption_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_UninterpretedOption *ret = google_protobuf_UninterpretedOption_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_UninterpretedOption_msginit, arena, len); @@ -1658,13 +1790,19 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart *google_protobuf_Uninter UPB_INLINE google_protobuf_UninterpretedOption_NamePart *google_protobuf_UninterpretedOption_NamePart_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_UninterpretedOption_NamePart *ret = google_protobuf_UninterpretedOption_NamePart_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_UninterpretedOption_NamePart *google_protobuf_UninterpretedOption_NamePart_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_UninterpretedOption_NamePart *ret = google_protobuf_UninterpretedOption_NamePart_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_UninterpretedOption_NamePart_msginit, arena, len); @@ -1692,13 +1830,19 @@ UPB_INLINE google_protobuf_SourceCodeInfo *google_protobuf_SourceCodeInfo_new(up UPB_INLINE google_protobuf_SourceCodeInfo *google_protobuf_SourceCodeInfo_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_SourceCodeInfo *ret = google_protobuf_SourceCodeInfo_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_SourceCodeInfo *google_protobuf_SourceCodeInfo_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_SourceCodeInfo *ret = google_protobuf_SourceCodeInfo_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_SourceCodeInfo_msginit, arena, len); @@ -1729,13 +1873,19 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location *google_protobuf_SourceCodeIn UPB_INLINE google_protobuf_SourceCodeInfo_Location *google_protobuf_SourceCodeInfo_Location_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_SourceCodeInfo_Location *ret = google_protobuf_SourceCodeInfo_Location_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_SourceCodeInfo_Location *google_protobuf_SourceCodeInfo_Location_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_SourceCodeInfo_Location *ret = google_protobuf_SourceCodeInfo_Location_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_SourceCodeInfo_Location_msginit, arena, len); @@ -1796,13 +1946,19 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo *google_protobuf_GeneratedCodeInfo_ UPB_INLINE google_protobuf_GeneratedCodeInfo *google_protobuf_GeneratedCodeInfo_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_GeneratedCodeInfo *ret = google_protobuf_GeneratedCodeInfo_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_GeneratedCodeInfo *google_protobuf_GeneratedCodeInfo_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_GeneratedCodeInfo *ret = google_protobuf_GeneratedCodeInfo_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_GeneratedCodeInfo_msginit, arena, len); @@ -1833,13 +1989,19 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation *google_protobuf_Generat UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation *google_protobuf_GeneratedCodeInfo_Annotation_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_GeneratedCodeInfo_Annotation *ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation *google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_GeneratedCodeInfo_Annotation *ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/duration.upb.c b/src/core/ext/upb-generated/google/protobuf/duration.upb.c index 03d463a05e..938294273e 100644 --- a/src/core/ext/upb-generated/google/protobuf/duration.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/duration.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/duration.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field google_protobuf_Duration__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 5, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Duration_msginit = { NULL, &google_protobuf_Duration__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/duration.upb.h b/src/core/ext/upb-generated/google/protobuf/duration.upb.h index 4692fd70be..1b65ee0bab 100644 --- a/src/core/ext/upb-generated/google/protobuf/duration.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/duration.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DURATION_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" @@ -33,13 +33,19 @@ UPB_INLINE google_protobuf_Duration *google_protobuf_Duration_new(upb_arena *are UPB_INLINE google_protobuf_Duration *google_protobuf_Duration_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Duration *ret = google_protobuf_Duration_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Duration_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Duration_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Duration *google_protobuf_Duration_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Duration *ret = google_protobuf_Duration_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Duration_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Duration_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Duration_serialize(const google_protobuf_Duration *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Duration_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/empty.upb.c b/src/core/ext/upb-generated/google/protobuf/empty.upb.c index f634b2bed6..7e483e5e64 100644 --- a/src/core/ext/upb-generated/google/protobuf/empty.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/empty.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/empty.upb.h" #include "upb/port_def.inc" @@ -15,7 +15,7 @@ const upb_msglayout google_protobuf_Empty_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/empty.upb.h b/src/core/ext/upb-generated/google/protobuf/empty.upb.h index 9202b832e1..1046eb18a7 100644 --- a/src/core/ext/upb-generated/google/protobuf/empty.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/empty.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_EMPTY_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" @@ -33,13 +33,19 @@ UPB_INLINE google_protobuf_Empty *google_protobuf_Empty_new(upb_arena *arena) { UPB_INLINE google_protobuf_Empty *google_protobuf_Empty_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Empty *ret = google_protobuf_Empty_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Empty_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Empty_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Empty *google_protobuf_Empty_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Empty *ret = google_protobuf_Empty_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Empty_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Empty_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Empty_serialize(const google_protobuf_Empty *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Empty_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/struct.upb.c b/src/core/ext/upb-generated/google/protobuf/struct.upb.c index 04b916703c..a49f9865ee 100644 --- a/src/core/ext/upb-generated/google/protobuf/struct.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/struct.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/struct.upb.h" #include "upb/port_def.inc" @@ -17,13 +17,13 @@ static const upb_msglayout *const google_protobuf_Struct_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_Struct__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 google_protobuf_Struct_msginit = { &google_protobuf_Struct_submsgs[0], &google_protobuf_Struct__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout *const google_protobuf_Struct_FieldsEntry_submsgs[1] = { @@ -31,14 +31,14 @@ static const upb_msglayout *const google_protobuf_Struct_FieldsEntry_submsgs[1] }; static const upb_msglayout_field google_protobuf_Struct_FieldsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Struct_FieldsEntry_msginit = { &google_protobuf_Struct_FieldsEntry_submsgs[0], &google_protobuf_Struct_FieldsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const google_protobuf_Value_submsgs[2] = { @@ -47,18 +47,18 @@ static const upb_msglayout *const google_protobuf_Value_submsgs[2] = { }; static const upb_msglayout_field google_protobuf_Value__fields[6] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 1, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 8, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 1, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 8, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Value_msginit = { &google_protobuf_Value_submsgs[0], &google_protobuf_Value__fields[0], - UPB_SIZE(16, 32), 6, false, 255, + UPB_SIZE(16, 32), 6, false, 6, 255, }; static const upb_msglayout *const google_protobuf_ListValue_submsgs[1] = { @@ -66,13 +66,13 @@ static const upb_msglayout *const google_protobuf_ListValue_submsgs[1] = { }; static const upb_msglayout_field google_protobuf_ListValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_protobuf_ListValue_msginit = { &google_protobuf_ListValue_submsgs[0], &google_protobuf_ListValue__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/struct.upb.h b/src/core/ext/upb-generated/google/protobuf/struct.upb.h index 29fec82b57..c33a36f87e 100644 --- a/src/core/ext/upb-generated/google/protobuf/struct.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/struct.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_STRUCT_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" @@ -46,13 +46,19 @@ UPB_INLINE google_protobuf_Struct *google_protobuf_Struct_new(upb_arena *arena) UPB_INLINE google_protobuf_Struct *google_protobuf_Struct_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Struct *ret = google_protobuf_Struct_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Struct_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Struct_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Struct *google_protobuf_Struct_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Struct *ret = google_protobuf_Struct_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Struct_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Struct_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Struct_serialize(const google_protobuf_Struct *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Struct_msginit, arena, len); @@ -94,13 +100,19 @@ UPB_INLINE google_protobuf_Value *google_protobuf_Value_new(upb_arena *arena) { UPB_INLINE google_protobuf_Value *google_protobuf_Value_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Value *ret = google_protobuf_Value_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Value *google_protobuf_Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Value *ret = google_protobuf_Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Value_serialize(const google_protobuf_Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Value_msginit, arena, len); @@ -175,13 +187,19 @@ UPB_INLINE google_protobuf_ListValue *google_protobuf_ListValue_new(upb_arena *a UPB_INLINE google_protobuf_ListValue *google_protobuf_ListValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_ListValue *ret = google_protobuf_ListValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_ListValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_ListValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_ListValue *google_protobuf_ListValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_ListValue *ret = google_protobuf_ListValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_ListValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_ListValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_ListValue_serialize(const google_protobuf_ListValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_ListValue_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c b/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c index 718ce3b9db..574c633811 100644 --- a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/timestamp.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field google_protobuf_Timestamp__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 5, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Timestamp_msginit = { NULL, &google_protobuf_Timestamp__fields[0], - UPB_SIZE(16, 16), 2, false, 255, + UPB_SIZE(16, 16), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h b/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h index 31c1145adc..058d90bd24 100644 --- a/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_TIMESTAMP_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" @@ -33,13 +33,19 @@ UPB_INLINE google_protobuf_Timestamp *google_protobuf_Timestamp_new(upb_arena *a UPB_INLINE google_protobuf_Timestamp *google_protobuf_Timestamp_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Timestamp *ret = google_protobuf_Timestamp_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Timestamp_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Timestamp_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Timestamp *google_protobuf_Timestamp_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Timestamp *ret = google_protobuf_Timestamp_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Timestamp_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Timestamp_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Timestamp_serialize(const google_protobuf_Timestamp *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Timestamp_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c b/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c index aabc174012..cf926dfbe8 100644 --- a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c +++ b/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c @@ -7,99 +7,99 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/protobuf/wrappers.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field google_protobuf_DoubleValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_DoubleValue_msginit = { NULL, &google_protobuf_DoubleValue__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_FloatValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 2, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 2, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_FloatValue_msginit = { NULL, &google_protobuf_FloatValue__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_Int64Value__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Int64Value_msginit = { NULL, &google_protobuf_Int64Value__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_UInt64Value__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 4, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 4, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_UInt64Value_msginit = { NULL, &google_protobuf_UInt64Value__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_Int32Value__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 5, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_Int32Value_msginit = { NULL, &google_protobuf_Int32Value__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_UInt32Value__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 13, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_UInt32Value_msginit = { NULL, &google_protobuf_UInt32Value__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_BoolValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_BoolValue_msginit = { NULL, &google_protobuf_BoolValue__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_StringValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_StringValue_msginit = { NULL, &google_protobuf_StringValue__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field google_protobuf_BytesValue__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 12, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout google_protobuf_BytesValue_msginit = { NULL, &google_protobuf_BytesValue__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h b/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h index c184b80506..356bae6cf3 100644 --- a/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h +++ b/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_WRAPPERS_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" @@ -57,13 +57,19 @@ UPB_INLINE google_protobuf_DoubleValue *google_protobuf_DoubleValue_new(upb_aren UPB_INLINE google_protobuf_DoubleValue *google_protobuf_DoubleValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_DoubleValue *ret = google_protobuf_DoubleValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_DoubleValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_DoubleValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_DoubleValue *google_protobuf_DoubleValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_DoubleValue *ret = google_protobuf_DoubleValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_DoubleValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_DoubleValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_DoubleValue_serialize(const google_protobuf_DoubleValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_DoubleValue_msginit, arena, len); @@ -83,13 +89,19 @@ UPB_INLINE google_protobuf_FloatValue *google_protobuf_FloatValue_new(upb_arena UPB_INLINE google_protobuf_FloatValue *google_protobuf_FloatValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_FloatValue *ret = google_protobuf_FloatValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_FloatValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_FloatValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_FloatValue *google_protobuf_FloatValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_FloatValue *ret = google_protobuf_FloatValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_FloatValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_FloatValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_FloatValue_serialize(const google_protobuf_FloatValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_FloatValue_msginit, arena, len); @@ -109,13 +121,19 @@ UPB_INLINE google_protobuf_Int64Value *google_protobuf_Int64Value_new(upb_arena UPB_INLINE google_protobuf_Int64Value *google_protobuf_Int64Value_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Int64Value *ret = google_protobuf_Int64Value_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Int64Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Int64Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Int64Value *google_protobuf_Int64Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Int64Value *ret = google_protobuf_Int64Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Int64Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Int64Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Int64Value_serialize(const google_protobuf_Int64Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Int64Value_msginit, arena, len); @@ -135,13 +153,19 @@ UPB_INLINE google_protobuf_UInt64Value *google_protobuf_UInt64Value_new(upb_aren UPB_INLINE google_protobuf_UInt64Value *google_protobuf_UInt64Value_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_UInt64Value *ret = google_protobuf_UInt64Value_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_UInt64Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_UInt64Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_UInt64Value *google_protobuf_UInt64Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_UInt64Value *ret = google_protobuf_UInt64Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_UInt64Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_UInt64Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_UInt64Value_serialize(const google_protobuf_UInt64Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_UInt64Value_msginit, arena, len); @@ -161,13 +185,19 @@ UPB_INLINE google_protobuf_Int32Value *google_protobuf_Int32Value_new(upb_arena UPB_INLINE google_protobuf_Int32Value *google_protobuf_Int32Value_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_Int32Value *ret = google_protobuf_Int32Value_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_Int32Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_Int32Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_Int32Value *google_protobuf_Int32Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_Int32Value *ret = google_protobuf_Int32Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_Int32Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_Int32Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_Int32Value_serialize(const google_protobuf_Int32Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_Int32Value_msginit, arena, len); @@ -187,13 +217,19 @@ UPB_INLINE google_protobuf_UInt32Value *google_protobuf_UInt32Value_new(upb_aren UPB_INLINE google_protobuf_UInt32Value *google_protobuf_UInt32Value_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_UInt32Value *ret = google_protobuf_UInt32Value_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_UInt32Value_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_UInt32Value_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_UInt32Value *google_protobuf_UInt32Value_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_UInt32Value *ret = google_protobuf_UInt32Value_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_UInt32Value_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_UInt32Value_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_UInt32Value_serialize(const google_protobuf_UInt32Value *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_UInt32Value_msginit, arena, len); @@ -213,13 +249,19 @@ UPB_INLINE google_protobuf_BoolValue *google_protobuf_BoolValue_new(upb_arena *a UPB_INLINE google_protobuf_BoolValue *google_protobuf_BoolValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_BoolValue *ret = google_protobuf_BoolValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_BoolValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_BoolValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_BoolValue *google_protobuf_BoolValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_BoolValue *ret = google_protobuf_BoolValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_BoolValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_BoolValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_BoolValue_serialize(const google_protobuf_BoolValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_BoolValue_msginit, arena, len); @@ -239,13 +281,19 @@ UPB_INLINE google_protobuf_StringValue *google_protobuf_StringValue_new(upb_aren UPB_INLINE google_protobuf_StringValue *google_protobuf_StringValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_StringValue *ret = google_protobuf_StringValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_StringValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_StringValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_StringValue *google_protobuf_StringValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_StringValue *ret = google_protobuf_StringValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_StringValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_StringValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_StringValue_serialize(const google_protobuf_StringValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_StringValue_msginit, arena, len); @@ -265,13 +313,19 @@ UPB_INLINE google_protobuf_BytesValue *google_protobuf_BytesValue_new(upb_arena UPB_INLINE google_protobuf_BytesValue *google_protobuf_BytesValue_parse(const char *buf, size_t size, upb_arena *arena) { google_protobuf_BytesValue *ret = google_protobuf_BytesValue_new(arena); - return (ret && upb_decode(buf, size, ret, &google_protobuf_BytesValue_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_protobuf_BytesValue_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_protobuf_BytesValue *google_protobuf_BytesValue_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_protobuf_BytesValue *ret = google_protobuf_BytesValue_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_protobuf_BytesValue_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_protobuf_BytesValue_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_protobuf_BytesValue_serialize(const google_protobuf_BytesValue *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_protobuf_BytesValue_msginit, arena, len); diff --git a/src/core/ext/upb-generated/google/rpc/status.upb.c b/src/core/ext/upb-generated/google/rpc/status.upb.c index e276a0dc1f..365fd5077f 100644 --- a/src/core/ext/upb-generated/google/rpc/status.upb.c +++ b/src/core/ext/upb-generated/google/rpc/status.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "google/rpc/status.upb.h" #include "google/protobuf/any.upb.h" @@ -18,15 +18,15 @@ static const upb_msglayout *const google_rpc_Status_submsgs[1] = { }; static const upb_msglayout_field google_rpc_Status__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 5, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 24), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout google_rpc_Status_msginit = { &google_rpc_Status_submsgs[0], &google_rpc_Status__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/google/rpc/status.upb.h b/src/core/ext/upb-generated/google/rpc/status.upb.h index 4cc29b3dc2..32031f421a 100644 --- a/src/core/ext/upb-generated/google/rpc/status.upb.h +++ b/src/core/ext/upb-generated/google/rpc/status.upb.h @@ -9,7 +9,7 @@ #ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_ #define GOOGLE_RPC_STATUS_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 google_rpc_Status *google_rpc_Status_new(upb_arena *arena) { UPB_INLINE google_rpc_Status *google_rpc_Status_parse(const char *buf, size_t size, upb_arena *arena) { google_rpc_Status *ret = google_rpc_Status_new(arena); - return (ret && upb_decode(buf, size, ret, &google_rpc_Status_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_rpc_Status_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_rpc_Status *google_rpc_Status_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_rpc_Status *ret = google_rpc_Status_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_rpc_Status_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_rpc_Status_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_rpc_Status_serialize(const google_rpc_Status *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_rpc_Status_msginit, arena, len); diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c index 8b6de3fb46..adf57dc4f0 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "src/proto/grpc/gcp/altscontext.upb.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" @@ -19,30 +19,30 @@ static const upb_msglayout *const grpc_gcp_AltsContext_submsgs[2] = { }; static const upb_msglayout_field grpc_gcp_AltsContext__fields[7] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {4, UPB_SIZE(24, 40), 0, 0, 9, 1}, - {5, UPB_SIZE(32, 56), 0, 0, 9, 1}, - {6, UPB_SIZE(40, 72), 1, 1, 11, 1}, - {7, UPB_SIZE(44, 80), 0, 0, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 40), 0, 0, 9, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 56), 0, 0, 9, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(40, 72), 1, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(44, 80), 0, 0, 11, _UPB_MODE_MAP}, }; const upb_msglayout grpc_gcp_AltsContext_msginit = { &grpc_gcp_AltsContext_submsgs[0], &grpc_gcp_AltsContext__fields[0], - UPB_SIZE(48, 96), 7, false, 255, + UPB_SIZE(48, 96), 7, false, 7, 255, }; static const upb_msglayout_field grpc_gcp_AltsContext_PeerAttributesEntry__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 grpc_gcp_AltsContext_PeerAttributesEntry_msginit = { NULL, &grpc_gcp_AltsContext_PeerAttributesEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h b/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h index 3a91b53d00..da1b96c82a 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h @@ -9,7 +9,7 @@ #ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_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" @@ -38,13 +38,19 @@ UPB_INLINE grpc_gcp_AltsContext *grpc_gcp_AltsContext_new(upb_arena *arena) { UPB_INLINE grpc_gcp_AltsContext *grpc_gcp_AltsContext_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_AltsContext *ret = grpc_gcp_AltsContext_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_AltsContext_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_AltsContext_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_AltsContext *grpc_gcp_AltsContext_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_AltsContext *ret = grpc_gcp_AltsContext_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_AltsContext_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_AltsContext_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_AltsContext_serialize(const grpc_gcp_AltsContext *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_AltsContext_msginit, arena, len); diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c index 998f2d81c2..05eea6e042 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c @@ -7,22 +7,22 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "src/proto/grpc/gcp/handshaker.upb.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field grpc_gcp_Endpoint__fields[3] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 5, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_Endpoint_msginit = { NULL, &grpc_gcp_Endpoint__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout *const grpc_gcp_Identity_submsgs[1] = { @@ -30,26 +30,26 @@ static const upb_msglayout *const grpc_gcp_Identity_submsgs[1] = { }; static const upb_msglayout_field grpc_gcp_Identity__fields[3] = { - {1, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, - {2, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, 1}, - {3, UPB_SIZE(0, 0), 0, 0, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), UPB_SIZE(-13, -25), 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_MAP}, }; const upb_msglayout grpc_gcp_Identity_msginit = { &grpc_gcp_Identity_submsgs[0], &grpc_gcp_Identity__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(16, 32), 3, false, 3, 255, }; static const upb_msglayout_field grpc_gcp_Identity_AttributesEntry__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 grpc_gcp_Identity_AttributesEntry_msginit = { NULL, &grpc_gcp_Identity_AttributesEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const grpc_gcp_StartClientHandshakeReq_submsgs[3] = { @@ -59,22 +59,22 @@ static const upb_msglayout *const grpc_gcp_StartClientHandshakeReq_submsgs[3] = }; static const upb_msglayout_field grpc_gcp_StartClientHandshakeReq__fields[10] = { - {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {2, UPB_SIZE(36, 64), 0, 0, 9, 3}, - {3, UPB_SIZE(40, 72), 0, 0, 9, 3}, - {4, UPB_SIZE(44, 80), 0, 1, 11, 3}, - {5, UPB_SIZE(20, 32), 1, 1, 11, 1}, - {6, UPB_SIZE(24, 40), 2, 0, 11, 1}, - {7, UPB_SIZE(28, 48), 3, 0, 11, 1}, - {8, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {9, UPB_SIZE(32, 56), 4, 2, 11, 1}, - {10, UPB_SIZE(8, 8), 0, 0, 13, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 14, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(36, 64), 0, 0, 9, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(40, 72), 0, 0, 9, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(44, 80), 0, 1, 11, _UPB_MODE_ARRAY}, + {5, UPB_SIZE(20, 32), 1, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 40), 2, 0, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(28, 48), 3, 0, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(32, 56), 4, 2, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(8, 8), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_StartClientHandshakeReq_msginit = { &grpc_gcp_StartClientHandshakeReq_submsgs[0], &grpc_gcp_StartClientHandshakeReq__fields[0], - UPB_SIZE(48, 96), 10, false, 255, + UPB_SIZE(48, 96), 10, false, 10, 255, }; static const upb_msglayout *const grpc_gcp_ServerHandshakeParameters_submsgs[1] = { @@ -82,14 +82,14 @@ static const upb_msglayout *const grpc_gcp_ServerHandshakeParameters_submsgs[1] }; static const upb_msglayout_field grpc_gcp_ServerHandshakeParameters__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(4, 8), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout grpc_gcp_ServerHandshakeParameters_msginit = { &grpc_gcp_ServerHandshakeParameters_submsgs[0], &grpc_gcp_ServerHandshakeParameters__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout *const grpc_gcp_StartServerHandshakeReq_submsgs[3] = { @@ -99,19 +99,19 @@ static const upb_msglayout *const grpc_gcp_StartServerHandshakeReq_submsgs[3] = }; static const upb_msglayout_field grpc_gcp_StartServerHandshakeReq__fields[7] = { - {1, UPB_SIZE(28, 48), 0, 0, 9, 3}, - {2, UPB_SIZE(32, 56), 0, 2, 11, _UPB_LABEL_MAP}, - {3, UPB_SIZE(8, 8), 0, 0, 12, 1}, - {4, UPB_SIZE(16, 24), 1, 0, 11, 1}, - {5, UPB_SIZE(20, 32), 2, 0, 11, 1}, - {6, UPB_SIZE(24, 40), 3, 1, 11, 1}, - {7, UPB_SIZE(4, 4), 0, 0, 13, 1}, + {1, UPB_SIZE(28, 48), 0, 0, 9, _UPB_MODE_ARRAY}, + {2, UPB_SIZE(32, 56), 0, 2, 11, _UPB_MODE_MAP}, + {3, UPB_SIZE(8, 8), 0, 0, 12, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 32), 2, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 40), 3, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_StartServerHandshakeReq_msginit = { &grpc_gcp_StartServerHandshakeReq_submsgs[0], &grpc_gcp_StartServerHandshakeReq__fields[0], - UPB_SIZE(40, 64), 7, false, 255, + UPB_SIZE(40, 64), 7, false, 7, 255, }; static const upb_msglayout *const grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = { @@ -119,24 +119,24 @@ static const upb_msglayout *const grpc_gcp_StartServerHandshakeReq_HandshakePara }; static const upb_msglayout_field grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 5, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_msginit = { &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0], &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field grpc_gcp_NextHandshakeMessageReq__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 12, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 12, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_NextHandshakeMessageReq_msginit = { NULL, &grpc_gcp_NextHandshakeMessageReq__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout *const grpc_gcp_HandshakerReq_submsgs[3] = { @@ -146,15 +146,15 @@ static const upb_msglayout *const grpc_gcp_HandshakerReq_submsgs[3] = { }; static const upb_msglayout_field grpc_gcp_HandshakerReq__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {3, 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), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_HandshakerReq_msginit = { &grpc_gcp_HandshakerReq_submsgs[0], &grpc_gcp_HandshakerReq__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 3, 255, }; static const upb_msglayout *const grpc_gcp_HandshakerResult_submsgs[2] = { @@ -163,31 +163,31 @@ static const upb_msglayout *const grpc_gcp_HandshakerResult_submsgs[2] = { }; static const upb_msglayout_field grpc_gcp_HandshakerResult__fields[8] = { - {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 32), 0, 0, 9, 1}, - {3, UPB_SIZE(28, 48), 0, 0, 12, 1}, - {4, UPB_SIZE(36, 64), 1, 0, 11, 1}, - {5, UPB_SIZE(40, 72), 2, 0, 11, 1}, - {6, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {7, UPB_SIZE(44, 80), 3, 1, 11, 1}, - {8, UPB_SIZE(4, 4), 0, 0, 13, 1}, + {1, UPB_SIZE(12, 16), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(20, 32), 0, 0, 9, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(28, 48), 0, 0, 12, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(36, 64), 1, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 72), 2, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 8), 0, 0, 8, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(44, 80), 3, 1, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_HandshakerResult_msginit = { &grpc_gcp_HandshakerResult_submsgs[0], &grpc_gcp_HandshakerResult__fields[0], - UPB_SIZE(48, 96), 8, false, 255, + UPB_SIZE(48, 96), 8, false, 8, 255, }; static const upb_msglayout_field grpc_gcp_HandshakerStatus__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 13, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_HandshakerStatus_msginit = { NULL, &grpc_gcp_HandshakerStatus__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const grpc_gcp_HandshakerResp_submsgs[2] = { @@ -196,16 +196,16 @@ static const upb_msglayout *const grpc_gcp_HandshakerResp_submsgs[2] = { }; static const upb_msglayout_field grpc_gcp_HandshakerResp__fields[4] = { - {1, UPB_SIZE(8, 8), 0, 0, 12, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 13, 1}, - {3, UPB_SIZE(16, 24), 1, 0, 11, 1}, - {4, UPB_SIZE(20, 32), 2, 1, 11, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 1, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(20, 32), 2, 1, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_HandshakerResp_msginit = { &grpc_gcp_HandshakerResp_submsgs[0], &grpc_gcp_HandshakerResp__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h b/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h index e4c5bf63be..922657aac4 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h @@ -9,7 +9,7 @@ #ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_HANDSHAKER_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" @@ -80,13 +80,19 @@ UPB_INLINE grpc_gcp_Endpoint *grpc_gcp_Endpoint_new(upb_arena *arena) { UPB_INLINE grpc_gcp_Endpoint *grpc_gcp_Endpoint_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_Endpoint *ret = grpc_gcp_Endpoint_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_Endpoint_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_Endpoint_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_Endpoint *grpc_gcp_Endpoint_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_Endpoint *ret = grpc_gcp_Endpoint_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_Endpoint_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_Endpoint_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_Endpoint_serialize(const grpc_gcp_Endpoint *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_Endpoint_msginit, arena, len); @@ -114,13 +120,19 @@ UPB_INLINE grpc_gcp_Identity *grpc_gcp_Identity_new(upb_arena *arena) { UPB_INLINE grpc_gcp_Identity *grpc_gcp_Identity_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_Identity *ret = grpc_gcp_Identity_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_Identity_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_Identity_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_Identity *grpc_gcp_Identity_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_Identity *ret = grpc_gcp_Identity_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_Identity_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_Identity_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_Identity_serialize(const grpc_gcp_Identity *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_Identity_msginit, arena, len); @@ -178,13 +190,19 @@ UPB_INLINE grpc_gcp_StartClientHandshakeReq *grpc_gcp_StartClientHandshakeReq_ne UPB_INLINE grpc_gcp_StartClientHandshakeReq *grpc_gcp_StartClientHandshakeReq_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_StartClientHandshakeReq *ret = grpc_gcp_StartClientHandshakeReq_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_StartClientHandshakeReq *grpc_gcp_StartClientHandshakeReq_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_StartClientHandshakeReq *ret = grpc_gcp_StartClientHandshakeReq_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_StartClientHandshakeReq_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_StartClientHandshakeReq_serialize(const grpc_gcp_StartClientHandshakeReq *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_StartClientHandshakeReq_msginit, arena, len); @@ -309,13 +327,19 @@ UPB_INLINE grpc_gcp_ServerHandshakeParameters *grpc_gcp_ServerHandshakeParameter UPB_INLINE grpc_gcp_ServerHandshakeParameters *grpc_gcp_ServerHandshakeParameters_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_ServerHandshakeParameters *ret = grpc_gcp_ServerHandshakeParameters_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_ServerHandshakeParameters *grpc_gcp_ServerHandshakeParameters_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_ServerHandshakeParameters *ret = grpc_gcp_ServerHandshakeParameters_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_ServerHandshakeParameters_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_ServerHandshakeParameters_serialize(const grpc_gcp_ServerHandshakeParameters *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_ServerHandshakeParameters_msginit, arena, len); @@ -357,13 +381,19 @@ UPB_INLINE grpc_gcp_StartServerHandshakeReq *grpc_gcp_StartServerHandshakeReq_ne UPB_INLINE grpc_gcp_StartServerHandshakeReq *grpc_gcp_StartServerHandshakeReq_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_StartServerHandshakeReq *ret = grpc_gcp_StartServerHandshakeReq_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_StartServerHandshakeReq *grpc_gcp_StartServerHandshakeReq_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_StartServerHandshakeReq *ret = grpc_gcp_StartServerHandshakeReq_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_StartServerHandshakeReq_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_StartServerHandshakeReq_serialize(const grpc_gcp_StartServerHandshakeReq *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_StartServerHandshakeReq_msginit, arena, len); @@ -469,13 +499,19 @@ UPB_INLINE grpc_gcp_NextHandshakeMessageReq *grpc_gcp_NextHandshakeMessageReq_ne UPB_INLINE grpc_gcp_NextHandshakeMessageReq *grpc_gcp_NextHandshakeMessageReq_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_NextHandshakeMessageReq *ret = grpc_gcp_NextHandshakeMessageReq_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_NextHandshakeMessageReq *grpc_gcp_NextHandshakeMessageReq_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_NextHandshakeMessageReq *ret = grpc_gcp_NextHandshakeMessageReq_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_NextHandshakeMessageReq_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_NextHandshakeMessageReq_serialize(const grpc_gcp_NextHandshakeMessageReq *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_NextHandshakeMessageReq_msginit, arena, len); @@ -495,13 +531,19 @@ UPB_INLINE grpc_gcp_HandshakerReq *grpc_gcp_HandshakerReq_new(upb_arena *arena) UPB_INLINE grpc_gcp_HandshakerReq *grpc_gcp_HandshakerReq_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_HandshakerReq *ret = grpc_gcp_HandshakerReq_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_HandshakerReq_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_HandshakerReq_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_HandshakerReq *grpc_gcp_HandshakerReq_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_HandshakerReq *ret = grpc_gcp_HandshakerReq_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_HandshakerReq_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_HandshakerReq_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_HandshakerReq_serialize(const grpc_gcp_HandshakerReq *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_HandshakerReq_msginit, arena, len); @@ -567,13 +609,19 @@ UPB_INLINE grpc_gcp_HandshakerResult *grpc_gcp_HandshakerResult_new(upb_arena *a UPB_INLINE grpc_gcp_HandshakerResult *grpc_gcp_HandshakerResult_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_HandshakerResult *ret = grpc_gcp_HandshakerResult_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_HandshakerResult_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_HandshakerResult_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_HandshakerResult *grpc_gcp_HandshakerResult_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_HandshakerResult *ret = grpc_gcp_HandshakerResult_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_HandshakerResult_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_HandshakerResult_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_HandshakerResult_serialize(const grpc_gcp_HandshakerResult *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_HandshakerResult_msginit, arena, len); @@ -654,13 +702,19 @@ UPB_INLINE grpc_gcp_HandshakerStatus *grpc_gcp_HandshakerStatus_new(upb_arena *a UPB_INLINE grpc_gcp_HandshakerStatus *grpc_gcp_HandshakerStatus_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_HandshakerStatus *ret = grpc_gcp_HandshakerStatus_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_HandshakerStatus *grpc_gcp_HandshakerStatus_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_HandshakerStatus *ret = grpc_gcp_HandshakerStatus_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_HandshakerStatus_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_HandshakerStatus_serialize(const grpc_gcp_HandshakerStatus *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_HandshakerStatus_msginit, arena, len); @@ -684,13 +738,19 @@ UPB_INLINE grpc_gcp_HandshakerResp *grpc_gcp_HandshakerResp_new(upb_arena *arena UPB_INLINE grpc_gcp_HandshakerResp *grpc_gcp_HandshakerResp_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_HandshakerResp *ret = grpc_gcp_HandshakerResp_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_HandshakerResp_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_HandshakerResp_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_HandshakerResp *grpc_gcp_HandshakerResp_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_HandshakerResp *ret = grpc_gcp_HandshakerResp_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_HandshakerResp_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_HandshakerResp_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_HandshakerResp_serialize(const grpc_gcp_HandshakerResp *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_HandshakerResp_msginit, arena, len); diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c b/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c index 136c30da0e..a29a4857a4 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" #include "upb/port_def.inc" @@ -17,25 +17,25 @@ static const upb_msglayout *const grpc_gcp_RpcProtocolVersions_submsgs[1] = { }; static const upb_msglayout_field grpc_gcp_RpcProtocolVersions__fields[2] = { - {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 2, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_RpcProtocolVersions_msginit = { &grpc_gcp_RpcProtocolVersions_submsgs[0], &grpc_gcp_RpcProtocolVersions__fields[0], - UPB_SIZE(16, 24), 2, false, 255, + UPB_SIZE(16, 24), 2, false, 2, 255, }; static const upb_msglayout_field grpc_gcp_RpcProtocolVersions_Version__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 13, 1}, - {2, UPB_SIZE(4, 4), 0, 0, 13, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 4), 0, 0, 13, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_gcp_RpcProtocolVersions_Version_msginit = { NULL, &grpc_gcp_RpcProtocolVersions_Version__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h b/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h index 9e02e0b57b..fbba7cca47 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h +++ b/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h @@ -9,7 +9,7 @@ #ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ #define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_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" @@ -42,13 +42,19 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions *grpc_gcp_RpcProtocolVersions_new(upb_ar UPB_INLINE grpc_gcp_RpcProtocolVersions *grpc_gcp_RpcProtocolVersions_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_RpcProtocolVersions *ret = grpc_gcp_RpcProtocolVersions_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_RpcProtocolVersions *grpc_gcp_RpcProtocolVersions_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_RpcProtocolVersions *ret = grpc_gcp_RpcProtocolVersions_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_RpcProtocolVersions_serialize(const grpc_gcp_RpcProtocolVersions *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_RpcProtocolVersions_msginit, arena, len); @@ -94,13 +100,19 @@ UPB_INLINE grpc_gcp_RpcProtocolVersions_Version *grpc_gcp_RpcProtocolVersions_Ve UPB_INLINE grpc_gcp_RpcProtocolVersions_Version *grpc_gcp_RpcProtocolVersions_Version_parse(const char *buf, size_t size, upb_arena *arena) { grpc_gcp_RpcProtocolVersions_Version *ret = grpc_gcp_RpcProtocolVersions_Version_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_gcp_RpcProtocolVersions_Version *grpc_gcp_RpcProtocolVersions_Version_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_gcp_RpcProtocolVersions_Version *ret = grpc_gcp_RpcProtocolVersions_Version_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_gcp_RpcProtocolVersions_Version_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_gcp_RpcProtocolVersions_Version_serialize(const grpc_gcp_RpcProtocolVersions_Version *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_gcp_RpcProtocolVersions_Version_msginit, arena, len); diff --git a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c b/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c index df8d846627..5a728e6a8b 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c +++ b/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c @@ -7,29 +7,29 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "src/proto/grpc/health/v1/health.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field grpc_health_v1_HealthCheckRequest__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_health_v1_HealthCheckRequest_msginit = { NULL, &grpc_health_v1_HealthCheckRequest__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field grpc_health_v1_HealthCheckResponse__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_health_v1_HealthCheckResponse_msginit = { NULL, &grpc_health_v1_HealthCheckResponse__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h b/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h index 361b221ffe..22bc39c08d 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h +++ b/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h @@ -9,7 +9,7 @@ #ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ #define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_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" @@ -43,13 +43,19 @@ UPB_INLINE grpc_health_v1_HealthCheckRequest *grpc_health_v1_HealthCheckRequest_ UPB_INLINE grpc_health_v1_HealthCheckRequest *grpc_health_v1_HealthCheckRequest_parse(const char *buf, size_t size, upb_arena *arena) { grpc_health_v1_HealthCheckRequest *ret = grpc_health_v1_HealthCheckRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_health_v1_HealthCheckRequest *grpc_health_v1_HealthCheckRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_health_v1_HealthCheckRequest *ret = grpc_health_v1_HealthCheckRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_health_v1_HealthCheckRequest_serialize(const grpc_health_v1_HealthCheckRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_health_v1_HealthCheckRequest_msginit, arena, len); @@ -69,13 +75,19 @@ UPB_INLINE grpc_health_v1_HealthCheckResponse *grpc_health_v1_HealthCheckRespons UPB_INLINE grpc_health_v1_HealthCheckResponse *grpc_health_v1_HealthCheckResponse_parse(const char *buf, size_t size, upb_arena *arena) { grpc_health_v1_HealthCheckResponse *ret = grpc_health_v1_HealthCheckResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_health_v1_HealthCheckResponse *grpc_health_v1_HealthCheckResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_health_v1_HealthCheckResponse *ret = grpc_health_v1_HealthCheckResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_health_v1_HealthCheckResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_health_v1_HealthCheckResponse_serialize(const grpc_health_v1_HealthCheckResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_health_v1_HealthCheckResponse_msginit, arena, len); diff --git a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c b/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c index 3ecf09f145..032fbc6f48 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c +++ b/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "src/proto/grpc/lb/v1/load_balancer.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/timestamp.upb.h" @@ -20,35 +20,35 @@ static const upb_msglayout *const grpc_lb_v1_LoadBalanceRequest_submsgs[2] = { }; static const upb_msglayout_field grpc_lb_v1_LoadBalanceRequest__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 grpc_lb_v1_LoadBalanceRequest_msginit = { &grpc_lb_v1_LoadBalanceRequest_submsgs[0], &grpc_lb_v1_LoadBalanceRequest__fields[0], - UPB_SIZE(8, 16), 2, false, 255, + UPB_SIZE(8, 16), 2, false, 2, 255, }; static const upb_msglayout_field grpc_lb_v1_InitialLoadBalanceRequest__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_lb_v1_InitialLoadBalanceRequest_msginit = { NULL, &grpc_lb_v1_InitialLoadBalanceRequest__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field grpc_lb_v1_ClientStatsPerToken__fields[2] = { - {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 3, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 3, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_lb_v1_ClientStatsPerToken_msginit = { NULL, &grpc_lb_v1_ClientStatsPerToken__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const grpc_lb_v1_ClientStats_submsgs[2] = { @@ -57,18 +57,18 @@ static const upb_msglayout *const grpc_lb_v1_ClientStats_submsgs[2] = { }; static const upb_msglayout_field grpc_lb_v1_ClientStats__fields[6] = { - {1, UPB_SIZE(40, 40), 1, 0, 11, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 3, 1}, - {3, UPB_SIZE(16, 16), 0, 0, 3, 1}, - {6, UPB_SIZE(24, 24), 0, 0, 3, 1}, - {7, UPB_SIZE(32, 32), 0, 0, 3, 1}, - {8, UPB_SIZE(44, 48), 0, 1, 11, 3}, + {1, UPB_SIZE(40, 40), 1, 0, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 3, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 0, 0, 3, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 24), 0, 0, 3, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(32, 32), 0, 0, 3, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(44, 48), 0, 1, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout grpc_lb_v1_ClientStats_msginit = { &grpc_lb_v1_ClientStats_submsgs[0], &grpc_lb_v1_ClientStats__fields[0], - UPB_SIZE(48, 56), 6, false, 255, + UPB_SIZE(48, 56), 6, false, 3, 255, }; static const upb_msglayout *const grpc_lb_v1_LoadBalanceResponse_submsgs[3] = { @@ -78,15 +78,15 @@ static const upb_msglayout *const grpc_lb_v1_LoadBalanceResponse_submsgs[3] = { }; static const upb_msglayout_field grpc_lb_v1_LoadBalanceResponse__fields[3] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {3, 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), 2, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_lb_v1_LoadBalanceResponse_msginit = { &grpc_lb_v1_LoadBalanceResponse_submsgs[0], &grpc_lb_v1_LoadBalanceResponse__fields[0], - UPB_SIZE(8, 16), 3, false, 255, + UPB_SIZE(8, 16), 3, false, 3, 255, }; static const upb_msglayout *const grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { @@ -94,14 +94,14 @@ static const upb_msglayout *const grpc_lb_v1_InitialLoadBalanceResponse_submsgs[ }; static const upb_msglayout_field grpc_lb_v1_InitialLoadBalanceResponse__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_lb_v1_InitialLoadBalanceResponse_msginit = { &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0], &grpc_lb_v1_InitialLoadBalanceResponse__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout *const grpc_lb_v1_ServerList_submsgs[1] = { @@ -109,32 +109,32 @@ static const upb_msglayout *const grpc_lb_v1_ServerList_submsgs[1] = { }; static const upb_msglayout_field grpc_lb_v1_ServerList__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout grpc_lb_v1_ServerList_msginit = { &grpc_lb_v1_ServerList_submsgs[0], &grpc_lb_v1_ServerList__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field grpc_lb_v1_Server__fields[4] = { - {1, UPB_SIZE(8, 8), 0, 0, 12, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 5, 1}, - {3, UPB_SIZE(16, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(4, 4), 0, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 0, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 24), 0, 0, 9, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout grpc_lb_v1_Server_msginit = { NULL, &grpc_lb_v1_Server__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(24, 48), 4, false, 4, 255, }; const upb_msglayout grpc_lb_v1_FallbackResponse_msginit = { NULL, NULL, - UPB_SIZE(0, 0), 0, false, 255, + UPB_SIZE(0, 0), 0, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h b/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h index c8c352ce98..6d19430fee 100644 --- a/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h +++ b/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h @@ -9,7 +9,7 @@ #ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ #define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_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" @@ -61,13 +61,19 @@ UPB_INLINE grpc_lb_v1_LoadBalanceRequest *grpc_lb_v1_LoadBalanceRequest_new(upb_ UPB_INLINE grpc_lb_v1_LoadBalanceRequest *grpc_lb_v1_LoadBalanceRequest_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_LoadBalanceRequest *ret = grpc_lb_v1_LoadBalanceRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_LoadBalanceRequest *grpc_lb_v1_LoadBalanceRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_LoadBalanceRequest *ret = grpc_lb_v1_LoadBalanceRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_LoadBalanceRequest_serialize(const grpc_lb_v1_LoadBalanceRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_LoadBalanceRequest_msginit, arena, len); @@ -118,13 +124,19 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest *grpc_lb_v1_InitialLoadBalanceRe UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest *grpc_lb_v1_InitialLoadBalanceRequest_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_InitialLoadBalanceRequest *ret = grpc_lb_v1_InitialLoadBalanceRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_InitialLoadBalanceRequest *grpc_lb_v1_InitialLoadBalanceRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_InitialLoadBalanceRequest *ret = grpc_lb_v1_InitialLoadBalanceRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_InitialLoadBalanceRequest_serialize(const grpc_lb_v1_InitialLoadBalanceRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_InitialLoadBalanceRequest_msginit, arena, len); @@ -144,13 +156,19 @@ UPB_INLINE grpc_lb_v1_ClientStatsPerToken *grpc_lb_v1_ClientStatsPerToken_new(up UPB_INLINE grpc_lb_v1_ClientStatsPerToken *grpc_lb_v1_ClientStatsPerToken_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_ClientStatsPerToken *ret = grpc_lb_v1_ClientStatsPerToken_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_ClientStatsPerToken *grpc_lb_v1_ClientStatsPerToken_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_ClientStatsPerToken *ret = grpc_lb_v1_ClientStatsPerToken_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_ClientStatsPerToken_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_ClientStatsPerToken_serialize(const grpc_lb_v1_ClientStatsPerToken *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_ClientStatsPerToken_msginit, arena, len); @@ -174,13 +192,19 @@ UPB_INLINE grpc_lb_v1_ClientStats *grpc_lb_v1_ClientStats_new(upb_arena *arena) UPB_INLINE grpc_lb_v1_ClientStats *grpc_lb_v1_ClientStats_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_ClientStats *ret = grpc_lb_v1_ClientStats_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_ClientStats_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_ClientStats_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_ClientStats *grpc_lb_v1_ClientStats_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_ClientStats *ret = grpc_lb_v1_ClientStats_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_ClientStats_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_ClientStats_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_ClientStats_serialize(const grpc_lb_v1_ClientStats *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_ClientStats_msginit, arena, len); @@ -242,13 +266,19 @@ UPB_INLINE grpc_lb_v1_LoadBalanceResponse *grpc_lb_v1_LoadBalanceResponse_new(up UPB_INLINE grpc_lb_v1_LoadBalanceResponse *grpc_lb_v1_LoadBalanceResponse_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_LoadBalanceResponse *ret = grpc_lb_v1_LoadBalanceResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_LoadBalanceResponse *grpc_lb_v1_LoadBalanceResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_LoadBalanceResponse *ret = grpc_lb_v1_LoadBalanceResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_LoadBalanceResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_LoadBalanceResponse_serialize(const grpc_lb_v1_LoadBalanceResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_LoadBalanceResponse_msginit, arena, len); @@ -314,13 +344,19 @@ UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse *grpc_lb_v1_InitialLoadBalanceR UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse *grpc_lb_v1_InitialLoadBalanceResponse_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_InitialLoadBalanceResponse *ret = grpc_lb_v1_InitialLoadBalanceResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_InitialLoadBalanceResponse *grpc_lb_v1_InitialLoadBalanceResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_InitialLoadBalanceResponse *ret = grpc_lb_v1_InitialLoadBalanceResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_InitialLoadBalanceResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_InitialLoadBalanceResponse_serialize(const grpc_lb_v1_InitialLoadBalanceResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_InitialLoadBalanceResponse_msginit, arena, len); @@ -355,13 +391,19 @@ UPB_INLINE grpc_lb_v1_ServerList *grpc_lb_v1_ServerList_new(upb_arena *arena) { UPB_INLINE grpc_lb_v1_ServerList *grpc_lb_v1_ServerList_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_ServerList *ret = grpc_lb_v1_ServerList_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_ServerList_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_ServerList_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_ServerList *grpc_lb_v1_ServerList_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_ServerList *ret = grpc_lb_v1_ServerList_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_ServerList_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_ServerList_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_ServerList_serialize(const grpc_lb_v1_ServerList *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_ServerList_msginit, arena, len); @@ -392,13 +434,19 @@ UPB_INLINE grpc_lb_v1_Server *grpc_lb_v1_Server_new(upb_arena *arena) { UPB_INLINE grpc_lb_v1_Server *grpc_lb_v1_Server_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_Server *ret = grpc_lb_v1_Server_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_Server_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_Server_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_Server *grpc_lb_v1_Server_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_Server *ret = grpc_lb_v1_Server_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_Server_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_Server_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_Server_serialize(const grpc_lb_v1_Server *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_Server_msginit, arena, len); @@ -430,13 +478,19 @@ UPB_INLINE grpc_lb_v1_FallbackResponse *grpc_lb_v1_FallbackResponse_new(upb_aren UPB_INLINE grpc_lb_v1_FallbackResponse *grpc_lb_v1_FallbackResponse_parse(const char *buf, size_t size, upb_arena *arena) { grpc_lb_v1_FallbackResponse *ret = grpc_lb_v1_FallbackResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE grpc_lb_v1_FallbackResponse *grpc_lb_v1_FallbackResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { grpc_lb_v1_FallbackResponse *ret = grpc_lb_v1_FallbackResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &grpc_lb_v1_FallbackResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *grpc_lb_v1_FallbackResponse_serialize(const grpc_lb_v1_FallbackResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &grpc_lb_v1_FallbackResponse_msginit, arena, len); diff --git a/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c index a4d95cc671..41f38d3106 100644 --- a/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c +++ b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "third_party/istio/security/proto/providers/google/meshca.upb.h" #include "google/protobuf/duration.upb.h" @@ -18,25 +18,25 @@ static const upb_msglayout *const google_security_meshca_v1_MeshCertificateReque }; static const upb_msglayout_field google_security_meshca_v1_MeshCertificateRequest__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 google_security_meshca_v1_MeshCertificateRequest_msginit = { &google_security_meshca_v1_MeshCertificateRequest_submsgs[0], &google_security_meshca_v1_MeshCertificateRequest__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(24, 48), 3, false, 3, 255, }; static const upb_msglayout_field google_security_meshca_v1_MeshCertificateResponse__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_ARRAY}, }; const upb_msglayout google_security_meshca_v1_MeshCertificateResponse_msginit = { NULL, &google_security_meshca_v1_MeshCertificateResponse__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h index f301a02897..1c1da2231d 100644 --- a/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h +++ b/src/core/ext/upb-generated/third_party/istio/security/proto/providers/google/meshca.upb.h @@ -9,7 +9,7 @@ #ifndef THIRD_PARTY_ISTIO_SECURITY_PROTO_PROVIDERS_GOOGLE_MESHCA_PROTO_UPB_H_ #define THIRD_PARTY_ISTIO_SECURITY_PROTO_PROVIDERS_GOOGLE_MESHCA_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" @@ -38,13 +38,19 @@ UPB_INLINE google_security_meshca_v1_MeshCertificateRequest *google_security_mes UPB_INLINE google_security_meshca_v1_MeshCertificateRequest *google_security_meshca_v1_MeshCertificateRequest_parse(const char *buf, size_t size, upb_arena *arena) { google_security_meshca_v1_MeshCertificateRequest *ret = google_security_meshca_v1_MeshCertificateRequest_new(arena); - return (ret && upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateRequest_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateRequest_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_security_meshca_v1_MeshCertificateRequest *google_security_meshca_v1_MeshCertificateRequest_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_security_meshca_v1_MeshCertificateRequest *ret = google_security_meshca_v1_MeshCertificateRequest_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateRequest_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateRequest_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_security_meshca_v1_MeshCertificateRequest_serialize(const google_security_meshca_v1_MeshCertificateRequest *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_security_meshca_v1_MeshCertificateRequest_msginit, arena, len); @@ -83,13 +89,19 @@ UPB_INLINE google_security_meshca_v1_MeshCertificateResponse *google_security_me UPB_INLINE google_security_meshca_v1_MeshCertificateResponse *google_security_meshca_v1_MeshCertificateResponse_parse(const char *buf, size_t size, upb_arena *arena) { google_security_meshca_v1_MeshCertificateResponse *ret = google_security_meshca_v1_MeshCertificateResponse_new(arena); - return (ret && upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateResponse_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateResponse_msginit, arena)) return NULL; + return ret; } UPB_INLINE google_security_meshca_v1_MeshCertificateResponse *google_security_meshca_v1_MeshCertificateResponse_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { google_security_meshca_v1_MeshCertificateResponse *ret = google_security_meshca_v1_MeshCertificateResponse_new(arena); - return (ret && _upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateResponse_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &google_security_meshca_v1_MeshCertificateResponse_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *google_security_meshca_v1_MeshCertificateResponse_serialize(const google_security_meshca_v1_MeshCertificateResponse *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &google_security_meshca_v1_MeshCertificateResponse_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c index 5f5f1edd03..b39816259f 100644 --- a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c +++ b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c @@ -7,41 +7,41 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/annotations/migrate.upb.h" #include "google/protobuf/descriptor.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field udpa_annotations_MigrateAnnotation__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_annotations_MigrateAnnotation_msginit = { NULL, &udpa_annotations_MigrateAnnotation__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; static const upb_msglayout_field udpa_annotations_FieldMigrateAnnotation__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 udpa_annotations_FieldMigrateAnnotation_msginit = { NULL, &udpa_annotations_FieldMigrateAnnotation__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field udpa_annotations_FileMigrateAnnotation__fields[1] = { - {2, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_annotations_FileMigrateAnnotation_msginit = { NULL, &udpa_annotations_FileMigrateAnnotation__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 0, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h index 8d55a775b8..1efb8c543b 100644 --- a/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h +++ b/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_MIGRATE_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" @@ -39,13 +39,19 @@ UPB_INLINE udpa_annotations_MigrateAnnotation *udpa_annotations_MigrateAnnotatio UPB_INLINE udpa_annotations_MigrateAnnotation *udpa_annotations_MigrateAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_MigrateAnnotation *ret = udpa_annotations_MigrateAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_MigrateAnnotation *udpa_annotations_MigrateAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_MigrateAnnotation *ret = udpa_annotations_MigrateAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_MigrateAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_MigrateAnnotation_serialize(const udpa_annotations_MigrateAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_MigrateAnnotation_msginit, arena, len); @@ -65,13 +71,19 @@ UPB_INLINE udpa_annotations_FieldMigrateAnnotation *udpa_annotations_FieldMigrat UPB_INLINE udpa_annotations_FieldMigrateAnnotation *udpa_annotations_FieldMigrateAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_FieldMigrateAnnotation *ret = udpa_annotations_FieldMigrateAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_FieldMigrateAnnotation *udpa_annotations_FieldMigrateAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_FieldMigrateAnnotation *ret = udpa_annotations_FieldMigrateAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_FieldMigrateAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_FieldMigrateAnnotation_serialize(const udpa_annotations_FieldMigrateAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_FieldMigrateAnnotation_msginit, arena, len); @@ -95,13 +107,19 @@ UPB_INLINE udpa_annotations_FileMigrateAnnotation *udpa_annotations_FileMigrateA UPB_INLINE udpa_annotations_FileMigrateAnnotation *udpa_annotations_FileMigrateAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_FileMigrateAnnotation *ret = udpa_annotations_FileMigrateAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_FileMigrateAnnotation *udpa_annotations_FileMigrateAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_FileMigrateAnnotation *ret = udpa_annotations_FileMigrateAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_FileMigrateAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_FileMigrateAnnotation_serialize(const udpa_annotations_FileMigrateAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_FileMigrateAnnotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/annotations/security.upb.c b/src/core/ext/upb-generated/udpa/annotations/security.upb.c index d135d4f73b..732903d1a8 100644 --- a/src/core/ext/upb-generated/udpa/annotations/security.upb.c +++ b/src/core/ext/upb-generated/udpa/annotations/security.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/annotations/security.upb.h" #include "udpa/annotations/status.upb.h" #include "google/protobuf/any.upb.h" @@ -17,14 +17,14 @@ #include "upb/port_def.inc" static const upb_msglayout_field udpa_annotations_FieldSecurityAnnotation__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, - {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(1, 1), 0, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_annotations_FieldSecurityAnnotation_msginit = { NULL, &udpa_annotations_FieldSecurityAnnotation__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/annotations/security.upb.h b/src/core/ext/upb-generated/udpa/annotations/security.upb.h index 415ba045bd..1ce4b82808 100644 --- a/src/core/ext/upb-generated/udpa/annotations/security.upb.h +++ b/src/core/ext/upb-generated/udpa/annotations/security.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_SECURITY_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" @@ -33,13 +33,19 @@ UPB_INLINE udpa_annotations_FieldSecurityAnnotation *udpa_annotations_FieldSecur UPB_INLINE udpa_annotations_FieldSecurityAnnotation *udpa_annotations_FieldSecurityAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_FieldSecurityAnnotation *ret = udpa_annotations_FieldSecurityAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_FieldSecurityAnnotation *udpa_annotations_FieldSecurityAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_FieldSecurityAnnotation *ret = udpa_annotations_FieldSecurityAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_FieldSecurityAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_FieldSecurityAnnotation_serialize(const udpa_annotations_FieldSecurityAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_FieldSecurityAnnotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c index ca1fcb59ae..f9bd0f2126 100644 --- a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c +++ b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/annotations/sensitive.upb.h" #include "google/protobuf/descriptor.upb.h" diff --git a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h index 69f2a86296..bbfd4e92cf 100644 --- a/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h +++ b/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_SENSITIVE_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" diff --git a/src/core/ext/upb-generated/udpa/annotations/status.upb.c b/src/core/ext/upb-generated/udpa/annotations/status.upb.c index 16b0181ab8..7d41360753 100644 --- a/src/core/ext/upb-generated/udpa/annotations/status.upb.c +++ b/src/core/ext/upb-generated/udpa/annotations/status.upb.c @@ -7,21 +7,21 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/annotations/status.upb.h" #include "google/protobuf/descriptor.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field udpa_annotations_StatusAnnotation__fields[2] = { - {1, UPB_SIZE(4, 4), 0, 0, 8, 1}, - {2, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {1, UPB_SIZE(4, 4), 0, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(0, 0), 0, 0, 14, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_annotations_StatusAnnotation_msginit = { NULL, &udpa_annotations_StatusAnnotation__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/annotations/status.upb.h b/src/core/ext/upb-generated/udpa/annotations/status.upb.h index a55570df67..cef5cc5f9c 100644 --- a/src/core/ext/upb-generated/udpa/annotations/status.upb.h +++ b/src/core/ext/upb-generated/udpa/annotations/status.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_STATUS_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 udpa_annotations_StatusAnnotation *udpa_annotations_StatusAnnotation_ UPB_INLINE udpa_annotations_StatusAnnotation *udpa_annotations_StatusAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_StatusAnnotation *ret = udpa_annotations_StatusAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_StatusAnnotation *udpa_annotations_StatusAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_StatusAnnotation *ret = udpa_annotations_StatusAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_StatusAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_StatusAnnotation_serialize(const udpa_annotations_StatusAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_StatusAnnotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c index 253afc858b..daf3a8a01b 100644 --- a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c +++ b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c @@ -7,20 +7,20 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/annotations/versioning.upb.h" #include "google/protobuf/descriptor.upb.h" #include "upb/port_def.inc" static const upb_msglayout_field udpa_annotations_VersioningAnnotation__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_annotations_VersioningAnnotation_msginit = { NULL, &udpa_annotations_VersioningAnnotation__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h index e39f8c397c..9a37aeda5c 100644 --- a/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h +++ b/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ #define UDPA_ANNOTATIONS_VERSIONING_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" @@ -33,13 +33,19 @@ UPB_INLINE udpa_annotations_VersioningAnnotation *udpa_annotations_VersioningAnn UPB_INLINE udpa_annotations_VersioningAnnotation *udpa_annotations_VersioningAnnotation_parse(const char *buf, size_t size, upb_arena *arena) { udpa_annotations_VersioningAnnotation *ret = udpa_annotations_VersioningAnnotation_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_annotations_VersioningAnnotation *udpa_annotations_VersioningAnnotation_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_annotations_VersioningAnnotation *ret = udpa_annotations_VersioningAnnotation_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_annotations_VersioningAnnotation_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_annotations_VersioningAnnotation_serialize(const udpa_annotations_VersioningAnnotation *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_annotations_VersioningAnnotation_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c b/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c index e5069b7f13..38feb7b88d 100644 --- a/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +++ b/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/data/orca/v1/orca_load_report.upb.h" #include "validate/validate.upb.h" @@ -19,39 +19,39 @@ static const upb_msglayout *const udpa_data_orca_v1_OrcaLoadReport_submsgs[2] = }; static const upb_msglayout_field udpa_data_orca_v1_OrcaLoadReport__fields[5] = { - {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, - {2, UPB_SIZE(8, 8), 0, 0, 1, 1}, - {3, UPB_SIZE(16, 16), 0, 0, 4, 1}, - {4, UPB_SIZE(24, 24), 0, 0, 11, _UPB_LABEL_MAP}, - {5, UPB_SIZE(28, 32), 0, 1, 11, _UPB_LABEL_MAP}, + {1, UPB_SIZE(0, 0), 0, 0, 1, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 0, 0, 1, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 0, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 24), 0, 0, 11, _UPB_MODE_MAP}, + {5, UPB_SIZE(28, 32), 0, 1, 11, _UPB_MODE_MAP}, }; const upb_msglayout udpa_data_orca_v1_OrcaLoadReport_msginit = { &udpa_data_orca_v1_OrcaLoadReport_submsgs[0], &udpa_data_orca_v1_OrcaLoadReport__fields[0], - UPB_SIZE(32, 40), 5, false, 255, + UPB_SIZE(32, 40), 5, false, 5, 255, }; static const upb_msglayout_field udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry_msginit = { NULL, &udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; static const upb_msglayout_field udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 1, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), 0, 0, 1, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry_msginit = { NULL, &udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h b/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h index e5923cc5e1..dbefd80868 100644 --- a/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h +++ b/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_DATA_ORCA_V1_ORCA_LOAD_REPORT_PROTO_UPB_H_ #define UDPA_DATA_ORCA_V1_ORCA_LOAD_REPORT_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" @@ -39,13 +39,19 @@ UPB_INLINE udpa_data_orca_v1_OrcaLoadReport *udpa_data_orca_v1_OrcaLoadReport_ne UPB_INLINE udpa_data_orca_v1_OrcaLoadReport *udpa_data_orca_v1_OrcaLoadReport_parse(const char *buf, size_t size, upb_arena *arena) { udpa_data_orca_v1_OrcaLoadReport *ret = udpa_data_orca_v1_OrcaLoadReport_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_data_orca_v1_OrcaLoadReport_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_data_orca_v1_OrcaLoadReport_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_data_orca_v1_OrcaLoadReport *udpa_data_orca_v1_OrcaLoadReport_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_data_orca_v1_OrcaLoadReport *ret = udpa_data_orca_v1_OrcaLoadReport_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_data_orca_v1_OrcaLoadReport_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_data_orca_v1_OrcaLoadReport_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_data_orca_v1_OrcaLoadReport_serialize(const udpa_data_orca_v1_OrcaLoadReport *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_data_orca_v1_OrcaLoadReport_msginit, arena, len); diff --git a/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c b/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c index 24407fa6ea..347fb1e8a9 100644 --- a/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c +++ b/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "udpa/type/v1/typed_struct.upb.h" #include "validate/validate.upb.h" #include "google/protobuf/struct.upb.h" @@ -19,14 +19,14 @@ static const upb_msglayout *const udpa_type_v1_TypedStruct_submsgs[1] = { }; static const upb_msglayout_field udpa_type_v1_TypedStruct__fields[2] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {1, UPB_SIZE(4, 8), 0, 0, 9, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(12, 24), 1, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout udpa_type_v1_TypedStruct_msginit = { &udpa_type_v1_TypedStruct_submsgs[0], &udpa_type_v1_TypedStruct__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 2, false, 2, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h b/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h index 2dd03ff12d..431413ccd2 100644 --- a/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h +++ b/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h @@ -9,7 +9,7 @@ #ifndef UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPB_H_ #define UDPA_TYPE_V1_TYPED_STRUCT_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 udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_new(upb_arena *are UPB_INLINE udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_parse(const char *buf, size_t size, upb_arena *arena) { udpa_type_v1_TypedStruct *ret = udpa_type_v1_TypedStruct_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, arena)) return NULL; + return ret; } UPB_INLINE udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { udpa_type_v1_TypedStruct *ret = udpa_type_v1_TypedStruct_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *udpa_type_v1_TypedStruct_serialize(const udpa_type_v1_TypedStruct *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &udpa_type_v1_TypedStruct_msginit, arena, len); diff --git a/src/core/ext/upb-generated/validate/validate.upb.c b/src/core/ext/upb-generated/validate/validate.upb.c index f210e3cb28..f25077ba83 100644 --- a/src/core/ext/upb-generated/validate/validate.upb.c +++ b/src/core/ext/upb-generated/validate/validate.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "validate/validate.upb.h" #include "google/protobuf/descriptor.upb.h" #include "google/protobuf/duration.upb.h" @@ -41,330 +41,330 @@ static const upb_msglayout *const validate_FieldRules_submsgs[22] = { }; static const upb_msglayout_field validate_FieldRules__fields[22] = { - {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 8, 11, 1}, - {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, 1}, - {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 9, 11, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 10, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 20, 11, 1}, - {6, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 21, 11, 1}, - {7, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 16, 11, 1}, - {8, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 17, 11, 1}, - {9, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 6, 11, 1}, - {10, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 7, 11, 1}, - {11, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 14, 11, 1}, - {12, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 15, 11, 1}, - {13, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {14, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 18, 11, 1}, - {15, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, - {16, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 5, 11, 1}, - {17, UPB_SIZE(4, 8), 1, 12, 11, 1}, - {18, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 13, 11, 1}, - {19, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 11, 11, 1}, - {20, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, - {21, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 4, 11, 1}, - {22, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 19, 11, 1}, + {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 8, 11, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 9, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 10, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 20, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 21, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 16, 11, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 17, 11, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 6, 11, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 7, 11, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 14, 11, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 15, 11, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 18, 11, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 5, 11, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(4, 8), 1, 12, 11, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 13, 11, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 11, 11, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 4, 11, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 19, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_FieldRules_msginit = { &validate_FieldRules_submsgs[0], &validate_FieldRules__fields[0], - UPB_SIZE(16, 32), 22, false, 255, + UPB_SIZE(16, 32), 22, false, 22, 255, }; static const upb_msglayout_field validate_FloatRules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 2, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 2, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 2, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 2, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 2, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 2, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 2, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 2, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 2, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 2, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 2, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 2, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 2, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 2, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_FloatRules_msginit = { NULL, &validate_FloatRules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_DoubleRules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 1, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 1, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 1, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 1, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 1, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 1, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 1, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 1, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 1, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 1, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 1, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 1, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 1, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 1, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_DoubleRules_msginit = { NULL, &validate_DoubleRules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_Int32Rules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 5, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 5, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 5, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 5, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 5, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 5, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 5, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 5, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 5, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 5, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 5, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 5, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 5, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_Int32Rules_msginit = { NULL, &validate_Int32Rules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_Int64Rules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 3, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 3, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 3, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 3, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 3, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 3, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 3, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 3, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 3, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 3, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 3, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 3, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 3, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 3, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_Int64Rules_msginit = { NULL, &validate_Int64Rules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_UInt32Rules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 13, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 13, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 13, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 13, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 13, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 13, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 13, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 13, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 13, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 13, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 13, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 13, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 13, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 13, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_UInt32Rules_msginit = { NULL, &validate_UInt32Rules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_UInt64Rules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 4, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 4, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 4, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 4, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 4, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 4, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 4, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 4, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 4, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 4, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 4, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_UInt64Rules_msginit = { NULL, &validate_UInt64Rules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_SInt32Rules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 17, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 17, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 17, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 17, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 17, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 17, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 17, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 17, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 17, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 17, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 17, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 17, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 17, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 17, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_SInt32Rules_msginit = { NULL, &validate_SInt32Rules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_SInt64Rules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 18, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 18, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 18, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 18, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 18, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 18, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 18, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 18, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 18, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 18, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 18, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 18, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 18, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 18, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_SInt64Rules_msginit = { NULL, &validate_SInt64Rules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_Fixed32Rules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 7, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 7, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 7, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 7, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 7, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 7, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 7, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 7, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 7, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 7, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 7, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 7, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 7, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 7, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_Fixed32Rules_msginit = { NULL, &validate_Fixed32Rules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_Fixed64Rules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 6, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 6, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 6, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 6, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 6, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 6, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 6, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 6, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 6, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 6, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 6, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 6, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 6, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 6, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_Fixed64Rules_msginit = { NULL, &validate_Fixed64Rules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_SFixed32Rules__fields[8] = { - {1, UPB_SIZE(4, 4), 1, 0, 15, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 15, 1}, - {3, UPB_SIZE(12, 12), 3, 0, 15, 1}, - {4, UPB_SIZE(16, 16), 4, 0, 15, 1}, - {5, UPB_SIZE(20, 20), 5, 0, 15, 1}, - {6, UPB_SIZE(28, 32), 0, 0, 15, 3}, - {7, UPB_SIZE(32, 40), 0, 0, 15, 3}, - {8, UPB_SIZE(24, 24), 6, 0, 8, 1}, + {1, UPB_SIZE(4, 4), 1, 0, 15, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 15, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 12), 3, 0, 15, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 16), 4, 0, 15, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 20), 5, 0, 15, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(28, 32), 0, 0, 15, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(32, 40), 0, 0, 15, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(24, 24), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_SFixed32Rules_msginit = { NULL, &validate_SFixed32Rules__fields[0], - UPB_SIZE(40, 48), 8, false, 255, + UPB_SIZE(40, 48), 8, false, 8, 255, }; static const upb_msglayout_field validate_SFixed64Rules__fields[8] = { - {1, UPB_SIZE(8, 8), 1, 0, 16, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 16, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 16, 1}, - {4, UPB_SIZE(32, 32), 4, 0, 16, 1}, - {5, UPB_SIZE(40, 40), 5, 0, 16, 1}, - {6, UPB_SIZE(52, 56), 0, 0, 16, 3}, - {7, UPB_SIZE(56, 64), 0, 0, 16, 3}, - {8, UPB_SIZE(48, 48), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 16, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 16, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 16, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(32, 32), 4, 0, 16, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(40, 40), 5, 0, 16, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(52, 56), 0, 0, 16, _UPB_MODE_ARRAY}, + {7, UPB_SIZE(56, 64), 0, 0, 16, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(48, 48), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_SFixed64Rules_msginit = { NULL, &validate_SFixed64Rules__fields[0], - UPB_SIZE(64, 72), 8, false, 255, + UPB_SIZE(64, 72), 8, false, 8, 255, }; static const upb_msglayout_field validate_BoolRules__fields[1] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_BoolRules_msginit = { NULL, &validate_BoolRules__fields[0], - UPB_SIZE(8, 8), 1, false, 255, + UPB_SIZE(8, 8), 1, false, 1, 255, }; static const upb_msglayout_field validate_StringRules__fields[26] = { - {1, UPB_SIZE(60, 64), 1, 0, 12, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 4, 1}, - {3, UPB_SIZE(16, 16), 3, 0, 4, 1}, - {4, UPB_SIZE(24, 24), 4, 0, 4, 1}, - {5, UPB_SIZE(32, 32), 5, 0, 4, 1}, - {6, UPB_SIZE(68, 80), 6, 0, 12, 1}, - {7, UPB_SIZE(76, 96), 7, 0, 12, 1}, - {8, UPB_SIZE(84, 112), 8, 0, 12, 1}, - {9, UPB_SIZE(92, 128), 9, 0, 12, 1}, - {10, UPB_SIZE(108, 160), 0, 0, 12, 3}, - {11, UPB_SIZE(112, 168), 0, 0, 12, 3}, - {12, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {13, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {14, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {15, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {16, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {17, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {18, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {19, UPB_SIZE(40, 40), 10, 0, 4, 1}, - {20, UPB_SIZE(48, 48), 11, 0, 4, 1}, - {21, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {22, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, 1}, - {23, UPB_SIZE(100, 144), 12, 0, 12, 1}, - {24, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 14, 1}, - {25, UPB_SIZE(56, 56), 13, 0, 8, 1}, - {26, UPB_SIZE(57, 57), 14, 0, 8, 1}, + {1, UPB_SIZE(60, 64), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 3, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(24, 24), 4, 0, 4, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 32), 5, 0, 4, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(68, 80), 6, 0, 12, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(76, 96), 7, 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(84, 112), 8, 0, 12, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(92, 128), 9, 0, 12, _UPB_MODE_SCALAR}, + {10, UPB_SIZE(108, 160), 0, 0, 12, _UPB_MODE_ARRAY}, + {11, UPB_SIZE(112, 168), 0, 0, 12, _UPB_MODE_ARRAY}, + {12, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {15, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {16, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {17, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {18, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {19, UPB_SIZE(40, 40), 10, 0, 4, _UPB_MODE_SCALAR}, + {20, UPB_SIZE(48, 48), 11, 0, 4, _UPB_MODE_SCALAR}, + {21, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {22, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 8, _UPB_MODE_SCALAR}, + {23, UPB_SIZE(100, 144), 12, 0, 12, _UPB_MODE_SCALAR}, + {24, UPB_SIZE(116, 176), UPB_SIZE(-121, -181), 0, 14, _UPB_MODE_SCALAR}, + {25, UPB_SIZE(56, 56), 13, 0, 8, _UPB_MODE_SCALAR}, + {26, UPB_SIZE(57, 57), 14, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_StringRules_msginit = { NULL, &validate_StringRules__fields[0], - UPB_SIZE(128, 192), 26, false, 255, + UPB_SIZE(128, 192), 26, false, 26, 255, }; static const upb_msglayout_field validate_BytesRules__fields[14] = { - {1, UPB_SIZE(36, 40), 1, 0, 12, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 4, 1}, - {3, UPB_SIZE(16, 16), 3, 0, 4, 1}, - {4, UPB_SIZE(44, 56), 4, 0, 12, 1}, - {5, UPB_SIZE(52, 72), 5, 0, 12, 1}, - {6, UPB_SIZE(60, 88), 6, 0, 12, 1}, - {7, UPB_SIZE(68, 104), 7, 0, 12, 1}, - {8, UPB_SIZE(76, 120), 0, 0, 12, 3}, - {9, UPB_SIZE(80, 128), 0, 0, 12, 3}, - {10, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, 1}, - {11, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, 1}, - {12, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, 1}, - {13, UPB_SIZE(24, 24), 8, 0, 4, 1}, - {14, UPB_SIZE(32, 32), 9, 0, 8, 1}, + {1, UPB_SIZE(36, 40), 1, 0, 12, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(16, 16), 3, 0, 4, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(44, 56), 4, 0, 12, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(52, 72), 5, 0, 12, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(60, 88), 6, 0, 12, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(68, 104), 7, 0, 12, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(76, 120), 0, 0, 12, _UPB_MODE_ARRAY}, + {9, UPB_SIZE(80, 128), 0, 0, 12, _UPB_MODE_ARRAY}, + {10, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, _UPB_MODE_SCALAR}, + {11, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, _UPB_MODE_SCALAR}, + {12, UPB_SIZE(84, 136), UPB_SIZE(-89, -141), 0, 8, _UPB_MODE_SCALAR}, + {13, UPB_SIZE(24, 24), 8, 0, 4, _UPB_MODE_SCALAR}, + {14, UPB_SIZE(32, 32), 9, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_BytesRules_msginit = { NULL, &validate_BytesRules__fields[0], - UPB_SIZE(96, 144), 14, false, 255, + UPB_SIZE(96, 144), 14, false, 14, 255, }; static const upb_msglayout_field validate_EnumRules__fields[4] = { - {1, UPB_SIZE(4, 4), 1, 0, 5, 1}, - {2, UPB_SIZE(8, 8), 2, 0, 8, 1}, - {3, UPB_SIZE(12, 16), 0, 0, 5, 3}, - {4, UPB_SIZE(16, 24), 0, 0, 5, 3}, + {1, UPB_SIZE(4, 4), 1, 0, 5, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 0, 8, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 16), 0, 0, 5, _UPB_MODE_ARRAY}, + {4, UPB_SIZE(16, 24), 0, 0, 5, _UPB_MODE_ARRAY}, }; const upb_msglayout validate_EnumRules_msginit = { NULL, &validate_EnumRules__fields[0], - UPB_SIZE(24, 32), 4, false, 255, + UPB_SIZE(24, 32), 4, false, 4, 255, }; static const upb_msglayout_field validate_MessageRules__fields[2] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {2, UPB_SIZE(2, 2), 2, 0, 8, 1}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(2, 2), 2, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_MessageRules_msginit = { NULL, &validate_MessageRules__fields[0], - UPB_SIZE(8, 8), 2, false, 255, + UPB_SIZE(8, 8), 2, false, 2, 255, }; static const upb_msglayout *const validate_RepeatedRules_submsgs[1] = { @@ -372,17 +372,17 @@ static const upb_msglayout *const validate_RepeatedRules_submsgs[1] = { }; static const upb_msglayout_field validate_RepeatedRules__fields[5] = { - {1, UPB_SIZE(8, 8), 1, 0, 4, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 4, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 8, 1}, - {4, UPB_SIZE(28, 32), 4, 0, 11, 1}, - {5, UPB_SIZE(25, 25), 5, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 4, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 32), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(25, 25), 5, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_RepeatedRules_msginit = { &validate_RepeatedRules_submsgs[0], &validate_RepeatedRules__fields[0], - UPB_SIZE(32, 40), 5, false, 255, + UPB_SIZE(32, 40), 5, false, 5, 255, }; static const upb_msglayout *const validate_MapRules_submsgs[1] = { @@ -390,30 +390,30 @@ static const upb_msglayout *const validate_MapRules_submsgs[1] = { }; static const upb_msglayout_field validate_MapRules__fields[6] = { - {1, UPB_SIZE(8, 8), 1, 0, 4, 1}, - {2, UPB_SIZE(16, 16), 2, 0, 4, 1}, - {3, UPB_SIZE(24, 24), 3, 0, 8, 1}, - {4, UPB_SIZE(28, 32), 4, 0, 11, 1}, - {5, UPB_SIZE(32, 40), 5, 0, 11, 1}, - {6, UPB_SIZE(25, 25), 6, 0, 8, 1}, + {1, UPB_SIZE(8, 8), 1, 0, 4, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(16, 16), 2, 0, 4, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(24, 24), 3, 0, 8, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(28, 32), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(32, 40), 5, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(25, 25), 6, 0, 8, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_MapRules_msginit = { &validate_MapRules_submsgs[0], &validate_MapRules__fields[0], - UPB_SIZE(40, 48), 6, false, 255, + UPB_SIZE(40, 48), 6, false, 6, 255, }; static const upb_msglayout_field validate_AnyRules__fields[3] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {2, UPB_SIZE(4, 8), 0, 0, 12, 3}, - {3, UPB_SIZE(8, 16), 0, 0, 12, 3}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 0, 0, 12, _UPB_MODE_ARRAY}, + {3, UPB_SIZE(8, 16), 0, 0, 12, _UPB_MODE_ARRAY}, }; const upb_msglayout validate_AnyRules_msginit = { NULL, &validate_AnyRules__fields[0], - UPB_SIZE(16, 24), 3, false, 255, + UPB_SIZE(16, 24), 3, false, 3, 255, }; static const upb_msglayout *const validate_DurationRules_submsgs[1] = { @@ -421,20 +421,20 @@ static const upb_msglayout *const validate_DurationRules_submsgs[1] = { }; static const upb_msglayout_field validate_DurationRules__fields[8] = { - {1, UPB_SIZE(1, 1), 1, 0, 8, 1}, - {2, UPB_SIZE(4, 8), 2, 0, 11, 1}, - {3, UPB_SIZE(8, 16), 3, 0, 11, 1}, - {4, UPB_SIZE(12, 24), 4, 0, 11, 1}, - {5, UPB_SIZE(16, 32), 5, 0, 11, 1}, - {6, UPB_SIZE(20, 40), 6, 0, 11, 1}, - {7, UPB_SIZE(24, 48), 0, 0, 11, 3}, - {8, UPB_SIZE(28, 56), 0, 0, 11, 3}, + {1, UPB_SIZE(1, 1), 1, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(4, 8), 2, 0, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(8, 16), 3, 0, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(12, 24), 4, 0, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(16, 32), 5, 0, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(20, 40), 6, 0, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(24, 48), 0, 0, 11, _UPB_MODE_ARRAY}, + {8, UPB_SIZE(28, 56), 0, 0, 11, _UPB_MODE_ARRAY}, }; const upb_msglayout validate_DurationRules_msginit = { &validate_DurationRules_submsgs[0], &validate_DurationRules__fields[0], - UPB_SIZE(32, 64), 8, false, 255, + UPB_SIZE(32, 64), 8, false, 8, 255, }; static const upb_msglayout *const validate_TimestampRules_submsgs[2] = { @@ -443,21 +443,21 @@ static const upb_msglayout *const validate_TimestampRules_submsgs[2] = { }; static const upb_msglayout_field validate_TimestampRules__fields[9] = { - {1, UPB_SIZE(2, 2), 1, 0, 8, 1}, - {2, UPB_SIZE(8, 8), 2, 1, 11, 1}, - {3, UPB_SIZE(12, 16), 3, 1, 11, 1}, - {4, UPB_SIZE(16, 24), 4, 1, 11, 1}, - {5, UPB_SIZE(20, 32), 5, 1, 11, 1}, - {6, UPB_SIZE(24, 40), 6, 1, 11, 1}, - {7, UPB_SIZE(3, 3), 7, 0, 8, 1}, - {8, UPB_SIZE(4, 4), 8, 0, 8, 1}, - {9, UPB_SIZE(28, 48), 9, 0, 11, 1}, + {1, UPB_SIZE(2, 2), 1, 0, 8, _UPB_MODE_SCALAR}, + {2, UPB_SIZE(8, 8), 2, 1, 11, _UPB_MODE_SCALAR}, + {3, UPB_SIZE(12, 16), 3, 1, 11, _UPB_MODE_SCALAR}, + {4, UPB_SIZE(16, 24), 4, 1, 11, _UPB_MODE_SCALAR}, + {5, UPB_SIZE(20, 32), 5, 1, 11, _UPB_MODE_SCALAR}, + {6, UPB_SIZE(24, 40), 6, 1, 11, _UPB_MODE_SCALAR}, + {7, UPB_SIZE(3, 3), 7, 0, 8, _UPB_MODE_SCALAR}, + {8, UPB_SIZE(4, 4), 8, 0, 8, _UPB_MODE_SCALAR}, + {9, UPB_SIZE(28, 48), 9, 0, 11, _UPB_MODE_SCALAR}, }; const upb_msglayout validate_TimestampRules_msginit = { &validate_TimestampRules_submsgs[0], &validate_TimestampRules__fields[0], - UPB_SIZE(32, 56), 9, false, 255, + UPB_SIZE(32, 56), 9, false, 9, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/validate/validate.upb.h b/src/core/ext/upb-generated/validate/validate.upb.h index 640cdf9f1f..e121fd88ba 100644 --- a/src/core/ext/upb-generated/validate/validate.upb.h +++ b/src/core/ext/upb-generated/validate/validate.upb.h @@ -9,7 +9,7 @@ #ifndef VALIDATE_VALIDATE_PROTO_UPB_H_ #define VALIDATE_VALIDATE_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" @@ -109,13 +109,19 @@ UPB_INLINE validate_FieldRules *validate_FieldRules_new(upb_arena *arena) { UPB_INLINE validate_FieldRules *validate_FieldRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_FieldRules *ret = validate_FieldRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_FieldRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_FieldRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_FieldRules *validate_FieldRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_FieldRules *ret = validate_FieldRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_FieldRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_FieldRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_FieldRules_serialize(const validate_FieldRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_FieldRules_msginit, arena, len); @@ -466,13 +472,19 @@ UPB_INLINE validate_FloatRules *validate_FloatRules_new(upb_arena *arena) { UPB_INLINE validate_FloatRules *validate_FloatRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_FloatRules *ret = validate_FloatRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_FloatRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_FloatRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_FloatRules *validate_FloatRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_FloatRules *ret = validate_FloatRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_FloatRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_FloatRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_FloatRules_serialize(const validate_FloatRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_FloatRules_msginit, arena, len); @@ -546,13 +558,19 @@ UPB_INLINE validate_DoubleRules *validate_DoubleRules_new(upb_arena *arena) { UPB_INLINE validate_DoubleRules *validate_DoubleRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_DoubleRules *ret = validate_DoubleRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_DoubleRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_DoubleRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_DoubleRules *validate_DoubleRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_DoubleRules *ret = validate_DoubleRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_DoubleRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_DoubleRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_DoubleRules_serialize(const validate_DoubleRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_DoubleRules_msginit, arena, len); @@ -626,13 +644,19 @@ UPB_INLINE validate_Int32Rules *validate_Int32Rules_new(upb_arena *arena) { UPB_INLINE validate_Int32Rules *validate_Int32Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_Int32Rules *ret = validate_Int32Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_Int32Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_Int32Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_Int32Rules *validate_Int32Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_Int32Rules *ret = validate_Int32Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_Int32Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_Int32Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_Int32Rules_serialize(const validate_Int32Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_Int32Rules_msginit, arena, len); @@ -706,13 +730,19 @@ UPB_INLINE validate_Int64Rules *validate_Int64Rules_new(upb_arena *arena) { UPB_INLINE validate_Int64Rules *validate_Int64Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_Int64Rules *ret = validate_Int64Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_Int64Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_Int64Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_Int64Rules *validate_Int64Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_Int64Rules *ret = validate_Int64Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_Int64Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_Int64Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_Int64Rules_serialize(const validate_Int64Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_Int64Rules_msginit, arena, len); @@ -786,13 +816,19 @@ UPB_INLINE validate_UInt32Rules *validate_UInt32Rules_new(upb_arena *arena) { UPB_INLINE validate_UInt32Rules *validate_UInt32Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_UInt32Rules *ret = validate_UInt32Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_UInt32Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_UInt32Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_UInt32Rules *validate_UInt32Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_UInt32Rules *ret = validate_UInt32Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_UInt32Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_UInt32Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_UInt32Rules_serialize(const validate_UInt32Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_UInt32Rules_msginit, arena, len); @@ -866,13 +902,19 @@ UPB_INLINE validate_UInt64Rules *validate_UInt64Rules_new(upb_arena *arena) { UPB_INLINE validate_UInt64Rules *validate_UInt64Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_UInt64Rules *ret = validate_UInt64Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_UInt64Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_UInt64Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_UInt64Rules *validate_UInt64Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_UInt64Rules *ret = validate_UInt64Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_UInt64Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_UInt64Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_UInt64Rules_serialize(const validate_UInt64Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_UInt64Rules_msginit, arena, len); @@ -946,13 +988,19 @@ UPB_INLINE validate_SInt32Rules *validate_SInt32Rules_new(upb_arena *arena) { UPB_INLINE validate_SInt32Rules *validate_SInt32Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_SInt32Rules *ret = validate_SInt32Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_SInt32Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_SInt32Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_SInt32Rules *validate_SInt32Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_SInt32Rules *ret = validate_SInt32Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_SInt32Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_SInt32Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_SInt32Rules_serialize(const validate_SInt32Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_SInt32Rules_msginit, arena, len); @@ -1026,13 +1074,19 @@ UPB_INLINE validate_SInt64Rules *validate_SInt64Rules_new(upb_arena *arena) { UPB_INLINE validate_SInt64Rules *validate_SInt64Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_SInt64Rules *ret = validate_SInt64Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_SInt64Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_SInt64Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_SInt64Rules *validate_SInt64Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_SInt64Rules *ret = validate_SInt64Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_SInt64Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_SInt64Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_SInt64Rules_serialize(const validate_SInt64Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_SInt64Rules_msginit, arena, len); @@ -1106,13 +1160,19 @@ UPB_INLINE validate_Fixed32Rules *validate_Fixed32Rules_new(upb_arena *arena) { UPB_INLINE validate_Fixed32Rules *validate_Fixed32Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_Fixed32Rules *ret = validate_Fixed32Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_Fixed32Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_Fixed32Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_Fixed32Rules *validate_Fixed32Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_Fixed32Rules *ret = validate_Fixed32Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_Fixed32Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_Fixed32Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_Fixed32Rules_serialize(const validate_Fixed32Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_Fixed32Rules_msginit, arena, len); @@ -1186,13 +1246,19 @@ UPB_INLINE validate_Fixed64Rules *validate_Fixed64Rules_new(upb_arena *arena) { UPB_INLINE validate_Fixed64Rules *validate_Fixed64Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_Fixed64Rules *ret = validate_Fixed64Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_Fixed64Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_Fixed64Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_Fixed64Rules *validate_Fixed64Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_Fixed64Rules *ret = validate_Fixed64Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_Fixed64Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_Fixed64Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_Fixed64Rules_serialize(const validate_Fixed64Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_Fixed64Rules_msginit, arena, len); @@ -1266,13 +1332,19 @@ UPB_INLINE validate_SFixed32Rules *validate_SFixed32Rules_new(upb_arena *arena) UPB_INLINE validate_SFixed32Rules *validate_SFixed32Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_SFixed32Rules *ret = validate_SFixed32Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_SFixed32Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_SFixed32Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_SFixed32Rules *validate_SFixed32Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_SFixed32Rules *ret = validate_SFixed32Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_SFixed32Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_SFixed32Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_SFixed32Rules_serialize(const validate_SFixed32Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_SFixed32Rules_msginit, arena, len); @@ -1346,13 +1418,19 @@ UPB_INLINE validate_SFixed64Rules *validate_SFixed64Rules_new(upb_arena *arena) UPB_INLINE validate_SFixed64Rules *validate_SFixed64Rules_parse(const char *buf, size_t size, upb_arena *arena) { validate_SFixed64Rules *ret = validate_SFixed64Rules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_SFixed64Rules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_SFixed64Rules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_SFixed64Rules *validate_SFixed64Rules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_SFixed64Rules *ret = validate_SFixed64Rules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_SFixed64Rules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_SFixed64Rules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_SFixed64Rules_serialize(const validate_SFixed64Rules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_SFixed64Rules_msginit, arena, len); @@ -1426,13 +1504,19 @@ UPB_INLINE validate_BoolRules *validate_BoolRules_new(upb_arena *arena) { UPB_INLINE validate_BoolRules *validate_BoolRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_BoolRules *ret = validate_BoolRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_BoolRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_BoolRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_BoolRules *validate_BoolRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_BoolRules *ret = validate_BoolRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_BoolRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_BoolRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_BoolRules_serialize(const validate_BoolRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_BoolRules_msginit, arena, len); @@ -1454,13 +1538,19 @@ UPB_INLINE validate_StringRules *validate_StringRules_new(upb_arena *arena) { UPB_INLINE validate_StringRules *validate_StringRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_StringRules *ret = validate_StringRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_StringRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_StringRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_StringRules *validate_StringRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_StringRules *ret = validate_StringRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_StringRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_StringRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_StringRules_serialize(const validate_StringRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_StringRules_msginit, arena, len); @@ -1647,13 +1737,19 @@ UPB_INLINE validate_BytesRules *validate_BytesRules_new(upb_arena *arena) { UPB_INLINE validate_BytesRules *validate_BytesRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_BytesRules *ret = validate_BytesRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_BytesRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_BytesRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_BytesRules *validate_BytesRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_BytesRules *ret = validate_BytesRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_BytesRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_BytesRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_BytesRules_serialize(const validate_BytesRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_BytesRules_msginit, arena, len); @@ -1768,13 +1864,19 @@ UPB_INLINE validate_EnumRules *validate_EnumRules_new(upb_arena *arena) { UPB_INLINE validate_EnumRules *validate_EnumRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_EnumRules *ret = validate_EnumRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_EnumRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_EnumRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_EnumRules *validate_EnumRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_EnumRules *ret = validate_EnumRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_EnumRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_EnumRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_EnumRules_serialize(const validate_EnumRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_EnumRules_msginit, arena, len); @@ -1824,13 +1926,19 @@ UPB_INLINE validate_MessageRules *validate_MessageRules_new(upb_arena *arena) { UPB_INLINE validate_MessageRules *validate_MessageRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_MessageRules *ret = validate_MessageRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_MessageRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_MessageRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_MessageRules *validate_MessageRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_MessageRules *ret = validate_MessageRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_MessageRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_MessageRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_MessageRules_serialize(const validate_MessageRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_MessageRules_msginit, arena, len); @@ -1858,13 +1966,19 @@ UPB_INLINE validate_RepeatedRules *validate_RepeatedRules_new(upb_arena *arena) UPB_INLINE validate_RepeatedRules *validate_RepeatedRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_RepeatedRules *ret = validate_RepeatedRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_RepeatedRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_RepeatedRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_RepeatedRules *validate_RepeatedRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_RepeatedRules *ret = validate_RepeatedRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_RepeatedRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_RepeatedRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_RepeatedRules_serialize(const validate_RepeatedRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_RepeatedRules_msginit, arena, len); @@ -1919,13 +2033,19 @@ UPB_INLINE validate_MapRules *validate_MapRules_new(upb_arena *arena) { UPB_INLINE validate_MapRules *validate_MapRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_MapRules *ret = validate_MapRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_MapRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_MapRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_MapRules *validate_MapRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_MapRules *ret = validate_MapRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_MapRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_MapRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_MapRules_serialize(const validate_MapRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_MapRules_msginit, arena, len); @@ -1995,13 +2115,19 @@ UPB_INLINE validate_AnyRules *validate_AnyRules_new(upb_arena *arena) { UPB_INLINE validate_AnyRules *validate_AnyRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_AnyRules *ret = validate_AnyRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_AnyRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_AnyRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_AnyRules *validate_AnyRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_AnyRules *ret = validate_AnyRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_AnyRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_AnyRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_AnyRules_serialize(const validate_AnyRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_AnyRules_msginit, arena, len); @@ -2045,13 +2171,19 @@ UPB_INLINE validate_DurationRules *validate_DurationRules_new(upb_arena *arena) UPB_INLINE validate_DurationRules *validate_DurationRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_DurationRules *ret = validate_DurationRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_DurationRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_DurationRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_DurationRules *validate_DurationRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_DurationRules *ret = validate_DurationRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_DurationRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_DurationRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_DurationRules_serialize(const validate_DurationRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_DurationRules_msginit, arena, len); @@ -2178,13 +2310,19 @@ UPB_INLINE validate_TimestampRules *validate_TimestampRules_new(upb_arena *arena UPB_INLINE validate_TimestampRules *validate_TimestampRules_parse(const char *buf, size_t size, upb_arena *arena) { validate_TimestampRules *ret = validate_TimestampRules_new(arena); - return (ret && upb_decode(buf, size, ret, &validate_TimestampRules_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &validate_TimestampRules_msginit, arena)) return NULL; + return ret; } UPB_INLINE validate_TimestampRules *validate_TimestampRules_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { + const upb_extreg *extreg, int options, + upb_arena *arena) { validate_TimestampRules *ret = validate_TimestampRules_new(arena); - return (ret && _upb_decode(buf, size, ret, &validate_TimestampRules_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &validate_TimestampRules_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *validate_TimestampRules_serialize(const validate_TimestampRules *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &validate_TimestampRules_msginit, arena, len); diff --git a/src/core/ext/upb-generated/xds/core/v3/authority.upb.c b/src/core/ext/upb-generated/xds/core/v3/authority.upb.c index 6c6da7d75b..de06e076b7 100644 --- a/src/core/ext/upb-generated/xds/core/v3/authority.upb.c +++ b/src/core/ext/upb-generated/xds/core/v3/authority.upb.c @@ -7,7 +7,7 @@ * regenerated. */ #include <stddef.h> -#include "upb/msg.h" +#include "upb/msg_internal.h" #include "xds/core/v3/authority.upb.h" #include "udpa/annotations/status.upb.h" #include "validate/validate.upb.h" @@ -15,13 +15,13 @@ #include "upb/port_def.inc" static const upb_msglayout_field xds_core_v3_Authority__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {1, UPB_SIZE(0, 0), 0, 0, 9, _UPB_MODE_SCALAR}, }; const upb_msglayout xds_core_v3_Authority_msginit = { NULL, &xds_core_v3_Authority__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 1, false, 1, 255, }; #include "upb/port_undef.inc" diff --git a/src/core/ext/upb-generated/xds/core/v3/authority.upb.h b/src/core/ext/upb-generated/xds/core/v3/authority.upb.h index 2f1ff44541..fa75a11bb3 100644 --- a/src/core/ext/upb-generated/xds/core/v3/authority.upb.h +++ b/src/core/ext/upb-generated/xds/core/v3/authority.upb.h @@ -9,7 +9,7 @@ #ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ #define XDS_CORE_V3_AUTHORITY_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" @@ -33,13 +33,19 @@ UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_new(upb_arena *arena) { UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_parse(const char *buf, size_t size, upb_arena *arena) { xds_core_v3_Authority *ret = xds_core_v3_Authority_new(arena); - return (ret && upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, arena)) ? ret : NULL; + if (!ret) return NULL; + if (!upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, arena)) return NULL; + return ret; } UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_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_Authority *ret = xds_core_v3_Authority_new(arena); - return (ret && _upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, arena, options)) - ? ret : NULL; + if (!ret) return NULL; + if (!_upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, extreg, options, arena)) { + return NULL; + } + return ret; } UPB_INLINE char *xds_core_v3_Authority_serialize(const xds_core_v3_Authority *msg, upb_arena *arena, size_t *len) { return upb_encode(msg, &xds_core_v3_Authority_msginit, arena, len); diff --git a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c b/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c index 20cc297098..e4584e4459 100644 --- a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c +++ b/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" diff --git a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h b/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h index 983a3455c8..df01757e81 100644 --- a/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h +++ b/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); diff --git a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c b/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c index 17c3c61cda..b78d54cf29 100644 --- a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c +++ b/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" diff --git a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h b/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h index 0bcd242596..3fab0c4ff5 100644 --- a/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h +++ b/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); diff --git a/src/core/ext/upb-generated/xds/core/v3/resource.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource.upb.c index fa2375e98e..c3fa6abb15 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource.upb.c +++ b/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" diff --git a/src/core/ext/upb-generated/xds/core/v3/resource.upb.h b/src/core/ext/upb-generated/xds/core/v3/resource.upb.h index ab8e2df41b..7be7462877 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource.upb.h +++ b/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); diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c index 2bd099a5e4..575e5561d4 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c +++ b/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" diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h b/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h index da7442bd17..797cc45af9 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h +++ b/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); diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c b/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c index ff645f687f..f0bf9b3694 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c +++ b/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" diff --git a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h b/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h index 3f38cc5139..06fe8a0946 100644 --- a/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h +++ b/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); diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index b556c3dea8..5b528ef15a 100755 --- a/src/upb/gen_build_yaml.py +++ b/src/upb/gen_build_yaml.py @@ -43,21 +43,22 @@ try: ], 'headers': [ "third_party/upb/upb/decode_fast.h", + "third_party/upb/upb/decode_internal.h", "third_party/upb/upb/decode.h", - "third_party/upb/upb/decode.int.h", "third_party/upb/upb/def.h", "third_party/upb/upb/def.hpp", "third_party/upb/upb/encode.h", + "third_party/upb/upb/msg_internal.h", "third_party/upb/upb/msg.h", "third_party/upb/upb/port_def.inc", "third_party/upb/upb/port_undef.inc", "third_party/upb/upb/reflection.h", - "third_party/upb/upb/table.int.h", + "third_party/upb/upb/reflection.hpp", + "third_party/upb/upb/table_internal.h", "third_party/upb/upb/text_encode.h", + "third_party/upb/upb/upb_internal.h", "third_party/upb/upb/upb.h", "third_party/upb/upb/upb.hpp", - "third_party/upb/upb/upb.int.h", - "third_party/upb/third_party/wyhash/wyhash.h", "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h", ], |