diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index f8029a59141..9746b65fa74 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -338,11 +338,11 @@ def grpc_deps():
if "upb" not in native.existing_rules():
http_archive(
name = "upb",
- sha256 = "c0b97bf91dfea7e8d7579c24e2ecdd02d10b00f3c5defc3dce23d95100d0e664",
- strip_prefix = "upb-60607da72e89ba0c84c84054d2e562d8b6b61177",
+ sha256 = "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
+ strip_prefix = "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f",
urls = [
- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/60607da72e89ba0c84c84054d2e562d8b6b61177.tar.gz",
- "https://github.com/protocolbuffers/upb/archive/60607da72e89ba0c84c84054d2e562d8b6b61177.tar.gz",
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
],
)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index b05211611b4..1bcd8c40aa3 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -846,22 +846,23 @@ Pod::Spec.new do |s|
'third_party/re2/util/test.h',
'third_party/re2/util/utf.h',
'third_party/re2/util/util.h',
- 'third_party/upb/third_party/wyhash/wyhash.h',
'third_party/upb/upb/decode.h',
- 'third_party/upb/upb/decode.int.h',
'third_party/upb/upb/decode_fast.h',
+ 'third_party/upb/upb/decode_internal.h',
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
'third_party/upb/upb/msg.h',
+ 'third_party/upb/upb/msg_internal.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.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h',
+ 'third_party/upb/upb/upb_internal.h',
'third_party/xxhash/xxhash.h'
ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
@@ -1457,22 +1458,23 @@ Pod::Spec.new do |s|
'third_party/re2/util/test.h',
'third_party/re2/util/utf.h',
'third_party/re2/util/util.h',
- 'third_party/upb/third_party/wyhash/wyhash.h',
'third_party/upb/upb/decode.h',
- 'third_party/upb/upb/decode.int.h',
'third_party/upb/upb/decode_fast.h',
+ 'third_party/upb/upb/decode_internal.h',
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
'third_party/upb/upb/msg.h',
+ 'third_party/upb/upb/msg_internal.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.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h',
+ 'third_party/upb/upb/upb_internal.h',
'third_party/xxhash/xxhash.h'
end
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 49b36a2da7a..1bfba46ee75 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1426,12 +1426,11 @@ Pod::Spec.new do |s|
'third_party/re2/util/test.h',
'third_party/re2/util/utf.h',
'third_party/re2/util/util.h',
- 'third_party/upb/third_party/wyhash/wyhash.h',
'third_party/upb/upb/decode.c',
'third_party/upb/upb/decode.h',
- 'third_party/upb/upb/decode.int.h',
'third_party/upb/upb/decode_fast.c',
'third_party/upb/upb/decode_fast.h',
+ 'third_party/upb/upb/decode_internal.h',
'third_party/upb/upb/def.c',
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
@@ -1439,18 +1438,20 @@ Pod::Spec.new do |s|
'third_party/upb/upb/encode.h',
'third_party/upb/upb/msg.c',
'third_party/upb/upb/msg.h',
+ 'third_party/upb/upb/msg_internal.h',
'third_party/upb/upb/port_def.inc',
'third_party/upb/upb/port_undef.inc',
'third_party/upb/upb/reflection.c',
'third_party/upb/upb/reflection.h',
+ 'third_party/upb/upb/reflection.hpp',
'third_party/upb/upb/table.c',
- 'third_party/upb/upb/table.int.h',
+ 'third_party/upb/upb/table_internal.h',
'third_party/upb/upb/text_encode.c',
'third_party/upb/upb/text_encode.h',
'third_party/upb/upb/upb.c',
'third_party/upb/upb/upb.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h',
+ 'third_party/upb/upb/upb_internal.h',
'third_party/xxhash/xxhash.h'
ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
@@ -2034,22 +2035,23 @@ Pod::Spec.new do |s|
'third_party/re2/util/test.h',
'third_party/re2/util/utf.h',
'third_party/re2/util/util.h',
- 'third_party/upb/third_party/wyhash/wyhash.h',
'third_party/upb/upb/decode.h',
- 'third_party/upb/upb/decode.int.h',
'third_party/upb/upb/decode_fast.h',
+ 'third_party/upb/upb/decode_internal.h',
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
'third_party/upb/upb/msg.h',
+ 'third_party/upb/upb/msg_internal.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.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h',
+ 'third_party/upb/upb/upb_internal.h',
'third_party/xxhash/xxhash.h'
end
diff --git a/grpc.gemspec b/grpc.gemspec
index 60e758df65f..d84c0aef717 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -2143,12 +2143,11 @@ Gem::Specification.new do |s|
s.files += %w( third_party/re2/util/test.h )
s.files += %w( third_party/re2/util/utf.h )
s.files += %w( third_party/re2/util/util.h )
- s.files += %w( third_party/upb/third_party/wyhash/wyhash.h )
s.files += %w( third_party/upb/upb/decode.c )
s.files += %w( third_party/upb/upb/decode.h )
- s.files += %w( third_party/upb/upb/decode.int.h )
s.files += %w( third_party/upb/upb/decode_fast.c )
s.files += %w( third_party/upb/upb/decode_fast.h )
+ s.files += %w( third_party/upb/upb/decode_internal.h )
s.files += %w( third_party/upb/upb/def.c )
s.files += %w( third_party/upb/upb/def.h )
s.files += %w( third_party/upb/upb/def.hpp )
@@ -2156,18 +2155,20 @@ Gem::Specification.new do |s|
s.files += %w( third_party/upb/upb/encode.h )
s.files += %w( third_party/upb/upb/msg.c )
s.files += %w( third_party/upb/upb/msg.h )
+ s.files += %w( third_party/upb/upb/msg_internal.h )
s.files += %w( third_party/upb/upb/port_def.inc )
s.files += %w( third_party/upb/upb/port_undef.inc )
s.files += %w( third_party/upb/upb/reflection.c )
s.files += %w( third_party/upb/upb/reflection.h )
+ s.files += %w( third_party/upb/upb/reflection.hpp )
s.files += %w( third_party/upb/upb/table.c )
- s.files += %w( third_party/upb/upb/table.int.h )
+ s.files += %w( third_party/upb/upb/table_internal.h )
s.files += %w( third_party/upb/upb/text_encode.c )
s.files += %w( third_party/upb/upb/text_encode.h )
s.files += %w( third_party/upb/upb/upb.c )
s.files += %w( third_party/upb/upb/upb.h )
s.files += %w( third_party/upb/upb/upb.hpp )
- s.files += %w( third_party/upb/upb/upb.int.h )
+ s.files += %w( third_party/upb/upb/upb_internal.h )
s.files += %w( third_party/xxhash/xxhash.h )
s.files += %w( third_party/zlib/adler32.c )
s.files += %w( third_party/zlib/compress.c )
diff --git a/package.xml b/package.xml
index ce0ff37e127..2be1e39a18a 100644
--- a/package.xml
+++ b/package.xml
@@ -2068,12 +2068,11 @@
-
-
+
@@ -2081,18 +2080,20 @@
+
+
-
+
-
+
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 d230ccb2ff6..8db55430231 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
-#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 6f117c6659d..db9fe28efb7 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 007de310153..c3aaa116874 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
-#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 1478843b590..c6ccf281db3 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 8f1877d1c6d..2f605df917e 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
-#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 534eef36b8c..4ba34cedc37 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 fa6dcbc1fb9..579a29724c8 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
-#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 8e33c869c72..34eba0d3740 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 153cbc687c6..5b72a4c40df 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
-#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 21152f2fb07..33a9b2c259f 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 b3f086de190..8d85e0d1d5e 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
-#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 8d6099603de..4d89a703e7f 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 1d7e99267c4..e11d9d71356 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
-#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 84feca06185..fc1e82db894 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 14230149e51..7c02e7a614c 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
-#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 1850b2a5504..36356fbeed4 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 f90563f1e70..3092f86502a 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
-#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 70b76232628..9da074f42ef 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 048fc05035d..457e1ead504 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
-#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 c8fdbee29ee..cab78ba6c81 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 8e1174d7a9f..95c1b37f68e 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
-#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 3601c66cf9d..3711df00623 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 e534377aa68..cfb9327473e 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
-#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 043c0b9ada0..8d36c96746f 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 30a2e754e92..91daff7a513 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
-#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 1fc85348903..3388402b5f1 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 3f89247a7a5..9de7ac74608 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
-#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 3069f4c3c77..25ae45e67a4 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 47b8b32ecbd..beea24a4abe 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
-#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 8499bfc26ce..613689c4213 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 b2e99df0649..478c5acb15b 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
-#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 dd9913debf3..a59bdf09155 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 b0a5a642885..a1cb228d301 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
-#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 e4a803ab253..cc8b0f0da73 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 c39ebef4c8c..840f6a80a5f 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
-#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 c49eec1f998..3cb1ba2cdc8 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 827de063c1c..b1f1cd06dc5 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
-#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 8b277ef760b..891459bdb95 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 4c56e07b7f1..2cf1da392f8 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
-#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 bd56a644def..934ea952890 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 66b8a4ef795..77124824783 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
-#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 c86e29ed0a8..e5afe57a3df 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 d4c2ea14006..b90e52d0a96 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
-#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 0347443069d..14378149673 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 17c92619de8..cd4c6d2ab41 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
-#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 3f450e9ad17..be910ee6fbe 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 cd01106ce8e..33bc133c8d2 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
-#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 e61e18dbaab..b8ab9612457 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 3f9c789bf8d..ea8353edb74 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
-#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 c89e4a45721..b787ab68634 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 f12e49bdafc..f120aafb12b 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
-#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 b6ad981cacc..6fddea45653 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 560826ed31b..303f91e56e8 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
-#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 d986e182407..0819b4a1b1a 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 e016fffa22a..0c19654923c 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
-#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 9d1372b4e82..ba821ff9d1d 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 a75126bb587..ad006ed69ad 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
-#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 56a7f7c6907..3842168355f 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 e31eab43b40..dda5ed7d674 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
-#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 f8ff80885f6..17afbdc227a 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 5ecd130fd39..7e3cdb0a84e 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
-#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 a2fb9167667..8a0f954c486 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 14dcdbfcd66..b34cac3a312 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
-#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 7dc472dc225..0f284678c77 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 26d00f14ea8..d92cf58aa34 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
-#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 dab0415ed60..4172af8bccb 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 a306e71e8ac..832d33985b0 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
-#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 d800aa9736f..71baa8fcf43 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 d4c81d1a5e7..ccecd646093 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
-#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 befa31f625e..e651df89f07 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 d82eb1de413..4bd3447b677 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
-#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 af2ed7ea87e..c9127c48a34 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 ca05b29d7b7..308a374702e 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
-#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 f01e3596b2f..00d2d251f4e 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 301441e3c42..6553b0d889c 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
-#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 72d1622841f..83b76560cde 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 52cb6b72ba0..a22b93982e5 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
-#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 21240fa0e48..fdba74ab307 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 308e8b53388..57a0f171680 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
-#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 ffa4ccbca29..cb61c5bdbd4 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 5f92b8d00b2..58e0ddfadb6 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
-#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 8c609170d4e..d20e41a8a9e 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 e363a2c402d..d2eaa404179 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
-#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 08e71d4c4d8..f5c45dc0e85 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 b69c2cda3fe..e8a14622971 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
-#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 7174b6c2b07..57100fbcf0e 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 26db63b6605..91839bf89ed 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
-#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 3695e2a2cd9..a331e53619c 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 44d63a49387..daf1765cccb 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
-#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 f1b24af9e65..0b4d12fa3f4 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 6bd4e8d7819..0bfb93c5483 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
-#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 e85f14b341f..e554939cc35 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 6717a17a024..9b0410c96a9 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
-#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 c576e0adcee..07d2e11aae0 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 ad5494ce2e6..e9688999a26 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
-#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 8a8ba90b7b2..3b60270ae42 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 cc8dcc4f567..737242bb897 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
-#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 86fa3022b25..e716c68ae16 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 7fb8ac990da..f7535f70a9a 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
-#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 0d26bd97dc5..d2ed5896205 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 a5b6ac46aa3..24795272fd9 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
-#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 def27876393..105e0330580 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 0af0480487f..7ceb472338c 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
-#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 1b1fd3d0a17..565f669f85a 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 404bfa414ff..87b690955cc 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
-#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 9b8988c1adf..1a20545deb1 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 68fe078f090..679b3c32744 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
-#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 f74a023120a..5146f494f9c 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 07d17f61278..37234550f8d 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
-#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 40a6d42563f..20eeb8bcbb5 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 6dbaa817c95..01e3110b0f8 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
-#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 e86154b742e..a8486d54fbf 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 fa36211f0b5..dae701e8cc0 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
-#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 ffc61cddcd6..56b60471a29 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 77d6d9a40e4..f3e2dc918cc 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
-#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 2aa31596dc5..725573e6442 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 7fdf5b9fea7..054823949ac 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
-#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 a7f17c14488..18209e03e99 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 8ef51fb91ec..3ae84d4d134 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
-#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 94e2257fdfc..78873ad32d0 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 516755b0bf7..cb116d05606 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
-#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 ebca3037aa5..1a4c14587f1 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 caef3395638..822084c0965 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
-#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 defbcf02640..1c0e40bd8ee 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 d7d645ad960..115fa08425a 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
-#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 5e00d13f189..ce7d14ec712 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 e84e4f7c928..a0c367d0a1d 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
-#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 4bce450ca8b..05313a26aef 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 05ea6a3ffcb..7fef88683f6 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
-#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 53e521385de..a7939b7c395 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 0195307d0cd..5f28e3503e3 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
-#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 dc44445f8f3..0310b45f94c 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 e692eda96f3..33174f95443 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
-#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 83ac93cf529..48a0da1af27 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 fa53e431e69..c4cb3b26e1d 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
-#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 666ed7b11db..b382c541e5d 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 c4a03ae8cad..753363bc5e8 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
-#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 25b033f214c..3464038b4f6 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 9e4a87c341a..5ef87006901 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
-#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 6155e2391d2..3c2f7a0751a 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 e4222bef5c9..717fccdf6b7 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
-#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 9ff396d9ce2..32afd9ad472 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 8984ac7fbdc..94e7cb86f57 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
-#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 e1dd3297202..e06a6bb052b 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 a1385cc3e70..d21b0941b66 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
-#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 fcbe640dbed..0295fbb5ed1 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 16fd52a0739..e24ce3ae72c 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
-#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 43a88f708bf..8520b5a5159 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 4bbf5758615..c32d934eb60 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
-#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 ffa7925ab35..3460224abfc 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 f17613acb98..d064f6eddbf 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
-#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 ed4e6d10dce..b0745b988e6 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 93eaa603e32..bdf0dc05610 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
-#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 2bd44f76852..ca6a7a0f299 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 339fafac090..a6b9af91322 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
-#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 a8ed71a688c..4767b3af688 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 03d463a05ee..938294273e6 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
-#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 4692fd70be9..1b65ee0bab2 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 f634b2bed69..7e483e5e645 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
-#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 9202b832e19..1046eb18a7d 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 04b916703cc..a49f9865ee3 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
-#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 29fec82b577..c33a36f87e7 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 718ce3b9dbb..574c633811d 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
-#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 31c1145adc9..058d90bd24b 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 aabc1740129..cf926dfbe84 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
-#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 c184b805064..356bae6cf31 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 e276a0dc1f1..365fd5077f0 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
-#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 4cc29b3dc26..32031f421aa 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 8b6de3fb468..adf57dc4f0b 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
-#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 3a91b53d000..da1b96c82a3 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 998f2d81c2c..05eea6e0423 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
-#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 e4c5bf63bea..922657aac4a 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 136c30da0e0..a29a4857a4e 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
-#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 9e02e0b57b4..fbba7cca475 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 df8d846627e..5a728e6a8b7 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
-#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 361b221ffea..22bc39c08d8 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 3ecf09f145d..032fbc6f481 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
-#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 c8c352ce989..6d19430feee 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 a4d95cc671c..41f38d31062 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
-#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 f301a028973..1c1da2231d5 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 5f5f1edd030..b39816259fb 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
-#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 8d55a775b8a..1efb8c543b3 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 d135d4f73be..732903d1a88 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
-#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 415ba045bdf..1ce4b82808d 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 ca1fcb59aed..f9bd0f2126a 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
-#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 69f2a862967..bbfd4e92cfb 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 16b0181ab80..7d41360753f 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
-#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 a55570df678..cef5cc5f9cb 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 253afc858b6..daf3a8a01bc 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
-#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 e39f8c397c7..9a37aeda5c2 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 e5069b7f13b..38feb7b88d3 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
-#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 e5923cc5e12..dbefd808680 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 24407fa6eac..347fb1e8a97 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
-#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 2dd03ff12d7..431413ccd2a 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 f210e3cb283..f25077ba835 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
-#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 640cdf9f1f9..e121fd88bae 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 6c6da7d75b7..de06e076b7e 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
-#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 2f1ff445416..fa75a11bb32 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 20cc2970982..e4584e44597 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
-#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 983a3455c8f..df01757e814 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 17c3c61cda9..b78d54cf295 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
-#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 0bcd2425962..3fab0c4ff54 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 fa2375e98ee..c3fa6abb15e 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
-#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 ab8e2df41b6..7be74628774 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 2bd099a5e4c..575e5561d40 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
-#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 da7442bd179..797cc45af9b 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 ff645f687ff..f0bf9b36940 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
-#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 3f38cc5139d..06fe8a09460 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 b556c3dea89..5b528ef15ac 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",
],
diff --git a/third_party/upb/.bazelci/presubmit.yml b/third_party/upb/.bazelci/presubmit.yml
index 38ca79304f9..a754f32284e 100644
--- a/third_party/upb/.bazelci/presubmit.yml
+++ b/third_party/upb/.bazelci/presubmit.yml
@@ -1,7 +1,7 @@
---
tasks:
ubuntu:
- platform: ubuntu1604
+ platform: ubuntu1804
test_targets:
- //...
macos:
diff --git a/third_party/upb/.bazelrc b/third_party/upb/.bazelrc
index 7b9da717aa2..bfaa00cca89 100644
--- a/third_party/upb/.bazelrc
+++ b/third_party/upb/.bazelrc
@@ -1,3 +1,6 @@
+# temporary fix for https://github.com/bazelbuild/bazel/issues/12905 on macOS
+build --features=-debug_prefix_map_pwd_is_dot
+
# Use our custom-configured c++ toolchain.
build:m32 --copt=-m32 --linkopt=-m32
@@ -8,6 +11,8 @@ build:ubsan --copt=-fsanitize=undefined --linkopt=-fsanitize=undefined --action_
# Workaround for the fact that Bazel links with $CC, not $CXX
# https://github.com/bazelbuild/bazel/issues/11122#issuecomment-613746748
build:ubsan --copt=-fno-sanitize=function --copt=-fno-sanitize=vptr
+# Workaround for https://bugs.llvm.org/show_bug.cgi?id=16404
+build:ubsan --linkopt=--rtlib=compiler-rt --linkopt=-lunwind
build:Werror --copt=-Werror
build:Werror --per_file_copt=json/parser@-Wno-error
diff --git a/third_party/upb/.github/workflows/cifuzz.yml b/third_party/upb/.github/workflows/cifuzz.yml
new file mode 100644
index 00000000000..092b1079fff
--- /dev/null
+++ b/third_party/upb/.github/workflows/cifuzz.yml
@@ -0,0 +1,29 @@
+name: CIFuzz
+on: [pull_request]
+jobs:
+ Fuzzing:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ sanitizer: [address, undefined]
+ steps:
+ - name: Build Fuzzers (${{ matrix.sanitizer }})
+ uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'upb'
+ dry-run: false
+ sanitizer: ${{ matrix.sanitizer }}
+ - name: Run Fuzzers (${{ matrix.sanitizer }})
+ uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'upb'
+ fuzz-seconds: 600
+ dry-run: false
+ sanitizer: ${{ matrix.sanitizer }}
+ - name: Upload Crash
+ uses: actions/upload-artifact@v1
+ if: failure()
+ with:
+ name: ${{ matrix.sanitizer }}-artifacts
+ path: ./out/artifacts
diff --git a/third_party/upb/BUILD b/third_party/upb/BUILD
index 2e133263a7c..719f2b4fd20 100644
--- a/third_party/upb/BUILD
+++ b/third_party/upb/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_COPTS",
@@ -11,15 +36,7 @@ load(
"upb_proto_reflection_library",
)
-# copybara:strip_for_google3_begin
-load(
- "@rules_proto//proto:defs.bzl",
- "proto_library",
-)
-
-# copybara:strip_end
-
-licenses(["notice"]) # BSD (Google-authored w/ possible external contributions)
+licenses(["notice"])
exports_files([
"LICENSE",
@@ -64,18 +81,19 @@ cc_library(
name = "upb",
srcs = [
"upb/decode.c",
- "upb/decode.int.h",
+ "upb/decode_internal.h",
"upb/encode.c",
"upb/msg.c",
- "upb/msg.h",
+ "upb/msg_internal.h",
"upb/table.c",
- "upb/table.int.h",
+ "upb/table_internal.h",
"upb/upb.c",
- "upb/upb.int.h",
+ "upb/upb_internal.h",
],
hdrs = [
"upb/decode.h",
"upb/encode.h",
+ "upb/msg.h",
"upb/upb.h",
"upb/upb.hpp",
],
@@ -84,18 +102,18 @@ cc_library(
deps = [
":fastdecode",
":port",
- "//third_party/wyhash",
],
)
cc_library(
name = "fastdecode",
srcs = [
- "upb/decode.int.h",
+ "upb/decode_internal.h",
"upb/decode_fast.c",
"upb/decode_fast.h",
"upb/msg.h",
- "upb/upb.int.h",
+ "upb/msg_internal.h",
+ "upb/upb_internal.h",
],
copts = UPB_DEFAULT_COPTS,
deps = [
@@ -115,6 +133,7 @@ cc_library(
hdrs = [
"upb/decode_fast.h",
"upb/msg.h",
+ "upb/msg_internal.h",
"upb/port_def.inc",
"upb/port_undef.inc",
],
@@ -149,6 +168,7 @@ cc_library(
"upb/def.h",
"upb/def.hpp",
"upb/reflection.h",
+ "upb/reflection.hpp",
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
@@ -200,7 +220,7 @@ cc_library(
cc_library(
name = "table",
hdrs = [
- "upb/table.int.h",
+ "upb/table_internal.h",
"upb/upb.h",
],
visibility = ["//tests:__pkg__"],
@@ -209,86 +229,9 @@ cc_library(
],
)
-# Legacy C/C++ Libraries (not recommended for new code) ########################
-
-cc_library(
- name = "handlers",
- srcs = [
- "upb/handlers.c",
- "upb/handlers-inl.h",
- "upb/sink.c",
- ],
- hdrs = [
- "upb/handlers.h",
- "upb/sink.h",
- ],
- copts = UPB_DEFAULT_COPTS,
- visibility = ["//tests:__pkg__"],
- deps = [
- ":port",
- ":reflection",
- ":table",
- ":upb",
- ],
-)
-
-cc_library(
- name = "upb_pb",
- srcs = [
- "upb/pb/compile_decoder.c",
- "upb/pb/decoder.c",
- "upb/pb/decoder.int.h",
- "upb/pb/encoder.c",
- "upb/pb/textprinter.c",
- "upb/pb/varint.c",
- "upb/pb/varint.int.h",
- ],
- hdrs = [
- "upb/pb/decoder.h",
- "upb/pb/encoder.h",
- "upb/pb/textprinter.h",
- ],
- copts = UPB_DEFAULT_COPTS,
- visibility = ["//tests:__pkg__"],
- deps = [
- ":descriptor_upb_proto",
- ":handlers",
- ":port",
- ":reflection",
- ":table",
- ":upb",
- ],
-)
+# Amalgamation #################################################################
# copybara:strip_for_google3_begin
-cc_library(
- name = "upb_json",
- srcs = [
- "upb/json/parser.c",
- "upb/json/printer.c",
- ],
- hdrs = [
- "upb/json/parser.h",
- "upb/json/printer.h",
- ],
- copts = UPB_DEFAULT_COPTS,
- visibility = ["//tests:__pkg__"],
- deps = [
- ":upb",
- ":upb_pb",
- ],
-)
-
-genrule(
- name = "generate_json_ragel",
- srcs = ["//:upb/json/parser.rl"],
- outs = ["upb/json/parser.c"],
- cmd = "$(location @ragel//:ragelc) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@",
- tools = ["@ragel//:ragelc"],
- visibility = ["//cmake:__pkg__"],
-)
-
-# Amalgamation #################################################################
py_binary(
name = "amalgamate",
@@ -307,10 +250,7 @@ upb_amalgamation(
":fastdecode",
":descriptor_upb_proto",
":reflection",
- ":handlers",
":port",
- ":upb_pb",
- ":upb_json",
],
)
@@ -319,7 +259,6 @@ cc_library(
srcs = ["upb.c"],
hdrs = ["upb.h"],
copts = UPB_DEFAULT_COPTS,
- deps = ["//third_party/wyhash"],
)
upb_amalgamation(
@@ -346,7 +285,6 @@ cc_library(
srcs = ["php-upb.c"],
hdrs = ["php-upb.h"],
copts = UPB_DEFAULT_COPTS,
- deps = ["//third_party/wyhash"],
)
upb_amalgamation(
@@ -372,7 +310,6 @@ cc_library(
srcs = ["ruby-upb.c"],
hdrs = ["ruby-upb.h"],
copts = UPB_DEFAULT_COPTS,
- deps = ["//third_party/wyhash"],
)
exports_files(
@@ -395,9 +332,6 @@ exports_files(
filegroup(
name = "cmake_files",
srcs = glob([
- "upb/json/parser.c",
- "CMakeLists.txt",
- "generated_for_cmake/**/*",
"google/**/*",
"upbc/**/*",
"upb/**/*",
diff --git a/third_party/upb/LICENSE b/third_party/upb/LICENSE
index da939845db6..7f3bd16837e 100644
--- a/third_party/upb/LICENSE
+++ b/third_party/upb/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2009-2011, Google Inc.
+Copyright (c) 2009-2021, Google LLC
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -10,14 +10,14 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- * Neither the name of Google Inc. nor the names of any other
+ * Neither the name of Google LLC nor the names of any other
contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL GOOGLE INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+EVENT SHALL GOOGLE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
diff --git a/third_party/upb/README.md b/third_party/upb/README.md
index a08aa0e9092..91147eaf094 100644
--- a/third_party/upb/README.md
+++ b/third_party/upb/README.md
@@ -111,16 +111,6 @@ Then in your `.c` file you can #include the generated header:
/* Insert code that uses generated types. */
```
-## Old "handlers" interfaces
-
-This library contains several semi-deprecated interfaces (see BUILD
-file for more info about which interfaces are deprecated). These
-deprecated interfaces are still used in some significant projects,
-such as the Ruby and PHP C bindings for protobuf in the [main protobuf
-repo](https://github.com/protocolbuffers/protobuf). The goal is to
-migrate the Ruby/PHP bindings to use the newer, simpler interfaces
-instead. Please do not use the old interfaces in new code.
-
## Lua bindings
This repo has some Lua bindings for the core library. These are
diff --git a/third_party/upb/WORKSPACE b/third_party/upb/WORKSPACE
index 870ebf7467f..eb3c0ccacb0 100644
--- a/third_party/upb/WORKSPACE
+++ b/third_party/upb/WORKSPACE
@@ -18,18 +18,10 @@ http_archive(
)
http_archive(
- name = "ragel",
- build_file = "//bazel:ragel.BUILD",
- sha256 = "5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f",
- strip_prefix = "ragel-6.10",
- urls = ["http://www.colm.net/files/ragel/ragel-6.10.tar.gz"],
-)
-
-http_archive(
- name = "com_google_googletest",
- sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86",
- strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb",
- urls = ["https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"], # 2019-01-07
+ name = "com_google_googletest",
+ urls = ["https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"], # 2019-01-07
+ strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb",
+ sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86",
)
http_archive(
diff --git a/third_party/upb/bazel/BUILD b/third_party/upb/bazel/BUILD
index e69de29bb2d..371dd229293 100644
--- a/third_party/upb/bazel/BUILD
+++ b/third_party/upb/bazel/BUILD
@@ -0,0 +1,24 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/upb/bazel/build_defs.bzl b/third_party/upb/bazel/build_defs.bzl
index ae41577ed99..acd474d3bb1 100644
--- a/third_party/upb/bazel/build_defs.bzl
+++ b/third_party/upb/bazel/build_defs.bzl
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
"""Internal rules for building upb."""
load(":upb_proto_library.bzl", "GeneratedSrcsInfo")
diff --git a/third_party/upb/bazel/lua.BUILD b/third_party/upb/bazel/lua.BUILD
index 113c71f9ae8..11755a4f734 100644
--- a/third_party/upb/bazel/lua.BUILD
+++ b/third_party/upb/bazel/lua.BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
package(
default_visibility = ["//visibility:public"],
)
diff --git a/third_party/upb/bazel/ragel.BUILD b/third_party/upb/bazel/ragel.BUILD
deleted file mode 100644
index 5916bea1985..00000000000
--- a/third_party/upb/bazel/ragel.BUILD
+++ /dev/null
@@ -1,195 +0,0 @@
-package(
- default_visibility = ["//visibility:public"],
-)
-
-cc_binary(
- name = "ragelc",
- srcs = [
- "ragel/rubycodegen.cpp",
- "ragel/goipgoto.h",
- "ragel/cdtable.h",
- "ragel/rubycodegen.h",
- "ragel/gotable.h",
- "ragel/gocodegen.cpp",
- "ragel/rubyfflat.cpp",
- "ragel/common.cpp",
- "ragel/gofflat.cpp",
- "ragel/cdtable.cpp",
- "ragel/cdsplit.cpp",
- "ragel/rlparse.cpp",
- "ragel/csfgoto.cpp",
- "ragel/javacodegen.cpp",
- "ragel/gocodegen.h",
- "ragel/mlgoto.cpp",
- "ragel/fsmgraph.cpp",
- "ragel/version.h",
- "ragel/mlfflat.h",
- "ragel/fsmgraph.h",
- "ragel/fsmbase.cpp",
- "ragel/fsmstate.cpp",
- "ragel/gotablish.cpp",
- "ragel/rubyflat.cpp",
- "ragel/cdfgoto.h",
- "ragel/cscodegen.h",
- "ragel/mlflat.cpp",
- "ragel/rubyflat.h",
- "ragel/goftable.h",
- "ragel/rbxgoto.cpp",
- "ragel/csfflat.cpp",
- "ragel/gofgoto.cpp",
- "ragel/gofgoto.h",
- "ragel/ragel.h",
- "ragel/goftable.cpp",
- "ragel/cdcodegen.cpp",
- "ragel/rlparse.h",
- "ragel/cdsplit.h",
- "ragel/xmlcodegen.cpp",
- "ragel/goipgoto.cpp",
- "ragel/dotcodegen.h",
- "ragel/gogoto.cpp",
- "ragel/csflat.h",
- "ragel/csfflat.h",
- #"ragel/config.h.in",
- "ragel/csipgoto.cpp",
- "ragel/mltable.cpp",
- "ragel/mlflat.h",
- "ragel/csftable.cpp",
- "ragel/cdgoto.h",
- "ragel/goflat.cpp",
- "ragel/rubyfflat.h",
- "ragel/mlftable.h",
- "ragel/rubyftable.h",
- "ragel/fsmap.cpp",
- "ragel/redfsm.cpp",
- "ragel/goflat.h",
- "ragel/parsetree.cpp",
- "ragel/fsmmin.cpp",
- "ragel/dotcodegen.cpp",
- "ragel/redfsm.h",
- "ragel/mlcodegen.cpp",
- "ragel/cdfgoto.cpp",
- "ragel/cssplit.cpp",
- "ragel/cstable.cpp",
- "ragel/javacodegen.h",
- "ragel/parsedata.cpp",
- "ragel/buffer.h",
- "ragel/gogoto.h",
- "ragel/csgoto.h",
- "ragel/pcheck.h",
- "ragel/rubyftable.cpp",
- "ragel/csfgoto.h",
- "ragel/common.h",
- "ragel/cdftable.h",
- "ragel/mlgoto.h",
- "ragel/csgoto.cpp",
- "ragel/cdflat.h",
- "ragel/cdipgoto.h",
- "ragel/cstable.h",
- "ragel/gendata.h",
- "ragel/cdfflat.cpp",
- "ragel/gotable.cpp",
- "ragel/cdcodegen.h",
- "ragel/gendata.cpp",
- "ragel/rubytable.h",
- "ragel/csflat.cpp",
- "ragel/inputdata.h",
- "ragel/inputdata.cpp",
- "ragel/rubytable.cpp",
- "ragel/fsmattach.cpp",
- "ragel/csipgoto.h",
- "ragel/cscodegen.cpp",
- "ragel/cdfflat.h",
- "ragel/rbxgoto.h",
- "ragel/xmlcodegen.h",
- "ragel/gofflat.h",
- "ragel/parsedata.h",
- "ragel/mlfgoto.h",
- "ragel/cdflat.cpp",
- "ragel/config.h",
- "ragel/rlscan.cpp",
- "ragel/mlcodegen.h",
- "ragel/mlfflat.cpp",
- "ragel/mlftable.cpp",
- "ragel/mltable.h",
- "ragel/cdipgoto.cpp",
- "ragel/cdftable.cpp",
- "ragel/parsetree.h",
- "ragel/rlscan.h",
- "ragel/main.cpp",
- "ragel/cssplit.h",
- "ragel/mlfgoto.cpp",
- "ragel/csftable.h",
- "ragel/gotablish.h",
- "ragel/cdgoto.cpp",
- "aapl/avlmelkey.h",
- "aapl/dlistmel.h",
- "aapl/avliset.h",
- "aapl/avlkeyless.h",
- "aapl/sbstset.h",
- "aapl/sbsttable.h",
- "aapl/quicksort.h",
- "aapl/avlitree.h",
- "aapl/avlcommon.h",
- "aapl/bstset.h",
- "aapl/avlmel.h",
- "aapl/insertsort.h",
- "aapl/dlist.h",
- "aapl/avlmap.h",
- "aapl/mergesort.h",
- "aapl/resize.h",
- "aapl/bstcommon.h",
- "aapl/bstmap.h",
- "aapl/compare.h",
- "aapl/svector.h",
- "aapl/avlset.h",
- "aapl/bsttable.h",
- "aapl/avlikeyless.h",
- "aapl/bubblesort.h",
- "aapl/table.h",
- "aapl/avlbasic.h",
- "aapl/vector.h",
- "aapl/avlimap.h",
- "aapl/dlistval.h",
- "aapl/dlcommon.h",
- "aapl/avlibasic.h",
- "aapl/sbstmap.h",
- "aapl/avlimel.h",
- "aapl/avlimelkey.h",
- "aapl/avltree.h",
- ],
- includes = [
- "aapl",
- "ragel",
- ],
-)
-
-config_h_contents = """
-#define PACKAGE "ragel"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "ragel"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ragel 6.10"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "ragel"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "6.10"
-
-/* Version number of package */
-#define VERSION "6.10"
-"""
-
-genrule(
- name = "gen_config_h",
- outs = ["ragel/config.h"],
- cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % config_h_contents,
-)
diff --git a/third_party/upb/bazel/upb_proto_library.bzl b/third_party/upb/bazel/upb_proto_library.bzl
index 155d18d98c4..cc02a9aa43a 100644
--- a/third_party/upb/bazel/upb_proto_library.bzl
+++ b/third_party/upb/bazel/upb_proto_library.bzl
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
"""Public rules for using upb protos:
- upb_proto_library()
- upb_proto_reflection_library()
@@ -323,6 +348,7 @@ _upb_proto_reflection_library_aspect = aspect(
),
"_upbdefs": attr.label_list(
default = [
+ "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
"//:upb",
"//:reflection",
],
diff --git a/third_party/upb/bazel/workspace_deps.bzl b/third_party/upb/bazel/workspace_deps.bzl
index c724d7c2c20..d9b799c50a7 100644
--- a/third_party/upb/bazel/workspace_deps.bzl
+++ b/third_party/upb/bazel/workspace_deps.bzl
@@ -6,16 +6,20 @@ def upb_deps():
maybe(
git_repository,
name = "com_google_absl",
- commit = "df3ea785d8c30a9503321a3d35ee7d35808f190d", # LTS 2020-02-25
+ commit = "998805a4c79d5d7a771f7e5a8ee3cbbbcba04f94",
remote = "https://github.com/abseil/abseil-cpp.git",
shallow_since = "1583355457 -0500",
)
maybe(
- git_repository,
+ http_archive,
name = "com_google_protobuf",
- remote = "https://github.com/protocolbuffers/protobuf.git",
- commit = "c8f76331abf682c289fa79f05b2ee39cc7bf5a48", # Need to use Git until proto3 optional is released
+ sha256 = "b10bf4e2d1a7586f54e64a5d9e7837e5188fc75ae69e36f215eb01def4f9721b",
+ strip_prefix = "protobuf-3.15.3",
+ urls = [
+ "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz",
+ ],
)
maybe(
@@ -32,8 +36,8 @@ def upb_deps():
maybe(
http_archive,
name = "bazel_skylib",
- strip_prefix = "bazel-skylib-master",
- urls = ["https://github.com/bazelbuild/bazel-skylib/archive/master.tar.gz"],
+ strip_prefix = "bazel-skylib-main",
+ urls = ["https://github.com/bazelbuild/bazel-skylib/archive/main.tar.gz"],
)
maybe(
diff --git a/third_party/upb/benchmarks/BUILD b/third_party/upb/benchmarks/BUILD
index 2ab830f7fcb..19966f8676a 100644
--- a/third_party/upb/benchmarks/BUILD
+++ b/third_party/upb/benchmarks/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
"//bazel:upb_proto_library.bzl",
"upb_proto_library",
diff --git a/third_party/upb/benchmarks/BUILD.googleapis b/third_party/upb/benchmarks/BUILD.googleapis
index 904bdeca6f6..a8f31b2a608 100644
--- a/third_party/upb/benchmarks/BUILD.googleapis
+++ b/third_party/upb/benchmarks/BUILD.googleapis
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
"@rules_proto//proto:defs.bzl",
"proto_library",
@@ -6,7 +31,7 @@ load(
proto_library(
name = "ads_proto",
srcs = glob([
- "google/ads/googleads/v5/**/*.proto",
+ "google/ads/googleads/v7/**/*.proto",
"google/api/**/*.proto",
"google/rpc/**/*.proto",
"google/longrunning/**/*.proto",
diff --git a/third_party/upb/benchmarks/benchmark.cc b/third_party/upb/benchmarks/benchmark.cc
index 7f4765a88c2..60e3b530d63 100644
--- a/third_party/upb/benchmarks/benchmark.cc
+++ b/third_party/upb/benchmarks/benchmark.cc
@@ -1,3 +1,27 @@
+// Copyright (c) 2009-2021, Google LLC
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Google LLC nor the
+// names of its contributors may be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include
#include
@@ -7,7 +31,7 @@
#include "benchmarks/descriptor.upb.h"
#include "benchmarks/descriptor.upbdefs.h"
#include "benchmarks/descriptor_sv.pb.h"
-#include "google/ads/googleads/v5/services/google_ads_service.upbdefs.h"
+#include "google/ads/googleads/v7/services/google_ads_service.upbdefs.h"
#include "google/protobuf/descriptor.pb.h"
#include "upb/def.hpp"
@@ -60,7 +84,7 @@ static void BM_LoadAdsDescriptor_Upb(benchmark::State& state) {
size_t bytes_per_iter = 0;
for (auto _ : state) {
upb::SymbolTable symtab;
- google_ads_googleads_v5_services_SearchGoogleAdsRequest_getmsgdef(
+ google_ads_googleads_v7_services_SearchGoogleAdsRequest_getmsgdef(
symtab.ptr());
bytes_per_iter = _upb_symtab_bytesloaded(symtab.ptr());
}
@@ -87,11 +111,11 @@ static void BM_LoadDescriptor_Proto2(benchmark::State& state) {
BENCHMARK(BM_LoadDescriptor_Proto2);
static void BM_LoadAdsDescriptor_Proto2(benchmark::State& state) {
- extern upb_def_init google_ads_googleads_v5_services_google_ads_service_proto_upbdefinit;
+ extern upb_def_init google_ads_googleads_v7_services_google_ads_service_proto_upbdefinit;
std::vector serialized_files;
absl::flat_hash_set seen_files;
CollectFileDescriptors(
- &google_ads_googleads_v5_services_google_ads_service_proto_upbdefinit,
+ &google_ads_googleads_v7_services_google_ads_service_proto_upbdefinit,
serialized_files, seen_files);
size_t bytes_per_iter = 0;
for (auto _ : state) {
@@ -138,8 +162,8 @@ static void BM_Parse_Upb_FileDesc(benchmark::State& state) {
}
upb_benchmark_FileDescriptorProto* set =
upb_benchmark_FileDescriptorProto_parse_ex(
- descriptor.data, descriptor.size, arena,
- Copy == Alias ? UPB_DECODE_ALIAS : 0);
+ descriptor.data, descriptor.size, NULL,
+ Copy == Alias ? UPB_DECODE_ALIAS : 0, arena);
if (!set) {
printf("Failed to parse.\n");
exit(1);
diff --git a/third_party/upb/benchmarks/build_defs.bzl b/third_party/upb/benchmarks/build_defs.bzl
index ff534fb926c..f95a09ed1b2 100644
--- a/third_party/upb/benchmarks/build_defs.bzl
+++ b/third_party/upb/benchmarks/build_defs.bzl
@@ -1,3 +1,27 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# copybara:insert_for_google3_begin
# load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", _cc_proto_library="cc_proto_library")
diff --git a/third_party/upb/benchmarks/compare.py b/third_party/upb/benchmarks/compare.py
index 8d62d942725..38272215f98 100755
--- a/third_party/upb/benchmarks/compare.py
+++ b/third_party/upb/benchmarks/compare.py
@@ -1,4 +1,30 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
"""Benchmarks the current working directory against a given baseline.
This script benchmarks both size and speed. Sample output:
@@ -58,7 +84,7 @@ def Benchmark(outbase, bench_cpu=True, runs=12, fasttable=False):
baseline = "master"
-bench_cpu = False
+bench_cpu = True
fasttable = False
if len(sys.argv) > 1:
diff --git a/third_party/upb/benchmarks/gen_protobuf_binary_cc.py b/third_party/upb/benchmarks/gen_protobuf_binary_cc.py
index 787e391547a..66c2df603d0 100644
--- a/third_party/upb/benchmarks/gen_protobuf_binary_cc.py
+++ b/third_party/upb/benchmarks/gen_protobuf_binary_cc.py
@@ -1,3 +1,29 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import sys
import re
diff --git a/third_party/upb/benchmarks/gen_synthetic_protos.py b/third_party/upb/benchmarks/gen_synthetic_protos.py
index a95deff0802..54003d2b2d5 100644
--- a/third_party/upb/benchmarks/gen_synthetic_protos.py
+++ b/third_party/upb/benchmarks/gen_synthetic_protos.py
@@ -1,3 +1,29 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import sys
import random
diff --git a/third_party/upb/benchmarks/gen_upb_binary_c.py b/third_party/upb/benchmarks/gen_upb_binary_c.py
index 4df8fd73277..d5c0d1db858 100644
--- a/third_party/upb/benchmarks/gen_upb_binary_c.py
+++ b/third_party/upb/benchmarks/gen_upb_binary_c.py
@@ -1,3 +1,29 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import sys
import re
diff --git a/third_party/upb/cmake/BUILD b/third_party/upb/cmake/BUILD
index 53fbd07abe9..cc825c441bf 100644
--- a/third_party/upb/cmake/BUILD
+++ b/third_party/upb/cmake/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
":build_defs.bzl",
"generated_file_staleness_test",
@@ -28,7 +53,6 @@ genrule(
"//:BUILD",
"//:WORKSPACE",
"//:cmake_files",
- "//third_party/wyhash:cmake_files",
":cmake_files",
],
outs = ["generated-in/CMakeLists.txt"],
@@ -36,13 +60,6 @@ genrule(
tools = [":make_cmakelists"],
)
-genrule(
- name = "copy_json_ragel",
- srcs = ["//:upb/json/parser.c"],
- outs = ["generated-in/upb/json/parser.c"],
- cmd = "cp $< $@",
-)
-
genrule(
name = "copy_protos",
srcs = ["//:descriptor_upb_proto"],
@@ -59,7 +76,6 @@ generated_file_staleness_test(
"CMakeLists.txt",
"google/protobuf/descriptor.upb.c",
"google/protobuf/descriptor.upb.h",
- "upb/json/parser.c",
],
generated_pattern = "generated-in/%s",
)
@@ -85,7 +101,6 @@ sh_test(
data = [
":cmake_files",
"//:cmake_files",
- "//third_party/wyhash:cmake_files",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
)
diff --git a/third_party/upb/cmake/CMakeLists.txt b/third_party/upb/cmake/CMakeLists.txt
index d4cbcc91fc6..879fdb6e4b6 100644
--- a/third_party/upb/cmake/CMakeLists.txt
+++ b/third_party/upb/cmake/CMakeLists.txt
@@ -64,28 +64,29 @@ enable_testing()
add_library(port INTERFACE)
add_library(upb
../upb/decode.c
- ../upb/decode.int.h
+ ../upb/decode_internal.h
../upb/encode.c
../upb/msg.c
- ../upb/msg.h
+ ../upb/msg_internal.h
../upb/table.c
- ../upb/table.int.h
+ ../upb/table_internal.h
../upb/upb.c
- ../upb/upb.int.h
+ ../upb/upb_internal.h
../upb/decode.h
../upb/encode.h
+ ../upb/msg.h
../upb/upb.h
../upb/upb.hpp)
target_link_libraries(upb
fastdecode
- port
- /third_party/wyhash)
+ port)
add_library(fastdecode
- ../upb/decode.int.h
+ ../upb/decode_internal.h
../upb/decode_fast.c
../upb/decode_fast.h
../upb/msg.h
- ../upb/upb.int.h)
+ ../upb/msg_internal.h
+ ../upb/upb_internal.h)
target_link_libraries(fastdecode
port
table)
@@ -99,7 +100,8 @@ add_library(reflection
../upb/reflection.c
../upb/def.h
../upb/def.hpp
- ../upb/reflection.h)
+ ../upb/reflection.h
+ ../upb/reflection.hpp)
target_link_libraries(reflection
descriptor_upb_proto
port
@@ -123,43 +125,5 @@ target_link_libraries(json
add_library(table INTERFACE)
target_link_libraries(table INTERFACE
port)
-add_library(handlers
- ../upb/handlers.c
- ../upb/handlers-inl.h
- ../upb/sink.c
- ../upb/handlers.h
- ../upb/sink.h)
-target_link_libraries(handlers
- port
- reflection
- table
- upb)
-add_library(upb_pb
- ../upb/pb/compile_decoder.c
- ../upb/pb/decoder.c
- ../upb/pb/decoder.int.h
- ../upb/pb/encoder.c
- ../upb/pb/textprinter.c
- ../upb/pb/varint.c
- ../upb/pb/varint.int.h
- ../upb/pb/decoder.h
- ../upb/pb/encoder.h
- ../upb/pb/textprinter.h)
-target_link_libraries(upb_pb
- descriptor_upb_proto
- handlers
- port
- reflection
- table
- upb)
-add_library(upb_json
- ../cmake/upb/json/parser.c
- ../upb/json/printer.c
- ../upb/json/parser.h
- ../upb/json/printer.h)
-target_link_libraries(upb_json
- upb
- upb_pb)
-add_library(wyhash INTERFACE)
diff --git a/third_party/upb/cmake/build_defs.bzl b/third_party/upb/cmake/build_defs.bzl
index 34b4537558a..4a6264b74c2 100644
--- a/third_party/upb/cmake/build_defs.bzl
+++ b/third_party/upb/cmake/build_defs.bzl
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
def generated_file_staleness_test(name, outs, generated_pattern):
"""Tests that checked-in file(s) match the contents of generated file(s).
diff --git a/third_party/upb/cmake/google/protobuf/descriptor.upb.c b/third_party/upb/cmake/google/protobuf/descriptor.upb.c
index 339fafac090..a6b9af91322 100644
--- a/third_party/upb/cmake/google/protobuf/descriptor.upb.c
+++ b/third_party/upb/cmake/google/protobuf/descriptor.upb.c
@@ -7,7 +7,7 @@
* regenerated. */
#include
-#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/third_party/upb/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/cmake/google/protobuf/descriptor.upb.h
index a8ed71a688c..4767b3af688 100644
--- a/third_party/upb/cmake/google/protobuf/descriptor.upb.h
+++ b/third_party/upb/cmake/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/third_party/upb/cmake/make_cmakelists.py b/third_party/upb/cmake/make_cmakelists.py
index 035debb730c..415f937c733 100755
--- a/third_party/upb/cmake/make_cmakelists.py
+++ b/third_party/upb/cmake/make_cmakelists.py
@@ -1,4 +1,29 @@
-#!/usr/bin/env python
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""TODO(haberman): DO NOT SUBMIT without one-line documentation for make_cmakelists.
@@ -283,7 +308,6 @@ globs = GetDict(converter)
exec(open("WORKSPACE").read(), GetDict(WorkspaceFileFunctions(converter)))
exec(open("BUILD").read(), GetDict(BuildFileFunctions(converter)))
-exec(open("third_party/wyhash/BUILD").read(), GetDict(BuildFileFunctions(converter)))
with open(sys.argv[1], "w") as f:
f.write(converter.convert())
diff --git a/third_party/upb/cmake/staleness_test.py b/third_party/upb/cmake/staleness_test.py
index 585730715ed..58f1833c908 100644
--- a/third_party/upb/cmake/staleness_test.py
+++ b/third_party/upb/cmake/staleness_test.py
@@ -1,3 +1,30 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
"""The py_test() script for generated_file_staleness_test() rules.
Note that this file is preprocessed! The INSERT_<...> text below is replaced
diff --git a/third_party/upb/cmake/staleness_test_lib.py b/third_party/upb/cmake/staleness_test_lib.py
index cdfcc0d17a5..0748969c342 100644
--- a/third_party/upb/cmake/staleness_test_lib.py
+++ b/third_party/upb/cmake/staleness_test_lib.py
@@ -1,3 +1,30 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
"""Shared code for validating generated_file_staleness_test() rules.
This code is used by test scripts generated from
diff --git a/third_party/upb/cmake/upb/json/parser.c b/third_party/upb/cmake/upb/json/parser.c
deleted file mode 100644
index 26996d8a59d..00000000000
--- a/third_party/upb/cmake/upb/json/parser.c
+++ /dev/null
@@ -1,3433 +0,0 @@
-
-#line 1 "upb/json/parser.rl"
-/*
-** upb::json::Parser (upb_json_parser)
-**
-** A parser that uses the Ragel State Machine Compiler to generate
-** the finite automata.
-**
-** Ragel only natively handles regular languages, but we can manually
-** program it a bit to handle context-free languages like JSON, by using
-** the "fcall" and "fret" constructs.
-**
-** This parser can handle the basics, but needs several things to be fleshed
-** out:
-**
-** - handling of unicode escape sequences (including high surrogate pairs).
-** - properly check and report errors for unknown fields, stack overflow,
-** improper array nesting (or lack of nesting).
-** - handling of base64 sequences with padding characters.
-** - handling of push-back (non-success returns from sink functions).
-** - handling of keys/escape-sequences/etc that span input buffers.
-*/
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "upb/json/parser.h"
-#include "upb/pb/encoder.h"
-
-#include "upb/port_def.inc"
-
-#define UPB_JSON_MAX_DEPTH 64
-
-/* Type of value message */
-enum {
- VALUE_NULLVALUE = 0,
- VALUE_NUMBERVALUE = 1,
- VALUE_STRINGVALUE = 2,
- VALUE_BOOLVALUE = 3,
- VALUE_STRUCTVALUE = 4,
- VALUE_LISTVALUE = 5
-};
-
-/* Forward declare */
-static bool is_top_level(upb_json_parser *p);
-static bool is_wellknown_msg(upb_json_parser *p, upb_wellknowntype_t type);
-static bool is_wellknown_field(upb_json_parser *p, upb_wellknowntype_t type);
-
-static bool is_number_wrapper_object(upb_json_parser *p);
-static bool does_number_wrapper_start(upb_json_parser *p);
-static bool does_number_wrapper_end(upb_json_parser *p);
-
-static bool is_string_wrapper_object(upb_json_parser *p);
-static bool does_string_wrapper_start(upb_json_parser *p);
-static bool does_string_wrapper_end(upb_json_parser *p);
-
-static bool does_fieldmask_start(upb_json_parser *p);
-static bool does_fieldmask_end(upb_json_parser *p);
-static void start_fieldmask_object(upb_json_parser *p);
-static void end_fieldmask_object(upb_json_parser *p);
-
-static void start_wrapper_object(upb_json_parser *p);
-static void end_wrapper_object(upb_json_parser *p);
-
-static void start_value_object(upb_json_parser *p, int value_type);
-static void end_value_object(upb_json_parser *p);
-
-static void start_listvalue_object(upb_json_parser *p);
-static void end_listvalue_object(upb_json_parser *p);
-
-static void start_structvalue_object(upb_json_parser *p);
-static void end_structvalue_object(upb_json_parser *p);
-
-static void start_object(upb_json_parser *p);
-static void end_object(upb_json_parser *p);
-
-static void start_any_object(upb_json_parser *p, const char *ptr);
-static bool end_any_object(upb_json_parser *p, const char *ptr);
-
-static bool start_subobject(upb_json_parser *p);
-static void end_subobject(upb_json_parser *p);
-
-static void start_member(upb_json_parser *p);
-static void end_member(upb_json_parser *p);
-static bool end_membername(upb_json_parser *p);
-
-static void start_any_member(upb_json_parser *p, const char *ptr);
-static void end_any_member(upb_json_parser *p, const char *ptr);
-static bool end_any_membername(upb_json_parser *p);
-
-size_t parse(void *closure, const void *hd, const char *buf, size_t size,
- const upb_bufhandle *handle);
-static bool end(void *closure, const void *hd);
-
-static const char eof_ch = 'e';
-
-/* stringsink */
-typedef struct {
- upb_byteshandler handler;
- upb_bytessink sink;
- char *ptr;
- size_t len, size;
-} upb_stringsink;
-
-
-static void *stringsink_start(void *_sink, const void *hd, size_t size_hint) {
- upb_stringsink *sink = _sink;
- sink->len = 0;
- UPB_UNUSED(hd);
- UPB_UNUSED(size_hint);
- return sink;
-}
-
-static size_t stringsink_string(void *_sink, const void *hd, const char *ptr,
- size_t len, const upb_bufhandle *handle) {
- upb_stringsink *sink = _sink;
- size_t new_size = sink->size;
-
- UPB_UNUSED(hd);
- UPB_UNUSED(handle);
-
- while (sink->len + len > new_size) {
- new_size *= 2;
- }
-
- if (new_size != sink->size) {
- sink->ptr = realloc(sink->ptr, new_size);
- sink->size = new_size;
- }
-
- memcpy(sink->ptr + sink->len, ptr, len);
- sink->len += len;
-
- return len;
-}
-
-void upb_stringsink_init(upb_stringsink *sink) {
- upb_byteshandler_init(&sink->handler);
- upb_byteshandler_setstartstr(&sink->handler, stringsink_start, NULL);
- upb_byteshandler_setstring(&sink->handler, stringsink_string, NULL);
-
- upb_bytessink_reset(&sink->sink, &sink->handler, sink);
-
- sink->size = 32;
- sink->ptr = malloc(sink->size);
- sink->len = 0;
-}
-
-void upb_stringsink_uninit(upb_stringsink *sink) { free(sink->ptr); }
-
-typedef struct {
- /* For encoding Any value field in binary format. */
- upb_handlercache *encoder_handlercache;
- upb_stringsink stringsink;
-
- /* For decoding Any value field in json format. */
- upb_json_codecache *parser_codecache;
- upb_sink sink;
- upb_json_parser *parser;
-
- /* Mark the range of uninterpreted values in json input before type url. */
- const char *before_type_url_start;
- const char *before_type_url_end;
-
- /* Mark the range of uninterpreted values in json input after type url. */
- const char *after_type_url_start;
-} upb_jsonparser_any_frame;
-
-typedef struct {
- upb_sink sink;
-
- /* The current message in which we're parsing, and the field whose value we're
- * expecting next. */
- const upb_msgdef *m;
- const upb_fielddef *f;
-
- /* The table mapping json name to fielddef for this message. */
- const upb_strtable *name_table;
-
- /* We are in a repeated-field context. We need this flag to decide whether to
- * handle the array as a normal repeated field or a
- * google.protobuf.ListValue/google.protobuf.Value. */
- bool is_repeated;
-
- /* We are in a repeated-field context, ready to emit mapentries as
- * submessages. This flag alters the start-of-object (open-brace) behavior to
- * begin a sequence of mapentry messages rather than a single submessage. */
- bool is_map;
-
- /* We are in a map-entry message context. This flag is set when parsing the
- * value field of a single map entry and indicates to all value-field parsers
- * (subobjects, strings, numbers, and bools) that the map-entry submessage
- * should end as soon as the value is parsed. */
- bool is_mapentry;
-
- /* If |is_map| or |is_mapentry| is true, |mapfield| refers to the parent
- * message's map field that we're currently parsing. This differs from |f|
- * because |f| is the field in the *current* message (i.e., the map-entry
- * message itself), not the parent's field that leads to this map. */
- const upb_fielddef *mapfield;
-
- /* We are in an Any message context. This flag is set when parsing the Any
- * message and indicates to all field parsers (subobjects, strings, numbers,
- * and bools) that the parsed field should be serialized as binary data or
- * cached (type url not found yet). */
- bool is_any;
-
- /* The type of packed message in Any. */
- upb_jsonparser_any_frame *any_frame;
-
- /* True if the field to be parsed is unknown. */
- bool is_unknown_field;
-} upb_jsonparser_frame;
-
-static void init_frame(upb_jsonparser_frame* frame) {
- frame->m = NULL;
- frame->f = NULL;
- frame->name_table = NULL;
- frame->is_repeated = false;
- frame->is_map = false;
- frame->is_mapentry = false;
- frame->mapfield = NULL;
- frame->is_any = false;
- frame->any_frame = NULL;
- frame->is_unknown_field = false;
-}
-
-struct upb_json_parser {
- upb_arena *arena;
- const upb_json_parsermethod *method;
- upb_bytessink input_;
-
- /* Stack to track the JSON scopes we are in. */
- upb_jsonparser_frame stack[UPB_JSON_MAX_DEPTH];
- upb_jsonparser_frame *top;
- upb_jsonparser_frame *limit;
-
- upb_status *status;
-
- /* Ragel's internal parsing stack for the parsing state machine. */
- int current_state;
- int parser_stack[UPB_JSON_MAX_DEPTH];
- int parser_top;
-
- /* The handle for the current buffer. */
- const upb_bufhandle *handle;
-
- /* Accumulate buffer. See details in parser.rl. */
- const char *accumulated;
- size_t accumulated_len;
- char *accumulate_buf;
- size_t accumulate_buf_size;
-
- /* Multi-part text data. See details in parser.rl. */
- int multipart_state;
- upb_selector_t string_selector;
-
- /* Input capture. See details in parser.rl. */
- const char *capture;
-
- /* Intermediate result of parsing a unicode escape sequence. */
- uint32_t digit;
-
- /* For resolve type url in Any. */
- const upb_symtab *symtab;
-
- /* Whether to proceed if unknown field is met. */
- bool ignore_json_unknown;
-
- /* Cache for parsing timestamp due to base and zone are handled in different
- * handlers. */
- struct tm tm;
-};
-
-static upb_jsonparser_frame* start_jsonparser_frame(upb_json_parser *p) {
- upb_jsonparser_frame *inner;
- inner = p->top + 1;
- init_frame(inner);
- return inner;
-}
-
-struct upb_json_codecache {
- upb_arena *arena;
- upb_inttable methods; /* upb_msgdef* -> upb_json_parsermethod* */
-};
-
-struct upb_json_parsermethod {
- const upb_json_codecache *cache;
- upb_byteshandler input_handler_;
-
- /* Maps json_name -> fielddef */
- upb_strtable name_table;
-};
-
-#define PARSER_CHECK_RETURN(x) if (!(x)) return false
-
-static upb_jsonparser_any_frame *json_parser_any_frame_new(
- upb_json_parser *p) {
- upb_jsonparser_any_frame *frame;
-
- frame = upb_arena_malloc(p->arena, sizeof(upb_jsonparser_any_frame));
-
- frame->encoder_handlercache = upb_pb_encoder_newcache();
- frame->parser_codecache = upb_json_codecache_new();
- frame->parser = NULL;
- frame->before_type_url_start = NULL;
- frame->before_type_url_end = NULL;
- frame->after_type_url_start = NULL;
-
- upb_stringsink_init(&frame->stringsink);
-
- return frame;
-}
-
-static void json_parser_any_frame_set_payload_type(
- upb_json_parser *p,
- upb_jsonparser_any_frame *frame,
- const upb_msgdef *payload_type) {
- const upb_handlers *h;
- const upb_json_parsermethod *parser_method;
- upb_pb_encoder *encoder;
-
- /* Initialize encoder. */
- h = upb_handlercache_get(frame->encoder_handlercache, payload_type);
- encoder = upb_pb_encoder_create(p->arena, h, frame->stringsink.sink);
-
- /* Initialize parser. */
- parser_method = upb_json_codecache_get(frame->parser_codecache, payload_type);
- upb_sink_reset(&frame->sink, h, encoder);
- frame->parser =
- upb_json_parser_create(p->arena, parser_method, p->symtab, frame->sink,
- p->status, p->ignore_json_unknown);
-}
-
-static void json_parser_any_frame_free(upb_jsonparser_any_frame *frame) {
- upb_handlercache_free(frame->encoder_handlercache);
- upb_json_codecache_free(frame->parser_codecache);
- upb_stringsink_uninit(&frame->stringsink);
-}
-
-static bool json_parser_any_frame_has_type_url(
- upb_jsonparser_any_frame *frame) {
- return frame->parser != NULL;
-}
-
-static bool json_parser_any_frame_has_value_before_type_url(
- upb_jsonparser_any_frame *frame) {
- return frame->before_type_url_start != frame->before_type_url_end;
-}
-
-static bool json_parser_any_frame_has_value_after_type_url(
- upb_jsonparser_any_frame *frame) {
- return frame->after_type_url_start != NULL;
-}
-
-static bool json_parser_any_frame_has_value(
- upb_jsonparser_any_frame *frame) {
- return json_parser_any_frame_has_value_before_type_url(frame) ||
- json_parser_any_frame_has_value_after_type_url(frame);
-}
-
-static void json_parser_any_frame_set_before_type_url_end(
- upb_jsonparser_any_frame *frame,
- const char *ptr) {
- if (frame->parser == NULL) {
- frame->before_type_url_end = ptr;
- }
-}
-
-static void json_parser_any_frame_set_after_type_url_start_once(
- upb_jsonparser_any_frame *frame,
- const char *ptr) {
- if (json_parser_any_frame_has_type_url(frame) &&
- frame->after_type_url_start == NULL) {
- frame->after_type_url_start = ptr;
- }
-}
-
-/* Used to signal that a capture has been suspended. */
-static char suspend_capture;
-
-static upb_selector_t getsel_for_handlertype(upb_json_parser *p,
- upb_handlertype_t type) {
- upb_selector_t sel;
- bool ok = upb_handlers_getselector(p->top->f, type, &sel);
- UPB_ASSUME(ok);
- return sel;
-}
-
-static upb_selector_t parser_getsel(upb_json_parser *p) {
- return getsel_for_handlertype(
- p, upb_handlers_getprimitivehandlertype(p->top->f));
-}
-
-static bool check_stack(upb_json_parser *p) {
- if ((p->top + 1) == p->limit) {
- upb_status_seterrmsg(p->status, "Nesting too deep");
- return false;
- }
-
- return true;
-}
-
-static void set_name_table(upb_json_parser *p, upb_jsonparser_frame *frame) {
- upb_value v;
- const upb_json_codecache *cache = p->method->cache;
- bool ok;
- const upb_json_parsermethod *method;
-
- ok = upb_inttable_lookupptr(&cache->methods, frame->m, &v);
- UPB_ASSUME(ok);
- method = upb_value_getconstptr(v);
-
- frame->name_table = &method->name_table;
-}
-
-/* There are GCC/Clang built-ins for overflow checking which we could start
- * using if there was any performance benefit to it. */
-
-static bool checked_add(size_t a, size_t b, size_t *c) {
- if (SIZE_MAX - a < b) return false;
- *c = a + b;
- return true;
-}
-
-static size_t saturating_multiply(size_t a, size_t b) {
- /* size_t is unsigned, so this is defined behavior even on overflow. */
- size_t ret = a * b;
- if (b != 0 && ret / b != a) {
- ret = SIZE_MAX;
- }
- return ret;
-}
-
-
-/* Base64 decoding ************************************************************/
-
-/* TODO(haberman): make this streaming. */
-
-static const signed char b64table[] = {
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 62/*+*/, -1, -1, -1, 63/*/ */,
- 52/*0*/, 53/*1*/, 54/*2*/, 55/*3*/, 56/*4*/, 57/*5*/, 58/*6*/, 59/*7*/,
- 60/*8*/, 61/*9*/, -1, -1, -1, -1, -1, -1,
- -1, 0/*A*/, 1/*B*/, 2/*C*/, 3/*D*/, 4/*E*/, 5/*F*/, 6/*G*/,
- 07/*H*/, 8/*I*/, 9/*J*/, 10/*K*/, 11/*L*/, 12/*M*/, 13/*N*/, 14/*O*/,
- 15/*P*/, 16/*Q*/, 17/*R*/, 18/*S*/, 19/*T*/, 20/*U*/, 21/*V*/, 22/*W*/,
- 23/*X*/, 24/*Y*/, 25/*Z*/, -1, -1, -1, -1, -1,
- -1, 26/*a*/, 27/*b*/, 28/*c*/, 29/*d*/, 30/*e*/, 31/*f*/, 32/*g*/,
- 33/*h*/, 34/*i*/, 35/*j*/, 36/*k*/, 37/*l*/, 38/*m*/, 39/*n*/, 40/*o*/,
- 41/*p*/, 42/*q*/, 43/*r*/, 44/*s*/, 45/*t*/, 46/*u*/, 47/*v*/, 48/*w*/,
- 49/*x*/, 50/*y*/, 51/*z*/, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1
-};
-
-/* Returns the table value sign-extended to 32 bits. Knowing that the upper
- * bits will be 1 for unrecognized characters makes it easier to check for
- * this error condition later (see below). */
-int32_t b64lookup(unsigned char ch) { return b64table[ch]; }
-
-/* Returns true if the given character is not a valid base64 character or
- * padding. */
-bool nonbase64(unsigned char ch) { return b64lookup(ch) == -1 && ch != '='; }
-
-static bool base64_push(upb_json_parser *p, upb_selector_t sel, const char *ptr,
- size_t len) {
- const char *limit = ptr + len;
- for (; ptr < limit; ptr += 4) {
- uint32_t val;
- char output[3];
-
- if (limit - ptr < 4) {
- upb_status_seterrf(p->status,
- "Base64 input for bytes field not a multiple of 4: %s",
- upb_fielddef_name(p->top->f));
- return false;
- }
-
- val = b64lookup(ptr[0]) << 18 |
- b64lookup(ptr[1]) << 12 |
- b64lookup(ptr[2]) << 6 |
- b64lookup(ptr[3]);
-
- /* Test the upper bit; returns true if any of the characters returned -1. */
- if (val & 0x80000000) {
- goto otherchar;
- }
-
- output[0] = val >> 16;
- output[1] = (val >> 8) & 0xff;
- output[2] = val & 0xff;
- upb_sink_putstring(p->top->sink, sel, output, 3, NULL);
- }
- return true;
-
-otherchar:
- if (nonbase64(ptr[0]) || nonbase64(ptr[1]) || nonbase64(ptr[2]) ||
- nonbase64(ptr[3]) ) {
- upb_status_seterrf(p->status,
- "Non-base64 characters in bytes field: %s",
- upb_fielddef_name(p->top->f));
- return false;
- } if (ptr[2] == '=') {
- uint32_t val;
- char output;
-
- /* Last group contains only two input bytes, one output byte. */
- if (ptr[0] == '=' || ptr[1] == '=' || ptr[3] != '=') {
- goto badpadding;
- }
-
- val = b64lookup(ptr[0]) << 18 |
- b64lookup(ptr[1]) << 12;
-
- UPB_ASSERT(!(val & 0x80000000));
- output = val >> 16;
- upb_sink_putstring(p->top->sink, sel, &output, 1, NULL);
- return true;
- } else {
- uint32_t val;
- char output[2];
-
- /* Last group contains only three input bytes, two output bytes. */
- if (ptr[0] == '=' || ptr[1] == '=' || ptr[2] == '=') {
- goto badpadding;
- }
-
- val = b64lookup(ptr[0]) << 18 |
- b64lookup(ptr[1]) << 12 |
- b64lookup(ptr[2]) << 6;
-
- output[0] = val >> 16;
- output[1] = (val >> 8) & 0xff;
- upb_sink_putstring(p->top->sink, sel, output, 2, NULL);
- return true;
- }
-
-badpadding:
- upb_status_seterrf(p->status,
- "Incorrect base64 padding for field: %s (%.*s)",
- upb_fielddef_name(p->top->f),
- 4, ptr);
- return false;
-}
-
-
-/* Accumulate buffer **********************************************************/
-
-/* Functionality for accumulating a buffer.
- *
- * Some parts of the parser need an entire value as a contiguous string. For
- * example, to look up a member name in a hash table, or to turn a string into
- * a number, the relevant library routines need the input string to be in
- * contiguous memory, even if the value spanned two or more buffers in the
- * input. These routines handle that.
- *
- * In the common case we can just point to the input buffer to get this
- * contiguous string and avoid any actual copy. So we optimistically begin
- * this way. But there are a few cases where we must instead copy into a
- * separate buffer:
- *
- * 1. The string was not contiguous in the input (it spanned buffers).
- *
- * 2. The string included escape sequences that need to be interpreted to get
- * the true value in a contiguous buffer. */
-
-static void assert_accumulate_empty(upb_json_parser *p) {
- UPB_ASSERT(p->accumulated == NULL);
- UPB_ASSERT(p->accumulated_len == 0);
-}
-
-static void accumulate_clear(upb_json_parser *p) {
- p->accumulated = NULL;
- p->accumulated_len = 0;
-}
-
-/* Used internally by accumulate_append(). */
-static bool accumulate_realloc(upb_json_parser *p, size_t need) {
- void *mem;
- size_t old_size = p->accumulate_buf_size;
- size_t new_size = UPB_MAX(old_size, 128);
- while (new_size < need) {
- new_size = saturating_multiply(new_size, 2);
- }
-
- mem = upb_arena_realloc(p->arena, p->accumulate_buf, old_size, new_size);
- if (!mem) {
- upb_status_seterrmsg(p->status, "Out of memory allocating buffer.");
- return false;
- }
-
- p->accumulate_buf = mem;
- p->accumulate_buf_size = new_size;
- return true;
-}
-
-/* Logically appends the given data to the append buffer.
- * If "can_alias" is true, we will try to avoid actually copying, but the buffer
- * must be valid until the next accumulate_append() call (if any). */
-static bool accumulate_append(upb_json_parser *p, const char *buf, size_t len,
- bool can_alias) {
- size_t need;
-
- if (!p->accumulated && can_alias) {
- p->accumulated = buf;
- p->accumulated_len = len;
- return true;
- }
-
- if (!checked_add(p->accumulated_len, len, &need)) {
- upb_status_seterrmsg(p->status, "Integer overflow.");
- return false;
- }
-
- if (need > p->accumulate_buf_size && !accumulate_realloc(p, need)) {
- return false;
- }
-
- if (p->accumulated != p->accumulate_buf) {
- if (p->accumulated_len) {
- memcpy(p->accumulate_buf, p->accumulated, p->accumulated_len);
- }
- p->accumulated = p->accumulate_buf;
- }
-
- memcpy(p->accumulate_buf + p->accumulated_len, buf, len);
- p->accumulated_len += len;
- return true;
-}
-
-/* Returns a pointer to the data accumulated since the last accumulate_clear()
- * call, and writes the length to *len. This with point either to the input
- * buffer or a temporary accumulate buffer. */
-static const char *accumulate_getptr(upb_json_parser *p, size_t *len) {
- UPB_ASSERT(p->accumulated);
- *len = p->accumulated_len;
- return p->accumulated;
-}
-
-
-/* Mult-part text data ********************************************************/
-
-/* When we have text data in the input, it can often come in multiple segments.
- * For example, there may be some raw string data followed by an escape
- * sequence. The two segments are processed with different logic. Also buffer
- * seams in the input can cause multiple segments.
- *
- * As we see segments, there are two main cases for how we want to process them:
- *
- * 1. we want to push the captured input directly to string handlers.
- *
- * 2. we need to accumulate all the parts into a contiguous buffer for further
- * processing (field name lookup, string->number conversion, etc). */
-
-/* This is the set of states for p->multipart_state. */
-enum {
- /* We are not currently processing multipart data. */
- MULTIPART_INACTIVE = 0,
-
- /* We are processing multipart data by accumulating it into a contiguous
- * buffer. */
- MULTIPART_ACCUMULATE = 1,
-
- /* We are processing multipart data by pushing each part directly to the
- * current string handlers. */
- MULTIPART_PUSHEAGERLY = 2
-};
-
-/* Start a multi-part text value where we accumulate the data for processing at
- * the end. */
-static void multipart_startaccum(upb_json_parser *p) {
- assert_accumulate_empty(p);
- UPB_ASSERT(p->multipart_state == MULTIPART_INACTIVE);
- p->multipart_state = MULTIPART_ACCUMULATE;
-}
-
-/* Start a multi-part text value where we immediately push text data to a string
- * value with the given selector. */
-static void multipart_start(upb_json_parser *p, upb_selector_t sel) {
- assert_accumulate_empty(p);
- UPB_ASSERT(p->multipart_state == MULTIPART_INACTIVE);
- p->multipart_state = MULTIPART_PUSHEAGERLY;
- p->string_selector = sel;
-}
-
-static bool multipart_text(upb_json_parser *p, const char *buf, size_t len,
- bool can_alias) {
- switch (p->multipart_state) {
- case MULTIPART_INACTIVE:
- upb_status_seterrmsg(
- p->status, "Internal error: unexpected state MULTIPART_INACTIVE");
- return false;
-
- case MULTIPART_ACCUMULATE:
- if (!accumulate_append(p, buf, len, can_alias)) {
- return false;
- }
- break;
-
- case MULTIPART_PUSHEAGERLY: {
- const upb_bufhandle *handle = can_alias ? p->handle : NULL;
- upb_sink_putstring(p->top->sink, p->string_selector, buf, len, handle);
- break;
- }
- }
-
- return true;
-}
-
-/* Note: this invalidates the accumulate buffer! Call only after reading its
- * contents. */
-static void multipart_end(upb_json_parser *p) {
- /* This is false sometimes. Probably a bug of some sort, but this code is
- * intended for deletion soon. */
- /* UPB_ASSERT(p->multipart_state != MULTIPART_INACTIVE); */
- p->multipart_state = MULTIPART_INACTIVE;
- accumulate_clear(p);
-}
-
-
-/* Input capture **************************************************************/
-
-/* Functionality for capturing a region of the input as text. Gracefully
- * handles the case where a buffer seam occurs in the middle of the captured
- * region. */
-
-static void capture_begin(upb_json_parser *p, const char *ptr) {
- UPB_ASSERT(p->multipart_state != MULTIPART_INACTIVE);
- UPB_ASSERT(p->capture == NULL);
- p->capture = ptr;
-}
-
-static bool capture_end(upb_json_parser *p, const char *ptr) {
- UPB_ASSERT(p->capture);
- if (multipart_text(p, p->capture, ptr - p->capture, true)) {
- p->capture = NULL;
- return true;
- } else {
- return false;
- }
-}
-
-/* This is called at the end of each input buffer (ie. when we have hit a
- * buffer seam). If we are in the middle of capturing the input, this
- * processes the unprocessed capture region. */
-static void capture_suspend(upb_json_parser *p, const char **ptr) {
- if (!p->capture) return;
-
- if (multipart_text(p, p->capture, *ptr - p->capture, false)) {
- /* We use this as a signal that we were in the middle of capturing, and
- * that capturing should resume at the beginning of the next buffer.
- *
- * We can't use *ptr here, because we have no guarantee that this pointer
- * will be valid when we resume (if the underlying memory is freed, then
- * using the pointer at all, even to compare to NULL, is likely undefined
- * behavior). */
- p->capture = &suspend_capture;
- } else {
- /* Need to back up the pointer to the beginning of the capture, since
- * we were not able to actually preserve it. */
- *ptr = p->capture;
- }
-}
-
-static void capture_resume(upb_json_parser *p, const char *ptr) {
- if (p->capture) {
- UPB_ASSERT(p->capture == &suspend_capture);
- p->capture = ptr;
- }
-}
-
-
-/* Callbacks from the parser **************************************************/
-
-/* These are the functions called directly from the parser itself.
- * We define these in the same order as their declarations in the parser. */
-
-static char escape_char(char in) {
- switch (in) {
- case 'r': return '\r';
- case 't': return '\t';
- case 'n': return '\n';
- case 'f': return '\f';
- case 'b': return '\b';
- case '/': return '/';
- case '"': return '"';
- case '\\': return '\\';
- default:
- UPB_ASSERT(0);
- return 'x';
- }
-}
-
-static bool escape(upb_json_parser *p, const char *ptr) {
- char ch = escape_char(*ptr);
- return multipart_text(p, &ch, 1, false);
-}
-
-static void start_hex(upb_json_parser *p) {
- p->digit = 0;
-}
-
-static void hexdigit(upb_json_parser *p, const char *ptr) {
- char ch = *ptr;
-
- p->digit <<= 4;
-
- if (ch >= '0' && ch <= '9') {
- p->digit += (ch - '0');
- } else if (ch >= 'a' && ch <= 'f') {
- p->digit += ((ch - 'a') + 10);
- } else {
- UPB_ASSERT(ch >= 'A' && ch <= 'F');
- p->digit += ((ch - 'A') + 10);
- }
-}
-
-static bool end_hex(upb_json_parser *p) {
- uint32_t codepoint = p->digit;
-
- /* emit the codepoint as UTF-8. */
- char utf8[3]; /* support \u0000 -- \uFFFF -- need only three bytes. */
- int length = 0;
- if (codepoint <= 0x7F) {
- utf8[0] = codepoint;
- length = 1;
- } else if (codepoint <= 0x07FF) {
- utf8[1] = (codepoint & 0x3F) | 0x80;
- codepoint >>= 6;
- utf8[0] = (codepoint & 0x1F) | 0xC0;
- length = 2;
- } else /* codepoint <= 0xFFFF */ {
- utf8[2] = (codepoint & 0x3F) | 0x80;
- codepoint >>= 6;
- utf8[1] = (codepoint & 0x3F) | 0x80;
- codepoint >>= 6;
- utf8[0] = (codepoint & 0x0F) | 0xE0;
- length = 3;
- }
- /* TODO(haberman): Handle high surrogates: if codepoint is a high surrogate
- * we have to wait for the next escape to get the full code point). */
-
- return multipart_text(p, utf8, length, false);
-}
-
-static void start_text(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_text(upb_json_parser *p, const char *ptr) {
- return capture_end(p, ptr);
-}
-
-static bool start_number(upb_json_parser *p, const char *ptr) {
- if (is_top_level(p)) {
- if (is_number_wrapper_object(p)) {
- start_wrapper_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_NUMBERVALUE);
- } else {
- return false;
- }
- } else if (does_number_wrapper_start(p)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_wrapper_object(p);
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_value_object(p, VALUE_NUMBERVALUE);
- }
-
- multipart_startaccum(p);
- capture_begin(p, ptr);
- return true;
-}
-
-static bool parse_number(upb_json_parser *p, bool is_quoted);
-
-static bool end_number_nontop(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
-
- if (p->top->f == NULL) {
- multipart_end(p);
- return true;
- }
-
- return parse_number(p, false);
-}
-
-static bool end_number(upb_json_parser *p, const char *ptr) {
- if (!end_number_nontop(p, ptr)) {
- return false;
- }
-
- if (does_number_wrapper_end(p)) {
- end_wrapper_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- return true;
-}
-
-/* |buf| is NULL-terminated. |buf| itself will never include quotes;
- * |is_quoted| tells us whether this text originally appeared inside quotes. */
-static bool parse_number_from_buffer(upb_json_parser *p, const char *buf,
- bool is_quoted) {
- size_t len = strlen(buf);
- const char *bufend = buf + len;
- char *end;
- upb_fieldtype_t type = upb_fielddef_type(p->top->f);
- double val;
- double dummy;
- double inf = INFINITY;
-
- errno = 0;
-
- if (len == 0 || buf[0] == ' ') {
- return false;
- }
-
- /* For integer types, first try parsing with integer-specific routines.
- * If these succeed, they will be more accurate for int64/uint64 than
- * strtod().
- */
- switch (type) {
- case UPB_TYPE_ENUM:
- case UPB_TYPE_INT32: {
- long val = strtol(buf, &end, 0);
- if (errno == ERANGE || end != bufend) {
- break;
- } else if (val > INT32_MAX || val < INT32_MIN) {
- return false;
- } else {
- upb_sink_putint32(p->top->sink, parser_getsel(p), (int32_t)val);
- return true;
- }
- UPB_UNREACHABLE();
- }
- case UPB_TYPE_UINT32: {
- unsigned long val = strtoul(buf, &end, 0);
- if (end != bufend) {
- break;
- } else if (val > UINT32_MAX || errno == ERANGE) {
- return false;
- } else {
- upb_sink_putuint32(p->top->sink, parser_getsel(p), (uint32_t)val);
- return true;
- }
- UPB_UNREACHABLE();
- }
- /* XXX: We can't handle [u]int64 properly on 32-bit machines because
- * strto[u]ll isn't in C89. */
- case UPB_TYPE_INT64: {
- long val = strtol(buf, &end, 0);
- if (errno == ERANGE || end != bufend) {
- break;
- } else {
- upb_sink_putint64(p->top->sink, parser_getsel(p), val);
- return true;
- }
- UPB_UNREACHABLE();
- }
- case UPB_TYPE_UINT64: {
- unsigned long val = strtoul(p->accumulated, &end, 0);
- if (end != bufend) {
- break;
- } else if (errno == ERANGE) {
- return false;
- } else {
- upb_sink_putuint64(p->top->sink, parser_getsel(p), val);
- return true;
- }
- UPB_UNREACHABLE();
- }
- default:
- break;
- }
-
- if (type != UPB_TYPE_DOUBLE && type != UPB_TYPE_FLOAT && is_quoted) {
- /* Quoted numbers for integer types are not allowed to be in double form. */
- return false;
- }
-
- if (len == strlen("Infinity") && strcmp(buf, "Infinity") == 0) {
- /* C89 does not have an INFINITY macro. */
- val = inf;
- } else if (len == strlen("-Infinity") && strcmp(buf, "-Infinity") == 0) {
- val = -inf;
- } else {
- val = strtod(buf, &end);
- if (errno == ERANGE || end != bufend) {
- return false;
- }
- }
-
- switch (type) {
-#define CASE(capitaltype, smalltype, ctype, min, max) \
- case UPB_TYPE_ ## capitaltype: { \
- if (modf(val, &dummy) != 0 || val > max || val < min) { \
- return false; \
- } else { \
- upb_sink_put ## smalltype(p->top->sink, parser_getsel(p), \
- (ctype)val); \
- return true; \
- } \
- break; \
- }
- case UPB_TYPE_ENUM:
- CASE(INT32, int32, int32_t, INT32_MIN, INT32_MAX);
- CASE(INT64, int64, int64_t, INT64_MIN, INT64_MAX);
- CASE(UINT32, uint32, uint32_t, 0, UINT32_MAX);
- CASE(UINT64, uint64, uint64_t, 0, UINT64_MAX);
-#undef CASE
-
- case UPB_TYPE_DOUBLE:
- upb_sink_putdouble(p->top->sink, parser_getsel(p), val);
- return true;
- case UPB_TYPE_FLOAT:
- if ((val > FLT_MAX || val < -FLT_MAX) && val != inf && val != -inf) {
- return false;
- } else {
- upb_sink_putfloat(p->top->sink, parser_getsel(p), val);
- return true;
- }
- default:
- return false;
- }
-}
-
-static bool parse_number(upb_json_parser *p, bool is_quoted) {
- size_t len;
- const char *buf;
-
- /* strtol() and friends unfortunately do not support specifying the length of
- * the input string, so we need to force a copy into a NULL-terminated buffer. */
- if (!multipart_text(p, "\0", 1, false)) {
- return false;
- }
-
- buf = accumulate_getptr(p, &len);
-
- if (parse_number_from_buffer(p, buf, is_quoted)) {
- multipart_end(p);
- return true;
- } else {
- upb_status_seterrf(p->status, "error parsing number: %s", buf);
- multipart_end(p);
- return false;
- }
-}
-
-static bool parser_putbool(upb_json_parser *p, bool val) {
- bool ok;
-
- if (p->top->f == NULL) {
- return true;
- }
-
- if (upb_fielddef_type(p->top->f) != UPB_TYPE_BOOL) {
- upb_status_seterrf(p->status,
- "Boolean value specified for non-bool field: %s",
- upb_fielddef_name(p->top->f));
- return false;
- }
-
- ok = upb_sink_putbool(p->top->sink, parser_getsel(p), val);
- UPB_ASSERT(ok);
-
- return true;
-}
-
-static bool end_bool(upb_json_parser *p, bool val) {
- if (is_top_level(p)) {
- if (is_wellknown_msg(p, UPB_WELLKNOWN_BOOLVALUE)) {
- start_wrapper_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_BOOLVALUE);
- } else {
- return false;
- }
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_BOOLVALUE)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_wrapper_object(p);
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_value_object(p, VALUE_BOOLVALUE);
- }
-
- if (p->top->is_unknown_field) {
- return true;
- }
-
- if (!parser_putbool(p, val)) {
- return false;
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_BOOLVALUE)) {
- end_wrapper_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- return true;
-}
-
-static bool end_null(upb_json_parser *p) {
- const char *zero_ptr = "0";
-
- if (is_top_level(p)) {
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_NULLVALUE);
- } else {
- return true;
- }
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_value_object(p, VALUE_NULLVALUE);
- } else {
- return true;
- }
-
- /* Fill null_value field. */
- multipart_startaccum(p);
- capture_begin(p, zero_ptr);
- capture_end(p, zero_ptr + 1);
- parse_number(p, false);
-
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
-
- return true;
-}
-
-static bool start_any_stringval(upb_json_parser *p) {
- multipart_startaccum(p);
- return true;
-}
-
-static bool start_stringval(upb_json_parser *p) {
- if (is_top_level(p)) {
- if (is_string_wrapper_object(p) ||
- is_number_wrapper_object(p)) {
- start_wrapper_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_FIELDMASK)) {
- start_fieldmask_object(p);
- return true;
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_TIMESTAMP) ||
- is_wellknown_msg(p, UPB_WELLKNOWN_DURATION)) {
- start_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_STRINGVALUE);
- } else {
- return false;
- }
- } else if (does_string_wrapper_start(p) ||
- does_number_wrapper_start(p)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_wrapper_object(p);
- } else if (does_fieldmask_start(p)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_fieldmask_object(p);
- return true;
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_TIMESTAMP) ||
- is_wellknown_field(p, UPB_WELLKNOWN_DURATION)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_object(p);
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE)) {
- if (!start_subobject(p)) {
- return false;
- }
- start_value_object(p, VALUE_STRINGVALUE);
- }
-
- if (p->top->f == NULL) {
- multipart_startaccum(p);
- return true;
- }
-
- if (p->top->is_any) {
- return start_any_stringval(p);
- }
-
- if (upb_fielddef_isstring(p->top->f)) {
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- if (!check_stack(p)) return false;
-
- /* Start a new parser frame: parser frames correspond one-to-one with
- * handler frames, and string events occur in a sub-frame. */
- inner = start_jsonparser_frame(p);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSTR);
- upb_sink_startstr(p->top->sink, sel, 0, &inner->sink);
- inner->m = p->top->m;
- inner->f = p->top->f;
- p->top = inner;
-
- if (upb_fielddef_type(p->top->f) == UPB_TYPE_STRING) {
- /* For STRING fields we push data directly to the handlers as it is
- * parsed. We don't do this yet for BYTES fields, because our base64
- * decoder is not streaming.
- *
- * TODO(haberman): make base64 decoding streaming also. */
- multipart_start(p, getsel_for_handlertype(p, UPB_HANDLER_STRING));
- return true;
- } else {
- multipart_startaccum(p);
- return true;
- }
- } else if (upb_fielddef_type(p->top->f) != UPB_TYPE_BOOL &&
- upb_fielddef_type(p->top->f) != UPB_TYPE_MESSAGE) {
- /* No need to push a frame -- numeric values in quotes remain in the
- * current parser frame. These values must accmulate so we can convert
- * them all at once at the end. */
- multipart_startaccum(p);
- return true;
- } else {
- upb_status_seterrf(p->status,
- "String specified for bool or submessage field: %s",
- upb_fielddef_name(p->top->f));
- return false;
- }
-}
-
-static bool end_any_stringval(upb_json_parser *p) {
- size_t len;
- const char *buf = accumulate_getptr(p, &len);
-
- /* Set type_url */
- upb_selector_t sel;
- upb_jsonparser_frame *inner;
- if (!check_stack(p)) return false;
- inner = p->top + 1;
-
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSTR);
- upb_sink_startstr(p->top->sink, sel, 0, &inner->sink);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STRING);
- upb_sink_putstring(inner->sink, sel, buf, len, NULL);
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
- upb_sink_endstr(inner->sink, sel);
-
- multipart_end(p);
-
- /* Resolve type url */
- if (strncmp(buf, "type.googleapis.com/", 20) == 0 && len > 20) {
- const upb_msgdef *payload_type = NULL;
- buf += 20;
- len -= 20;
-
- payload_type = upb_symtab_lookupmsg2(p->symtab, buf, len);
- if (payload_type == NULL) {
- upb_status_seterrf(
- p->status, "Cannot find packed type: %.*s\n", (int)len, buf);
- return false;
- }
-
- json_parser_any_frame_set_payload_type(p, p->top->any_frame, payload_type);
-
- return true;
- } else {
- upb_status_seterrf(
- p->status, "Invalid type url: %.*s\n", (int)len, buf);
- return false;
- }
-}
-
-static bool end_stringval_nontop(upb_json_parser *p) {
- bool ok = true;
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_TIMESTAMP) ||
- is_wellknown_msg(p, UPB_WELLKNOWN_DURATION)) {
- multipart_end(p);
- return true;
- }
-
- if (p->top->f == NULL) {
- multipart_end(p);
- return true;
- }
-
- if (p->top->is_any) {
- return end_any_stringval(p);
- }
-
- switch (upb_fielddef_type(p->top->f)) {
- case UPB_TYPE_BYTES:
- if (!base64_push(p, getsel_for_handlertype(p, UPB_HANDLER_STRING),
- p->accumulated, p->accumulated_len)) {
- return false;
- }
- /* Fall through. */
-
- case UPB_TYPE_STRING: {
- upb_selector_t sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
- upb_sink_endstr(p->top->sink, sel);
- p->top--;
- break;
- }
-
- case UPB_TYPE_ENUM: {
- /* Resolve enum symbolic name to integer value. */
- const upb_enumdef *enumdef = upb_fielddef_enumsubdef(p->top->f);
-
- size_t len;
- const char *buf = accumulate_getptr(p, &len);
-
- int32_t int_val = 0;
- ok = upb_enumdef_ntoi(enumdef, buf, len, &int_val);
-
- if (ok) {
- upb_selector_t sel = parser_getsel(p);
- upb_sink_putint32(p->top->sink, sel, int_val);
- } else {
- if (p->ignore_json_unknown) {
- ok = true;
- /* TODO(teboring): Should also clean this field. */
- } else {
- upb_status_seterrf(p->status, "Enum value unknown: '%.*s'", len, buf);
- }
- }
-
- break;
- }
-
- case UPB_TYPE_INT32:
- case UPB_TYPE_INT64:
- case UPB_TYPE_UINT32:
- case UPB_TYPE_UINT64:
- case UPB_TYPE_DOUBLE:
- case UPB_TYPE_FLOAT:
- ok = parse_number(p, true);
- break;
-
- default:
- UPB_ASSERT(false);
- upb_status_seterrmsg(p->status, "Internal error in JSON decoder");
- ok = false;
- break;
- }
-
- multipart_end(p);
-
- return ok;
-}
-
-static bool end_stringval(upb_json_parser *p) {
- /* FieldMask's stringvals have been ended when handling them. Only need to
- * close FieldMask here.*/
- if (does_fieldmask_end(p)) {
- end_fieldmask_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- if (!end_stringval_nontop(p)) {
- return false;
- }
-
- if (does_string_wrapper_end(p) ||
- does_number_wrapper_end(p)) {
- end_wrapper_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_TIMESTAMP) ||
- is_wellknown_msg(p, UPB_WELLKNOWN_DURATION) ||
- is_wellknown_msg(p, UPB_WELLKNOWN_FIELDMASK)) {
- end_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- return true;
- }
-
- return true;
-}
-
-static void start_duration_base(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_duration_base(upb_json_parser *p, const char *ptr) {
- size_t len;
- const char *buf;
- char seconds_buf[14];
- char nanos_buf[12];
- char *end;
- int64_t seconds = 0;
- int32_t nanos = 0;
- double val = 0.0;
- const char *seconds_membername = "seconds";
- const char *nanos_membername = "nanos";
- size_t fraction_start;
-
- if (!capture_end(p, ptr)) {
- return false;
- }
-
- buf = accumulate_getptr(p, &len);
-
- memset(seconds_buf, 0, 14);
- memset(nanos_buf, 0, 12);
-
- /* Find out base end. The maximus duration is 315576000000, which cannot be
- * represented by double without losing precision. Thus, we need to handle
- * fraction and base separately. */
- for (fraction_start = 0; fraction_start < len && buf[fraction_start] != '.';
- fraction_start++);
-
- /* Parse base */
- memcpy(seconds_buf, buf, fraction_start);
- seconds = strtol(seconds_buf, &end, 10);
- if (errno == ERANGE || end != seconds_buf + fraction_start) {
- upb_status_seterrf(p->status, "error parsing duration: %s",
- seconds_buf);
- return false;
- }
-
- if (seconds > 315576000000) {
- upb_status_seterrf(p->status, "error parsing duration: "
- "maximum acceptable value is "
- "315576000000");
- return false;
- }
-
- if (seconds < -315576000000) {
- upb_status_seterrf(p->status, "error parsing duration: "
- "minimum acceptable value is "
- "-315576000000");
- return false;
- }
-
- /* Parse fraction */
- nanos_buf[0] = '0';
- memcpy(nanos_buf + 1, buf + fraction_start, len - fraction_start);
- val = strtod(nanos_buf, &end);
- if (errno == ERANGE || end != nanos_buf + len - fraction_start + 1) {
- upb_status_seterrf(p->status, "error parsing duration: %s",
- nanos_buf);
- return false;
- }
-
- nanos = val * 1000000000;
- if (seconds < 0) nanos = -nanos;
-
- /* Clean up buffer */
- multipart_end(p);
-
- /* Set seconds */
- start_member(p);
- capture_begin(p, seconds_membername);
- capture_end(p, seconds_membername + 7);
- end_membername(p);
- upb_sink_putint64(p->top->sink, parser_getsel(p), seconds);
- end_member(p);
-
- /* Set nanos */
- start_member(p);
- capture_begin(p, nanos_membername);
- capture_end(p, nanos_membername + 5);
- end_membername(p);
- upb_sink_putint32(p->top->sink, parser_getsel(p), nanos);
- end_member(p);
-
- /* Continue previous arena */
- multipart_startaccum(p);
-
- return true;
-}
-
-static int parse_timestamp_number(upb_json_parser *p) {
- size_t len;
- const char *buf;
- int val;
-
- /* atoi() and friends unfortunately do not support specifying the length of
- * the input string, so we need to force a copy into a NULL-terminated buffer. */
- multipart_text(p, "\0", 1, false);
-
- buf = accumulate_getptr(p, &len);
- val = atoi(buf);
- multipart_end(p);
- multipart_startaccum(p);
-
- return val;
-}
-
-static void start_year(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_year(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_year = parse_timestamp_number(p) - 1900;
- return true;
-}
-
-static void start_month(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_month(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_mon = parse_timestamp_number(p) - 1;
- return true;
-}
-
-static void start_day(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_day(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_mday = parse_timestamp_number(p);
- return true;
-}
-
-static void start_hour(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_hour(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_hour = parse_timestamp_number(p);
- return true;
-}
-
-static void start_minute(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_minute(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_min = parse_timestamp_number(p);
- return true;
-}
-
-static void start_second(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_second(upb_json_parser *p, const char *ptr) {
- if (!capture_end(p, ptr)) {
- return false;
- }
- p->tm.tm_sec = parse_timestamp_number(p);
- return true;
-}
-
-static void start_timestamp_base(upb_json_parser *p) {
- memset(&p->tm, 0, sizeof(struct tm));
-}
-
-static void start_timestamp_fraction(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_timestamp_fraction(upb_json_parser *p, const char *ptr) {
- size_t len;
- const char *buf;
- char nanos_buf[12];
- char *end;
- double val = 0.0;
- int32_t nanos;
- const char *nanos_membername = "nanos";
-
- memset(nanos_buf, 0, 12);
-
- if (!capture_end(p, ptr)) {
- return false;
- }
-
- buf = accumulate_getptr(p, &len);
-
- if (len > 10) {
- upb_status_seterrf(p->status,
- "error parsing timestamp: at most 9-digit fraction.");
- return false;
- }
-
- /* Parse nanos */
- nanos_buf[0] = '0';
- memcpy(nanos_buf + 1, buf, len);
- val = strtod(nanos_buf, &end);
-
- if (errno == ERANGE || end != nanos_buf + len + 1) {
- upb_status_seterrf(p->status, "error parsing timestamp nanos: %s",
- nanos_buf);
- return false;
- }
-
- nanos = val * 1000000000;
-
- /* Clean up previous environment */
- multipart_end(p);
-
- /* Set nanos */
- start_member(p);
- capture_begin(p, nanos_membername);
- capture_end(p, nanos_membername + 5);
- end_membername(p);
- upb_sink_putint32(p->top->sink, parser_getsel(p), nanos);
- end_member(p);
-
- /* Continue previous environment */
- multipart_startaccum(p);
-
- return true;
-}
-
-static void start_timestamp_zone(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-/* epoch_days(1970, 1, 1) == 1970-01-01 == 0. */
-static int epoch_days(int year, int month, int day) {
- static const uint16_t month_yday[12] = {0, 31, 59, 90, 120, 151,
- 181, 212, 243, 273, 304, 334};
- uint32_t year_adj = year + 4800; /* Ensure positive year, multiple of 400. */
- uint32_t febs = year_adj - (month <= 2 ? 1 : 0); /* Februaries since base. */
- uint32_t leap_days = 1 + (febs / 4) - (febs / 100) + (febs / 400);
- uint32_t days = 365 * year_adj + leap_days + month_yday[month - 1] + day - 1;
- return days - 2472692; /* Adjust to Unix epoch. */
-}
-
-static int64_t upb_timegm(const struct tm *tp) {
- int64_t ret = epoch_days(tp->tm_year + 1900, tp->tm_mon + 1, tp->tm_mday);
- ret = (ret * 24) + tp->tm_hour;
- ret = (ret * 60) + tp->tm_min;
- ret = (ret * 60) + tp->tm_sec;
- return ret;
-}
-
-static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
- size_t len;
- const char *buf;
- int hours;
- int64_t seconds;
- const char *seconds_membername = "seconds";
-
- if (!capture_end(p, ptr)) {
- return false;
- }
-
- buf = accumulate_getptr(p, &len);
-
- if (buf[0] != 'Z') {
- if (sscanf(buf + 1, "%2d:00", &hours) != 1) {
- upb_status_seterrf(p->status, "error parsing timestamp offset");
- return false;
- }
-
- if (buf[0] == '+') {
- hours = -hours;
- }
-
- p->tm.tm_hour += hours;
- }
-
- /* Normalize tm */
- seconds = upb_timegm(&p->tm);
-
- /* Check timestamp boundary */
- if (seconds < -62135596800) {
- upb_status_seterrf(p->status, "error parsing timestamp: "
- "minimum acceptable value is "
- "0001-01-01T00:00:00Z");
- return false;
- }
-
- /* Clean up previous environment */
- multipart_end(p);
-
- /* Set seconds */
- start_member(p);
- capture_begin(p, seconds_membername);
- capture_end(p, seconds_membername + 7);
- end_membername(p);
- upb_sink_putint64(p->top->sink, parser_getsel(p), seconds);
- end_member(p);
-
- /* Continue previous environment */
- multipart_startaccum(p);
-
- return true;
-}
-
-static void start_fieldmask_path_text(upb_json_parser *p, const char *ptr) {
- capture_begin(p, ptr);
-}
-
-static bool end_fieldmask_path_text(upb_json_parser *p, const char *ptr) {
- return capture_end(p, ptr);
-}
-
-static bool start_fieldmask_path(upb_json_parser *p) {
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- if (!check_stack(p)) return false;
-
- /* Start a new parser frame: parser frames correspond one-to-one with
- * handler frames, and string events occur in a sub-frame. */
- inner = start_jsonparser_frame(p);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSTR);
- upb_sink_startstr(p->top->sink, sel, 0, &inner->sink);
- inner->m = p->top->m;
- inner->f = p->top->f;
- p->top = inner;
-
- multipart_startaccum(p);
- return true;
-}
-
-static bool lower_camel_push(
- upb_json_parser *p, upb_selector_t sel, const char *ptr, size_t len) {
- const char *limit = ptr + len;
- bool first = true;
- for (;ptr < limit; ptr++) {
- if (*ptr >= 'A' && *ptr <= 'Z' && !first) {
- char lower = tolower(*ptr);
- upb_sink_putstring(p->top->sink, sel, "_", 1, NULL);
- upb_sink_putstring(p->top->sink, sel, &lower, 1, NULL);
- } else {
- upb_sink_putstring(p->top->sink, sel, ptr, 1, NULL);
- }
- first = false;
- }
- return true;
-}
-
-static bool end_fieldmask_path(upb_json_parser *p) {
- upb_selector_t sel;
-
- if (!lower_camel_push(
- p, getsel_for_handlertype(p, UPB_HANDLER_STRING),
- p->accumulated, p->accumulated_len)) {
- return false;
- }
-
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
- upb_sink_endstr(p->top->sink, sel);
- p->top--;
-
- multipart_end(p);
- return true;
-}
-
-static void start_member(upb_json_parser *p) {
- UPB_ASSERT(!p->top->f);
- multipart_startaccum(p);
-}
-
-/* Helper: invoked during parse_mapentry() to emit the mapentry message's key
- * field based on the current contents of the accumulate buffer. */
-static bool parse_mapentry_key(upb_json_parser *p) {
-
- size_t len;
- const char *buf = accumulate_getptr(p, &len);
-
- /* Emit the key field. We do a bit of ad-hoc parsing here because the
- * parser state machine has already decided that this is a string field
- * name, and we are reinterpreting it as some arbitrary key type. In
- * particular, integer and bool keys are quoted, so we need to parse the
- * quoted string contents here. */
-
- p->top->f = upb_msgdef_itof(p->top->m, UPB_MAPENTRY_KEY);
- if (p->top->f == NULL) {
- upb_status_seterrmsg(p->status, "mapentry message has no key");
- return false;
- }
- switch (upb_fielddef_type(p->top->f)) {
- case UPB_TYPE_INT32:
- case UPB_TYPE_INT64:
- case UPB_TYPE_UINT32:
- case UPB_TYPE_UINT64:
- /* Invoke end_number. The accum buffer has the number's text already. */
- if (!parse_number(p, true)) {
- return false;
- }
- break;
- case UPB_TYPE_BOOL:
- if (len == 4 && !strncmp(buf, "true", 4)) {
- if (!parser_putbool(p, true)) {
- return false;
- }
- } else if (len == 5 && !strncmp(buf, "false", 5)) {
- if (!parser_putbool(p, false)) {
- return false;
- }
- } else {
- upb_status_seterrmsg(p->status,
- "Map bool key not 'true' or 'false'");
- return false;
- }
- multipart_end(p);
- break;
- case UPB_TYPE_STRING:
- case UPB_TYPE_BYTES: {
- upb_sink subsink;
- upb_selector_t sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSTR);
- upb_sink_startstr(p->top->sink, sel, len, &subsink);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STRING);
- upb_sink_putstring(subsink, sel, buf, len, NULL);
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
- upb_sink_endstr(subsink, sel);
- multipart_end(p);
- break;
- }
- default:
- upb_status_seterrmsg(p->status, "Invalid field type for map key");
- return false;
- }
-
- return true;
-}
-
-/* Helper: emit one map entry (as a submessage in the map field sequence). This
- * is invoked from end_membername(), at the end of the map entry's key string,
- * with the map key in the accumulate buffer. It parses the key from that
- * buffer, emits the handler calls to start the mapentry submessage (setting up
- * its subframe in the process), and sets up state in the subframe so that the
- * value parser (invoked next) will emit the mapentry's value field and then
- * end the mapentry message. */
-
-static bool handle_mapentry(upb_json_parser *p) {
- const upb_fielddef *mapfield;
- const upb_msgdef *mapentrymsg;
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- /* Map entry: p->top->sink is the seq frame, so we need to start a frame
- * for the mapentry itself, and then set |f| in that frame so that the map
- * value field is parsed, and also set a flag to end the frame after the
- * map-entry value is parsed. */
- if (!check_stack(p)) return false;
-
- mapfield = p->top->mapfield;
- mapentrymsg = upb_fielddef_msgsubdef(mapfield);
-
- inner = start_jsonparser_frame(p);
- p->top->f = mapfield;
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSUBMSG);
- upb_sink_startsubmsg(p->top->sink, sel, &inner->sink);
- inner->m = mapentrymsg;
- inner->mapfield = mapfield;
-
- /* Don't set this to true *yet* -- we reuse parsing handlers below to push
- * the key field value to the sink, and these handlers will pop the frame
- * if they see is_mapentry (when invoked by the parser state machine, they
- * would have just seen the map-entry value, not key). */
- inner->is_mapentry = false;
- p->top = inner;
-
- /* send STARTMSG in submsg frame. */
- upb_sink_startmsg(p->top->sink);
-
- parse_mapentry_key(p);
-
- /* Set up the value field to receive the map-entry value. */
- p->top->f = upb_msgdef_itof(p->top->m, UPB_MAPENTRY_VALUE);
- p->top->is_mapentry = true; /* set up to pop frame after value is parsed. */
- p->top->mapfield = mapfield;
- if (p->top->f == NULL) {
- upb_status_seterrmsg(p->status, "mapentry message has no value");
- return false;
- }
-
- return true;
-}
-
-static bool end_membername(upb_json_parser *p) {
- UPB_ASSERT(!p->top->f);
-
- if (!p->top->m) {
- p->top->is_unknown_field = true;
- multipart_end(p);
- return true;
- }
-
- if (p->top->is_any) {
- return end_any_membername(p);
- } else if (p->top->is_map) {
- return handle_mapentry(p);
- } else {
- size_t len;
- const char *buf = accumulate_getptr(p, &len);
- upb_value v;
-
- if (upb_strtable_lookup2(p->top->name_table, buf, len, &v)) {
- p->top->f = upb_value_getconstptr(v);
- multipart_end(p);
-
- return true;
- } else if (p->ignore_json_unknown) {
- p->top->is_unknown_field = true;
- multipart_end(p);
- return true;
- } else {
- upb_status_seterrf(p->status, "No such field: %.*s\n", (int)len, buf);
- return false;
- }
- }
-}
-
-static bool end_any_membername(upb_json_parser *p) {
- size_t len;
- const char *buf = accumulate_getptr(p, &len);
- upb_value v;
-
- if (len == 5 && strncmp(buf, "@type", len) == 0) {
- upb_strtable_lookup2(p->top->name_table, "type_url", 8, &v);
- p->top->f = upb_value_getconstptr(v);
- multipart_end(p);
- return true;
- } else {
- p->top->is_unknown_field = true;
- multipart_end(p);
- return true;
- }
-}
-
-static void end_member(upb_json_parser *p) {
- /* If we just parsed a map-entry value, end that frame too. */
- if (p->top->is_mapentry) {
- upb_selector_t sel;
- bool ok;
- const upb_fielddef *mapfield;
-
- UPB_ASSERT(p->top > p->stack);
- /* send ENDMSG on submsg. */
- upb_sink_endmsg(p->top->sink, p->status);
- mapfield = p->top->mapfield;
-
- /* send ENDSUBMSG in repeated-field-of-mapentries frame. */
- p->top--;
- ok = upb_handlers_getselector(mapfield, UPB_HANDLER_ENDSUBMSG, &sel);
- UPB_ASSUME(ok);
- upb_sink_endsubmsg(p->top->sink, (p->top + 1)->sink, sel);
- }
-
- p->top->f = NULL;
- p->top->is_unknown_field = false;
-}
-
-static void start_any_member(upb_json_parser *p, const char *ptr) {
- start_member(p);
- json_parser_any_frame_set_after_type_url_start_once(p->top->any_frame, ptr);
-}
-
-static void end_any_member(upb_json_parser *p, const char *ptr) {
- json_parser_any_frame_set_before_type_url_end(p->top->any_frame, ptr);
- end_member(p);
-}
-
-static bool start_subobject(upb_json_parser *p) {
- if (p->top->is_unknown_field) {
- if (!check_stack(p)) return false;
-
- p->top = start_jsonparser_frame(p);
- return true;
- }
-
- if (upb_fielddef_ismap(p->top->f)) {
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- /* Beginning of a map. Start a new parser frame in a repeated-field
- * context. */
- if (!check_stack(p)) return false;
-
- inner = start_jsonparser_frame(p);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSEQ);
- upb_sink_startseq(p->top->sink, sel, &inner->sink);
- inner->m = upb_fielddef_msgsubdef(p->top->f);
- inner->mapfield = p->top->f;
- inner->is_map = true;
- p->top = inner;
-
- return true;
- } else if (upb_fielddef_issubmsg(p->top->f)) {
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- /* Beginning of a subobject. Start a new parser frame in the submsg
- * context. */
- if (!check_stack(p)) return false;
-
- inner = start_jsonparser_frame(p);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSUBMSG);
- upb_sink_startsubmsg(p->top->sink, sel, &inner->sink);
- inner->m = upb_fielddef_msgsubdef(p->top->f);
- set_name_table(p, inner);
- p->top = inner;
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_ANY)) {
- p->top->is_any = true;
- p->top->any_frame = json_parser_any_frame_new(p);
- } else {
- p->top->is_any = false;
- p->top->any_frame = NULL;
- }
-
- return true;
- } else {
- upb_status_seterrf(p->status,
- "Object specified for non-message/group field: %s",
- upb_fielddef_name(p->top->f));
- return false;
- }
-}
-
-static bool start_subobject_full(upb_json_parser *p) {
- if (is_top_level(p)) {
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_STRUCTVALUE);
- if (!start_subobject(p)) return false;
- start_structvalue_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_STRUCT)) {
- start_structvalue_object(p);
- } else {
- return true;
- }
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_STRUCT)) {
- if (!start_subobject(p)) return false;
- start_structvalue_object(p);
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE)) {
- if (!start_subobject(p)) return false;
- start_value_object(p, VALUE_STRUCTVALUE);
- if (!start_subobject(p)) return false;
- start_structvalue_object(p);
- }
-
- return start_subobject(p);
-}
-
-static void end_subobject(upb_json_parser *p) {
- if (is_top_level(p)) {
- return;
- }
-
- if (p->top->is_map) {
- upb_selector_t sel;
- p->top--;
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSEQ);
- upb_sink_endseq(p->top->sink, sel);
- } else {
- upb_selector_t sel;
- bool is_unknown = p->top->m == NULL;
- p->top--;
- if (!is_unknown) {
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSUBMSG);
- upb_sink_endsubmsg(p->top->sink, (p->top + 1)->sink, sel);
- }
- }
-}
-
-static void end_subobject_full(upb_json_parser *p) {
- end_subobject(p);
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_STRUCT)) {
- end_structvalue_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- }
-}
-
-static bool start_array(upb_json_parser *p) {
- upb_jsonparser_frame *inner;
- upb_selector_t sel;
-
- if (is_top_level(p)) {
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- start_value_object(p, VALUE_LISTVALUE);
- if (!start_subobject(p)) return false;
- start_listvalue_object(p);
- } else if (is_wellknown_msg(p, UPB_WELLKNOWN_LISTVALUE)) {
- start_listvalue_object(p);
- } else {
- return false;
- }
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_LISTVALUE) &&
- (!upb_fielddef_isseq(p->top->f) ||
- p->top->is_repeated)) {
- if (!start_subobject(p)) return false;
- start_listvalue_object(p);
- } else if (is_wellknown_field(p, UPB_WELLKNOWN_VALUE) &&
- (!upb_fielddef_isseq(p->top->f) ||
- p->top->is_repeated)) {
- if (!start_subobject(p)) return false;
- start_value_object(p, VALUE_LISTVALUE);
- if (!start_subobject(p)) return false;
- start_listvalue_object(p);
- }
-
- if (p->top->is_unknown_field) {
- inner = start_jsonparser_frame(p);
- inner->is_unknown_field = true;
- p->top = inner;
-
- return true;
- }
-
- if (!upb_fielddef_isseq(p->top->f)) {
- upb_status_seterrf(p->status,
- "Array specified for non-repeated field: %s",
- upb_fielddef_name(p->top->f));
- return false;
- }
-
- if (!check_stack(p)) return false;
-
- inner = start_jsonparser_frame(p);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSEQ);
- upb_sink_startseq(p->top->sink, sel, &inner->sink);
- inner->m = p->top->m;
- inner->f = p->top->f;
- inner->is_repeated = true;
- p->top = inner;
-
- return true;
-}
-
-static void end_array(upb_json_parser *p) {
- upb_selector_t sel;
-
- UPB_ASSERT(p->top > p->stack);
-
- p->top--;
-
- if (p->top->is_unknown_field) {
- return;
- }
-
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSEQ);
- upb_sink_endseq(p->top->sink, sel);
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_LISTVALUE)) {
- end_listvalue_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- }
-
- if (is_wellknown_msg(p, UPB_WELLKNOWN_VALUE)) {
- end_value_object(p);
- if (!is_top_level(p)) {
- end_subobject(p);
- }
- }
-}
-
-static void start_object(upb_json_parser *p) {
- if (!p->top->is_map && p->top->m != NULL) {
- upb_sink_startmsg(p->top->sink);
- }
-}
-
-static void end_object(upb_json_parser *p) {
- if (!p->top->is_map && p->top->m != NULL) {
- upb_sink_endmsg(p->top->sink, p->status);
- }
-}
-
-static void start_any_object(upb_json_parser *p, const char *ptr) {
- start_object(p);
- p->top->any_frame->before_type_url_start = ptr;
- p->top->any_frame->before_type_url_end = ptr;
-}
-
-static bool end_any_object(upb_json_parser *p, const char *ptr) {
- const char *value_membername = "value";
- bool is_well_known_packed = false;
- const char *packed_end = ptr + 1;
- upb_selector_t sel;
- upb_jsonparser_frame *inner;
-
- if (json_parser_any_frame_has_value(p->top->any_frame) &&
- !json_parser_any_frame_has_type_url(p->top->any_frame)) {
- upb_status_seterrmsg(p->status, "No valid type url");
- return false;
- }
-
- /* Well known types data is represented as value field. */
- if (upb_msgdef_wellknowntype(p->top->any_frame->parser->top->m) !=
- UPB_WELLKNOWN_UNSPECIFIED) {
- is_well_known_packed = true;
-
- if (json_parser_any_frame_has_value_before_type_url(p->top->any_frame)) {
- p->top->any_frame->before_type_url_start =
- memchr(p->top->any_frame->before_type_url_start, ':',
- p->top->any_frame->before_type_url_end -
- p->top->any_frame->before_type_url_start);
- if (p->top->any_frame->before_type_url_start == NULL) {
- upb_status_seterrmsg(p->status, "invalid data for well known type.");
- return false;
- }
- p->top->any_frame->before_type_url_start++;
- }
-
- if (json_parser_any_frame_has_value_after_type_url(p->top->any_frame)) {
- p->top->any_frame->after_type_url_start =
- memchr(p->top->any_frame->after_type_url_start, ':',
- (ptr + 1) -
- p->top->any_frame->after_type_url_start);
- if (p->top->any_frame->after_type_url_start == NULL) {
- upb_status_seterrmsg(p->status, "Invalid data for well known type.");
- return false;
- }
- p->top->any_frame->after_type_url_start++;
- packed_end = ptr;
- }
- }
-
- if (json_parser_any_frame_has_value_before_type_url(p->top->any_frame)) {
- if (!parse(p->top->any_frame->parser, NULL,
- p->top->any_frame->before_type_url_start,
- p->top->any_frame->before_type_url_end -
- p->top->any_frame->before_type_url_start, NULL)) {
- return false;
- }
- } else {
- if (!is_well_known_packed) {
- if (!parse(p->top->any_frame->parser, NULL, "{", 1, NULL)) {
- return false;
- }
- }
- }
-
- if (json_parser_any_frame_has_value_before_type_url(p->top->any_frame) &&
- json_parser_any_frame_has_value_after_type_url(p->top->any_frame)) {
- if (!parse(p->top->any_frame->parser, NULL, ",", 1, NULL)) {
- return false;
- }
- }
-
- if (json_parser_any_frame_has_value_after_type_url(p->top->any_frame)) {
- if (!parse(p->top->any_frame->parser, NULL,
- p->top->any_frame->after_type_url_start,
- packed_end - p->top->any_frame->after_type_url_start, NULL)) {
- return false;
- }
- } else {
- if (!is_well_known_packed) {
- if (!parse(p->top->any_frame->parser, NULL, "}", 1, NULL)) {
- return false;
- }
- }
- }
-
- if (!end(p->top->any_frame->parser, NULL)) {
- return false;
- }
-
- p->top->is_any = false;
-
- /* Set value */
- start_member(p);
- capture_begin(p, value_membername);
- capture_end(p, value_membername + 5);
- end_membername(p);
-
- if (!check_stack(p)) return false;
- inner = p->top + 1;
-
- sel = getsel_for_handlertype(p, UPB_HANDLER_STARTSTR);
- upb_sink_startstr(p->top->sink, sel, 0, &inner->sink);
- sel = getsel_for_handlertype(p, UPB_HANDLER_STRING);
- upb_sink_putstring(inner->sink, sel, p->top->any_frame->stringsink.ptr,
- p->top->any_frame->stringsink.len, NULL);
- sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
- upb_sink_endstr(inner->sink, sel);
-
- end_member(p);
-
- end_object(p);
-
- /* Deallocate any parse frame. */
- json_parser_any_frame_free(p->top->any_frame);
-
- return true;
-}
-
-static bool is_string_wrapper(const upb_msgdef *m) {
- upb_wellknowntype_t type = upb_msgdef_wellknowntype(m);
- return type == UPB_WELLKNOWN_STRINGVALUE ||
- type == UPB_WELLKNOWN_BYTESVALUE;
-}
-
-static bool is_fieldmask(const upb_msgdef *m) {
- upb_wellknowntype_t type = upb_msgdef_wellknowntype(m);
- return type == UPB_WELLKNOWN_FIELDMASK;
-}
-
-static void start_fieldmask_object(upb_json_parser *p) {
- const char *membername = "paths";
-
- start_object(p);
-
- /* Set up context for parsing value */
- start_member(p);
- capture_begin(p, membername);
- capture_end(p, membername + 5);
- end_membername(p);
-
- start_array(p);
-}
-
-static void end_fieldmask_object(upb_json_parser *p) {
- end_array(p);
- end_member(p);
- end_object(p);
-}
-
-static void start_wrapper_object(upb_json_parser *p) {
- const char *membername = "value";
-
- start_object(p);
-
- /* Set up context for parsing value */
- start_member(p);
- capture_begin(p, membername);
- capture_end(p, membername + 5);
- end_membername(p);
-}
-
-static void end_wrapper_object(upb_json_parser *p) {
- end_member(p);
- end_object(p);
-}
-
-static void start_value_object(upb_json_parser *p, int value_type) {
- const char *nullmember = "null_value";
- const char *numbermember = "number_value";
- const char *stringmember = "string_value";
- const char *boolmember = "bool_value";
- const char *structmember = "struct_value";
- const char *listmember = "list_value";
- const char *membername = "";
-
- switch (value_type) {
- case VALUE_NULLVALUE:
- membername = nullmember;
- break;
- case VALUE_NUMBERVALUE:
- membername = numbermember;
- break;
- case VALUE_STRINGVALUE:
- membername = stringmember;
- break;
- case VALUE_BOOLVALUE:
- membername = boolmember;
- break;
- case VALUE_STRUCTVALUE:
- membername = structmember;
- break;
- case VALUE_LISTVALUE:
- membername = listmember;
- break;
- }
-
- start_object(p);
-
- /* Set up context for parsing value */
- start_member(p);
- capture_begin(p, membername);
- capture_end(p, membername + strlen(membername));
- end_membername(p);
-}
-
-static void end_value_object(upb_json_parser *p) {
- end_member(p);
- end_object(p);
-}
-
-static void start_listvalue_object(upb_json_parser *p) {
- const char *membername = "values";
-
- start_object(p);
-
- /* Set up context for parsing value */
- start_member(p);
- capture_begin(p, membername);
- capture_end(p, membername + strlen(membername));
- end_membername(p);
-}
-
-static void end_listvalue_object(upb_json_parser *p) {
- end_member(p);
- end_object(p);
-}
-
-static void start_structvalue_object(upb_json_parser *p) {
- const char *membername = "fields";
-
- start_object(p);
-
- /* Set up context for parsing value */
- start_member(p);
- capture_begin(p, membername);
- capture_end(p, membername + strlen(membername));
- end_membername(p);
-}
-
-static void end_structvalue_object(upb_json_parser *p) {
- end_member(p);
- end_object(p);
-}
-
-static bool is_top_level(upb_json_parser *p) {
- return p->top == p->stack && p->top->f == NULL && !p->top->is_unknown_field;
-}
-
-static bool is_wellknown_msg(upb_json_parser *p, upb_wellknowntype_t type) {
- return p->top->m != NULL && upb_msgdef_wellknowntype(p->top->m) == type;
-}
-
-static bool is_wellknown_field(upb_json_parser *p, upb_wellknowntype_t type) {
- return p->top->f != NULL &&
- upb_fielddef_issubmsg(p->top->f) &&
- (upb_msgdef_wellknowntype(upb_fielddef_msgsubdef(p->top->f))
- == type);
-}
-
-static bool does_number_wrapper_start(upb_json_parser *p) {
- return p->top->f != NULL &&
- upb_fielddef_issubmsg(p->top->f) &&
- upb_msgdef_isnumberwrapper(upb_fielddef_msgsubdef(p->top->f));
-}
-
-static bool does_number_wrapper_end(upb_json_parser *p) {
- return p->top->m != NULL && upb_msgdef_isnumberwrapper(p->top->m);
-}
-
-static bool is_number_wrapper_object(upb_json_parser *p) {
- return p->top->m != NULL && upb_msgdef_isnumberwrapper(p->top->m);
-}
-
-static bool does_string_wrapper_start(upb_json_parser *p) {
- return p->top->f != NULL &&
- upb_fielddef_issubmsg(p->top->f) &&
- is_string_wrapper(upb_fielddef_msgsubdef(p->top->f));
-}
-
-static bool does_string_wrapper_end(upb_json_parser *p) {
- return p->top->m != NULL && is_string_wrapper(p->top->m);
-}
-
-static bool is_string_wrapper_object(upb_json_parser *p) {
- return p->top->m != NULL && is_string_wrapper(p->top->m);
-}
-
-static bool does_fieldmask_start(upb_json_parser *p) {
- return p->top->f != NULL &&
- upb_fielddef_issubmsg(p->top->f) &&
- is_fieldmask(upb_fielddef_msgsubdef(p->top->f));
-}
-
-static bool does_fieldmask_end(upb_json_parser *p) {
- return p->top->m != NULL && is_fieldmask(p->top->m);
-}
-
-#define CHECK_RETURN_TOP(x) if (!(x)) goto error
-
-
-/* The actual parser **********************************************************/
-
-/* What follows is the Ragel parser itself. The language is specified in Ragel
- * and the actions call our C functions above.
- *
- * Ragel has an extensive set of functionality, and we use only a small part of
- * it. There are many action types but we only use a few:
- *
- * ">" -- transition into a machine
- * "%" -- transition out of a machine
- * "@" -- transition into a final state of a machine.
- *
- * "@" transitions are tricky because a machine can transition into a final
- * state repeatedly. But in some cases we know this can't happen, for example
- * a string which is delimited by a final '"' can only transition into its
- * final state once, when the closing '"' is seen. */
-
-
-#line 2784 "upb/json/parser.rl"
-
-
-
-#line 2587 "upb/json/parser.c"
-static const char _json_actions[] = {
- 0, 1, 0, 1, 1, 1, 3, 1,
- 4, 1, 6, 1, 7, 1, 8, 1,
- 9, 1, 11, 1, 12, 1, 13, 1,
- 14, 1, 15, 1, 16, 1, 17, 1,
- 18, 1, 19, 1, 20, 1, 22, 1,
- 23, 1, 24, 1, 35, 1, 37, 1,
- 39, 1, 40, 1, 42, 1, 43, 1,
- 44, 1, 46, 1, 48, 1, 49, 1,
- 50, 1, 51, 1, 53, 1, 54, 2,
- 4, 9, 2, 5, 6, 2, 7, 3,
- 2, 7, 9, 2, 21, 26, 2, 25,
- 10, 2, 27, 28, 2, 29, 30, 2,
- 32, 34, 2, 33, 31, 2, 38, 36,
- 2, 40, 42, 2, 45, 2, 2, 46,
- 54, 2, 47, 36, 2, 49, 54, 2,
- 50, 54, 2, 51, 54, 2, 52, 41,
- 2, 53, 54, 3, 32, 34, 35, 4,
- 21, 26, 27, 28
-};
-
-static const short _json_key_offsets[] = {
- 0, 0, 12, 13, 18, 23, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 43, 44, 48, 53, 58, 63, 67,
- 71, 74, 77, 79, 83, 87, 89, 91,
- 96, 98, 100, 109, 115, 121, 127, 133,
- 135, 139, 142, 144, 146, 149, 150, 154,
- 156, 158, 160, 162, 163, 165, 167, 168,
- 170, 172, 173, 175, 177, 178, 180, 182,
- 183, 185, 187, 191, 193, 195, 196, 197,
- 198, 199, 201, 206, 208, 210, 212, 221,
- 222, 222, 222, 227, 232, 237, 238, 239,
- 240, 241, 241, 242, 243, 244, 244, 245,
- 246, 247, 247, 252, 253, 257, 262, 267,
- 272, 276, 276, 279, 282, 285, 288, 291,
- 294, 294, 294, 294, 294, 294
-};
-
-static const char _json_trans_keys[] = {
- 32, 34, 45, 91, 102, 110, 116, 123,
- 9, 13, 48, 57, 34, 32, 93, 125,
- 9, 13, 32, 44, 93, 9, 13, 32,
- 93, 125, 9, 13, 97, 108, 115, 101,
- 117, 108, 108, 114, 117, 101, 32, 34,
- 125, 9, 13, 34, 32, 58, 9, 13,
- 32, 93, 125, 9, 13, 32, 44, 125,
- 9, 13, 32, 44, 125, 9, 13, 32,
- 34, 9, 13, 45, 48, 49, 57, 48,
- 49, 57, 46, 69, 101, 48, 57, 69,
- 101, 48, 57, 43, 45, 48, 57, 48,
- 57, 48, 57, 46, 69, 101, 48, 57,
- 34, 92, 34, 92, 34, 47, 92, 98,
- 102, 110, 114, 116, 117, 48, 57, 65,
- 70, 97, 102, 48, 57, 65, 70, 97,
- 102, 48, 57, 65, 70, 97, 102, 48,
- 57, 65, 70, 97, 102, 34, 92, 45,
- 48, 49, 57, 48, 49, 57, 46, 115,
- 48, 57, 115, 48, 57, 34, 46, 115,
- 48, 57, 48, 57, 48, 57, 48, 57,
- 48, 57, 45, 48, 57, 48, 57, 45,
- 48, 57, 48, 57, 84, 48, 57, 48,
- 57, 58, 48, 57, 48, 57, 58, 48,
- 57, 48, 57, 43, 45, 46, 90, 48,
- 57, 48, 57, 58, 48, 48, 34, 48,
- 57, 43, 45, 90, 48, 57, 34, 44,
- 34, 44, 34, 44, 34, 45, 91, 102,
- 110, 116, 123, 48, 57, 34, 32, 93,
- 125, 9, 13, 32, 44, 93, 9, 13,
- 32, 93, 125, 9, 13, 97, 108, 115,
- 101, 117, 108, 108, 114, 117, 101, 32,
- 34, 125, 9, 13, 34, 32, 58, 9,
- 13, 32, 93, 125, 9, 13, 32, 44,
- 125, 9, 13, 32, 44, 125, 9, 13,
- 32, 34, 9, 13, 32, 9, 13, 32,
- 9, 13, 32, 9, 13, 32, 9, 13,
- 32, 9, 13, 32, 9, 13, 0
-};
-
-static const char _json_single_lengths[] = {
- 0, 8, 1, 3, 3, 3, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 1, 2, 3, 3, 3, 2, 2,
- 1, 3, 0, 2, 2, 0, 0, 3,
- 2, 2, 9, 0, 0, 0, 0, 2,
- 2, 1, 2, 0, 1, 1, 2, 0,
- 0, 0, 0, 1, 0, 0, 1, 0,
- 0, 1, 0, 0, 1, 0, 0, 1,
- 0, 0, 4, 0, 0, 1, 1, 1,
- 1, 0, 3, 2, 2, 2, 7, 1,
- 0, 0, 3, 3, 3, 1, 1, 1,
- 1, 0, 1, 1, 1, 0, 1, 1,
- 1, 0, 3, 1, 2, 3, 3, 3,
- 2, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0
-};
-
-static const char _json_range_lengths[] = {
- 0, 2, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 3, 3, 3, 3, 0,
- 1, 1, 0, 1, 1, 0, 1, 1,
- 1, 1, 1, 0, 1, 1, 0, 1,
- 1, 0, 1, 1, 0, 1, 1, 0,
- 1, 1, 0, 1, 1, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 1, 0,
- 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 0, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0
-};
-
-static const short _json_index_offsets[] = {
- 0, 0, 11, 13, 18, 23, 28, 30,
- 32, 34, 36, 38, 40, 42, 44, 46,
- 48, 53, 55, 59, 64, 69, 74, 78,
- 82, 85, 89, 91, 95, 99, 101, 103,
- 108, 111, 114, 124, 128, 132, 136, 140,
- 143, 147, 150, 153, 155, 158, 160, 164,
- 166, 168, 170, 172, 174, 176, 178, 180,
- 182, 184, 186, 188, 190, 192, 194, 196,
- 198, 200, 202, 207, 209, 211, 213, 215,
- 217, 219, 221, 226, 229, 232, 235, 244,
- 246, 247, 248, 253, 258, 263, 265, 267,
- 269, 271, 272, 274, 276, 278, 279, 281,
- 283, 285, 286, 291, 293, 297, 302, 307,
- 312, 316, 317, 320, 323, 326, 329, 332,
- 335, 336, 337, 338, 339, 340
-};
-
-static const unsigned char _json_indicies[] = {
- 0, 2, 3, 4, 5, 6, 7, 8,
- 0, 3, 1, 9, 1, 11, 12, 1,
- 11, 10, 13, 14, 12, 13, 1, 14,
- 1, 1, 14, 10, 15, 1, 16, 1,
- 17, 1, 18, 1, 19, 1, 20, 1,
- 21, 1, 22, 1, 23, 1, 24, 1,
- 25, 26, 27, 25, 1, 28, 1, 29,
- 30, 29, 1, 30, 1, 1, 30, 31,
- 32, 33, 34, 32, 1, 35, 36, 27,
- 35, 1, 36, 26, 36, 1, 37, 38,
- 39, 1, 38, 39, 1, 41, 42, 42,
- 40, 43, 1, 42, 42, 43, 40, 44,
- 44, 45, 1, 45, 1, 45, 40, 41,
- 42, 42, 39, 40, 47, 48, 46, 50,
- 51, 49, 52, 52, 52, 52, 52, 52,
- 52, 52, 53, 1, 54, 54, 54, 1,
- 55, 55, 55, 1, 56, 56, 56, 1,
- 57, 57, 57, 1, 59, 60, 58, 61,
- 62, 63, 1, 64, 65, 1, 66, 67,
- 1, 68, 1, 67, 68, 1, 69, 1,
- 66, 67, 65, 1, 70, 1, 71, 1,
- 72, 1, 73, 1, 74, 1, 75, 1,
- 76, 1, 77, 1, 78, 1, 79, 1,
- 80, 1, 81, 1, 82, 1, 83, 1,
- 84, 1, 85, 1, 86, 1, 87, 1,
- 88, 1, 89, 89, 90, 91, 1, 92,
- 1, 93, 1, 94, 1, 95, 1, 96,
- 1, 97, 1, 98, 1, 99, 99, 100,
- 98, 1, 102, 1, 101, 104, 105, 103,
- 1, 1, 101, 106, 107, 108, 109, 110,
- 111, 112, 107, 1, 113, 1, 114, 115,
- 117, 118, 1, 117, 116, 119, 120, 118,
- 119, 1, 120, 1, 1, 120, 116, 121,
- 1, 122, 1, 123, 1, 124, 1, 125,
- 126, 1, 127, 1, 128, 1, 129, 130,
- 1, 131, 1, 132, 1, 133, 134, 135,
- 136, 134, 1, 137, 1, 138, 139, 138,
- 1, 139, 1, 1, 139, 140, 141, 142,
- 143, 141, 1, 144, 145, 136, 144, 1,
- 145, 135, 145, 1, 146, 147, 147, 1,
- 148, 148, 1, 149, 149, 1, 150, 150,
- 1, 151, 151, 1, 152, 152, 1, 1,
- 1, 1, 1, 1, 1, 0
-};
-
-static const char _json_trans_targs[] = {
- 1, 0, 2, 107, 3, 6, 10, 13,
- 16, 106, 4, 3, 106, 4, 5, 7,
- 8, 9, 108, 11, 12, 109, 14, 15,
- 110, 16, 17, 111, 18, 18, 19, 20,
- 21, 22, 111, 21, 22, 24, 25, 31,
- 112, 26, 28, 27, 29, 30, 33, 113,
- 34, 33, 113, 34, 32, 35, 36, 37,
- 38, 39, 33, 113, 34, 41, 42, 46,
- 42, 46, 43, 45, 44, 114, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 73, 72, 68, 69, 70, 71,
- 72, 115, 74, 67, 72, 76, 116, 76,
- 116, 77, 79, 81, 82, 85, 90, 94,
- 98, 80, 117, 117, 83, 82, 80, 83,
- 84, 86, 87, 88, 89, 117, 91, 92,
- 93, 117, 95, 96, 97, 117, 98, 99,
- 105, 100, 100, 101, 102, 103, 104, 105,
- 103, 104, 117, 106, 106, 106, 106, 106,
- 106
-};
-
-static const unsigned char _json_trans_actions[] = {
- 0, 0, 113, 107, 53, 0, 0, 0,
- 125, 59, 45, 0, 55, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 101, 51, 47, 0, 0, 45,
- 49, 49, 104, 0, 0, 0, 0, 0,
- 3, 0, 0, 0, 0, 0, 5, 15,
- 0, 0, 71, 7, 13, 0, 74, 9,
- 9, 9, 77, 80, 11, 37, 37, 37,
- 0, 0, 0, 39, 0, 41, 86, 0,
- 0, 0, 17, 19, 0, 21, 23, 0,
- 25, 27, 0, 29, 31, 0, 33, 35,
- 0, 135, 83, 135, 0, 0, 0, 0,
- 0, 92, 0, 89, 89, 98, 43, 0,
- 131, 95, 113, 107, 53, 0, 0, 0,
- 125, 59, 69, 110, 45, 0, 55, 0,
- 0, 0, 0, 0, 0, 119, 0, 0,
- 0, 122, 0, 0, 0, 116, 0, 101,
- 51, 47, 0, 0, 45, 49, 49, 104,
- 0, 0, 128, 0, 57, 63, 65, 61,
- 67
-};
-
-static const unsigned char _json_eof_actions[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 1, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 57, 63, 65, 61, 67,
- 0, 0, 0, 0, 0, 0
-};
-
-static const int json_start = 1;
-
-static const int json_en_number_machine = 23;
-static const int json_en_string_machine = 32;
-static const int json_en_duration_machine = 40;
-static const int json_en_timestamp_machine = 47;
-static const int json_en_fieldmask_machine = 75;
-static const int json_en_value_machine = 78;
-static const int json_en_main = 1;
-
-
-#line 2787 "upb/json/parser.rl"
-
-size_t parse(void *closure, const void *hd, const char *buf, size_t size,
- const upb_bufhandle *handle) {
- upb_json_parser *parser = closure;
-
- /* Variables used by Ragel's generated code. */
- int cs = parser->current_state;
- int *stack = parser->parser_stack;
- int top = parser->parser_top;
-
- const char *p = buf;
- const char *pe = buf + size;
- const char *eof = &eof_ch;
-
- parser->handle = handle;
-
- UPB_UNUSED(hd);
- UPB_UNUSED(handle);
-
- capture_resume(parser, buf);
-
-
-#line 2865 "upb/json/parser.c"
- {
- int _klen;
- unsigned int _trans;
- const char *_acts;
- unsigned int _nacts;
- const char *_keys;
-
- if ( p == pe )
- goto _test_eof;
- if ( cs == 0 )
- goto _out;
-_resume:
- _keys = _json_trans_keys + _json_key_offsets[cs];
- _trans = _json_index_offsets[cs];
-
- _klen = _json_single_lengths[cs];
- if ( _klen > 0 ) {
- const char *_lower = _keys;
- const char *_mid;
- const char *_upper = _keys + _klen - 1;
- while (1) {
- if ( _upper < _lower )
- break;
-
- _mid = _lower + ((_upper-_lower) >> 1);
- if ( (*p) < *_mid )
- _upper = _mid - 1;
- else if ( (*p) > *_mid )
- _lower = _mid + 1;
- else {
- _trans += (unsigned int)(_mid - _keys);
- goto _match;
- }
- }
- _keys += _klen;
- _trans += _klen;
- }
-
- _klen = _json_range_lengths[cs];
- if ( _klen > 0 ) {
- const char *_lower = _keys;
- const char *_mid;
- const char *_upper = _keys + (_klen<<1) - 2;
- while (1) {
- if ( _upper < _lower )
- break;
-
- _mid = _lower + (((_upper-_lower) >> 1) & ~1);
- if ( (*p) < _mid[0] )
- _upper = _mid - 2;
- else if ( (*p) > _mid[1] )
- _lower = _mid + 2;
- else {
- _trans += (unsigned int)((_mid - _keys)>>1);
- goto _match;
- }
- }
- _trans += _klen;
- }
-
-_match:
- _trans = _json_indicies[_trans];
- cs = _json_trans_targs[_trans];
-
- if ( _json_trans_actions[_trans] == 0 )
- goto _again;
-
- _acts = _json_actions + _json_trans_actions[_trans];
- _nacts = (unsigned int) *_acts++;
- while ( _nacts-- > 0 )
- {
- switch ( *_acts++ )
- {
- case 1:
-#line 2592 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
- case 2:
-#line 2594 "upb/json/parser.rl"
- { p--; {stack[top++] = cs; cs = 23;goto _again;} }
- break;
- case 3:
-#line 2598 "upb/json/parser.rl"
- { start_text(parser, p); }
- break;
- case 4:
-#line 2599 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_text(parser, p)); }
- break;
- case 5:
-#line 2605 "upb/json/parser.rl"
- { start_hex(parser); }
- break;
- case 6:
-#line 2606 "upb/json/parser.rl"
- { hexdigit(parser, p); }
- break;
- case 7:
-#line 2607 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_hex(parser)); }
- break;
- case 8:
-#line 2613 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(escape(parser, p)); }
- break;
- case 9:
-#line 2619 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
- case 10:
-#line 2624 "upb/json/parser.rl"
- { start_year(parser, p); }
- break;
- case 11:
-#line 2625 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_year(parser, p)); }
- break;
- case 12:
-#line 2629 "upb/json/parser.rl"
- { start_month(parser, p); }
- break;
- case 13:
-#line 2630 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_month(parser, p)); }
- break;
- case 14:
-#line 2634 "upb/json/parser.rl"
- { start_day(parser, p); }
- break;
- case 15:
-#line 2635 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_day(parser, p)); }
- break;
- case 16:
-#line 2639 "upb/json/parser.rl"
- { start_hour(parser, p); }
- break;
- case 17:
-#line 2640 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_hour(parser, p)); }
- break;
- case 18:
-#line 2644 "upb/json/parser.rl"
- { start_minute(parser, p); }
- break;
- case 19:
-#line 2645 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_minute(parser, p)); }
- break;
- case 20:
-#line 2649 "upb/json/parser.rl"
- { start_second(parser, p); }
- break;
- case 21:
-#line 2650 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_second(parser, p)); }
- break;
- case 22:
-#line 2655 "upb/json/parser.rl"
- { start_duration_base(parser, p); }
- break;
- case 23:
-#line 2656 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_duration_base(parser, p)); }
- break;
- case 24:
-#line 2658 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
- case 25:
-#line 2663 "upb/json/parser.rl"
- { start_timestamp_base(parser); }
- break;
- case 26:
-#line 2665 "upb/json/parser.rl"
- { start_timestamp_fraction(parser, p); }
- break;
- case 27:
-#line 2666 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_timestamp_fraction(parser, p)); }
- break;
- case 28:
-#line 2668 "upb/json/parser.rl"
- { start_timestamp_zone(parser, p); }
- break;
- case 29:
-#line 2669 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_timestamp_zone(parser, p)); }
- break;
- case 30:
-#line 2671 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
- case 31:
-#line 2676 "upb/json/parser.rl"
- { start_fieldmask_path_text(parser, p); }
- break;
- case 32:
-#line 2677 "upb/json/parser.rl"
- { end_fieldmask_path_text(parser, p); }
- break;
- case 33:
-#line 2682 "upb/json/parser.rl"
- { start_fieldmask_path(parser); }
- break;
- case 34:
-#line 2683 "upb/json/parser.rl"
- { end_fieldmask_path(parser); }
- break;
- case 35:
-#line 2689 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
- case 36:
-#line 2694 "upb/json/parser.rl"
- {
- if (is_wellknown_msg(parser, UPB_WELLKNOWN_TIMESTAMP)) {
- {stack[top++] = cs; cs = 47;goto _again;}
- } else if (is_wellknown_msg(parser, UPB_WELLKNOWN_DURATION)) {
- {stack[top++] = cs; cs = 40;goto _again;}
- } else if (is_wellknown_msg(parser, UPB_WELLKNOWN_FIELDMASK)) {
- {stack[top++] = cs; cs = 75;goto _again;}
- } else {
- {stack[top++] = cs; cs = 32;goto _again;}
- }
- }
- break;
- case 37:
-#line 2707 "upb/json/parser.rl"
- { p--; {stack[top++] = cs; cs = 78;goto _again;} }
- break;
- case 38:
-#line 2712 "upb/json/parser.rl"
- {
- if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) {
- start_any_member(parser, p);
- } else {
- start_member(parser);
- }
- }
- break;
- case 39:
-#line 2719 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_membername(parser)); }
- break;
- case 40:
-#line 2722 "upb/json/parser.rl"
- {
- if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) {
- end_any_member(parser, p);
- } else {
- end_member(parser);
- }
- }
- break;
- case 41:
-#line 2733 "upb/json/parser.rl"
- {
- if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) {
- start_any_object(parser, p);
- } else {
- start_object(parser);
- }
- }
- break;
- case 42:
-#line 2742 "upb/json/parser.rl"
- {
- if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) {
- CHECK_RETURN_TOP(end_any_object(parser, p));
- } else {
- end_object(parser);
- }
- }
- break;
- case 43:
-#line 2754 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(start_array(parser)); }
- break;
- case 44:
-#line 2758 "upb/json/parser.rl"
- { end_array(parser); }
- break;
- case 45:
-#line 2763 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(start_number(parser, p)); }
- break;
- case 46:
-#line 2764 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_number(parser, p)); }
- break;
- case 47:
-#line 2766 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(start_stringval(parser)); }
- break;
- case 48:
-#line 2767 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_stringval(parser)); }
- break;
- case 49:
-#line 2769 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_bool(parser, true)); }
- break;
- case 50:
-#line 2771 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_bool(parser, false)); }
- break;
- case 51:
-#line 2773 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_null(parser)); }
- break;
- case 52:
-#line 2775 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(start_subobject_full(parser)); }
- break;
- case 53:
-#line 2776 "upb/json/parser.rl"
- { end_subobject_full(parser); }
- break;
- case 54:
-#line 2781 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; goto _again;} }
- break;
-#line 3189 "upb/json/parser.c"
- }
- }
-
-_again:
- if ( cs == 0 )
- goto _out;
- if ( ++p != pe )
- goto _resume;
- _test_eof: {}
- if ( p == eof )
- {
- const char *__acts = _json_actions + _json_eof_actions[cs];
- unsigned int __nacts = (unsigned int) *__acts++;
- while ( __nacts-- > 0 ) {
- switch ( *__acts++ ) {
- case 0:
-#line 2590 "upb/json/parser.rl"
- { p--; {cs = stack[--top]; if ( p == pe )
- goto _test_eof;
-goto _again;} }
- break;
- case 46:
-#line 2764 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_number(parser, p)); }
- break;
- case 49:
-#line 2769 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_bool(parser, true)); }
- break;
- case 50:
-#line 2771 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_bool(parser, false)); }
- break;
- case 51:
-#line 2773 "upb/json/parser.rl"
- { CHECK_RETURN_TOP(end_null(parser)); }
- break;
- case 53:
-#line 2776 "upb/json/parser.rl"
- { end_subobject_full(parser); }
- break;
-#line 3231 "upb/json/parser.c"
- }
- }
- }
-
- _out: {}
- }
-
-#line 2809 "upb/json/parser.rl"
-
- if (p != pe) {
- upb_status_seterrf(parser->status, "Parse error at '%.*s'\n", pe - p, p);
- } else {
- capture_suspend(parser, &p);
- }
-
-error:
- /* Save parsing state back to parser. */
- parser->current_state = cs;
- parser->parser_top = top;
-
- return p - buf;
-}
-
-static bool end(void *closure, const void *hd) {
- upb_json_parser *parser = closure;
-
- /* Prevent compile warning on unused static constants. */
- UPB_UNUSED(json_start);
- UPB_UNUSED(json_en_duration_machine);
- UPB_UNUSED(json_en_fieldmask_machine);
- UPB_UNUSED(json_en_number_machine);
- UPB_UNUSED(json_en_string_machine);
- UPB_UNUSED(json_en_timestamp_machine);
- UPB_UNUSED(json_en_value_machine);
- UPB_UNUSED(json_en_main);
-
- parse(parser, hd, &eof_ch, 0, NULL);
-
- return parser->current_state >= 106;
-}
-
-static void json_parser_reset(upb_json_parser *p) {
- int cs;
- int top;
-
- p->top = p->stack;
- init_frame(p->top);
-
- /* Emit Ragel initialization of the parser. */
-
-#line 3282 "upb/json/parser.c"
- {
- cs = json_start;
- top = 0;
- }
-
-#line 2851 "upb/json/parser.rl"
- p->current_state = cs;
- p->parser_top = top;
- accumulate_clear(p);
- p->multipart_state = MULTIPART_INACTIVE;
- p->capture = NULL;
- p->accumulated = NULL;
-}
-
-static upb_json_parsermethod *parsermethod_new(upb_json_codecache *c,
- const upb_msgdef *md) {
- int i, n;
- upb_alloc *alloc = upb_arena_alloc(c->arena);
-
- upb_json_parsermethod *m = upb_malloc(alloc, sizeof(*m));
-
- m->cache = c;
-
- upb_byteshandler_init(&m->input_handler_);
- upb_byteshandler_setstring(&m->input_handler_, parse, m);
- upb_byteshandler_setendstr(&m->input_handler_, end, m);
-
- upb_strtable_init2(&m->name_table, UPB_CTYPE_CONSTPTR, 4, alloc);
-
- /* Build name_table */
-
- n = upb_msgdef_fieldcount(md);
- for(i = 0; i < n; i++) {
- const upb_fielddef *f = upb_msgdef_field(md, i);
- upb_value v = upb_value_constptr(f);
- const char *name;
-
- /* Add an entry for the JSON name. */
- name = upb_fielddef_jsonname(f);
- upb_strtable_insert3(&m->name_table, name, strlen(name), v, alloc);
-
- if (strcmp(name, upb_fielddef_name(f)) != 0) {
- /* Since the JSON name is different from the regular field name, add an
- * entry for the raw name (compliant proto3 JSON parsers must accept
- * both). */
- const char *name = upb_fielddef_name(f);
- upb_strtable_insert3(&m->name_table, name, strlen(name), v, alloc);
- }
- }
-
- return m;
-}
-
-/* Public API *****************************************************************/
-
-upb_json_parser *upb_json_parser_create(upb_arena *arena,
- const upb_json_parsermethod *method,
- const upb_symtab* symtab,
- upb_sink output,
- upb_status *status,
- bool ignore_json_unknown) {
- upb_json_parser *p = upb_arena_malloc(arena, sizeof(upb_json_parser));
- if (!p) return false;
-
- p->arena = arena;
- p->method = method;
- p->status = status;
- p->limit = p->stack + UPB_JSON_MAX_DEPTH;
- p->accumulate_buf = NULL;
- p->accumulate_buf_size = 0;
- upb_bytessink_reset(&p->input_, &method->input_handler_, p);
-
- json_parser_reset(p);
- p->top->sink = output;
- p->top->m = upb_handlers_msgdef(output.handlers);
- if (is_wellknown_msg(p, UPB_WELLKNOWN_ANY)) {
- p->top->is_any = true;
- p->top->any_frame = json_parser_any_frame_new(p);
- } else {
- p->top->is_any = false;
- p->top->any_frame = NULL;
- }
- set_name_table(p, p->top);
- p->symtab = symtab;
-
- p->ignore_json_unknown = ignore_json_unknown;
-
- return p;
-}
-
-upb_bytessink upb_json_parser_input(upb_json_parser *p) {
- return p->input_;
-}
-
-const upb_byteshandler *upb_json_parsermethod_inputhandler(
- const upb_json_parsermethod *m) {
- return &m->input_handler_;
-}
-
-upb_json_codecache *upb_json_codecache_new(void) {
- upb_alloc *alloc;
- upb_json_codecache *c;
-
- c = upb_gmalloc(sizeof(*c));
-
- c->arena = upb_arena_new();
- alloc = upb_arena_alloc(c->arena);
-
- upb_inttable_init2(&c->methods, UPB_CTYPE_CONSTPTR, alloc);
-
- return c;
-}
-
-void upb_json_codecache_free(upb_json_codecache *c) {
- upb_arena_free(c->arena);
- upb_gfree(c);
-}
-
-const upb_json_parsermethod *upb_json_codecache_get(upb_json_codecache *c,
- const upb_msgdef *md) {
- upb_json_parsermethod *m;
- upb_value v;
- int i, n;
- upb_alloc *alloc = upb_arena_alloc(c->arena);
-
- if (upb_inttable_lookupptr(&c->methods, md, &v)) {
- return upb_value_getconstptr(v);
- }
-
- m = parsermethod_new(c, md);
- v = upb_value_constptr(m);
-
- if (!m) return NULL;
- if (!upb_inttable_insertptr2(&c->methods, md, v, alloc)) return NULL;
-
- /* Populate parser methods for all submessages, so the name tables will
- * be available during parsing. */
- n = upb_msgdef_fieldcount(md);
- for(i = 0; i < n; i++) {
- const upb_fielddef *f = upb_msgdef_field(md, i);
-
- if (upb_fielddef_issubmsg(f)) {
- const upb_msgdef *subdef = upb_fielddef_msgsubdef(f);
- const upb_json_parsermethod *sub_method =
- upb_json_codecache_get(c, subdef);
-
- if (!sub_method) return NULL;
- }
- }
-
- return m;
-}
diff --git a/third_party/upb/examples/bazel/BUILD b/third_party/upb/examples/bazel/BUILD
index 97119252e27..15b59af906f 100644
--- a/third_party/upb/examples/bazel/BUILD
+++ b/third_party/upb/examples/bazel/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library")
diff --git a/third_party/upb/examples/bazel/test_binary.c b/third_party/upb/examples/bazel/test_binary.c
index 98617cf0202..a4277c3e404 100644
--- a/third_party/upb/examples/bazel/test_binary.c
+++ b/third_party/upb/examples/bazel/test_binary.c
@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2009-2021, Google LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Google LLC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include
diff --git a/third_party/upb/kokoro/ubuntu/build.sh b/third_party/upb/kokoro/ubuntu/build.sh
index c95ee88d462..64536f640b7 100644
--- a/third_party/upb/kokoro/ubuntu/build.sh
+++ b/third_party/upb/kokoro/ubuntu/build.sh
@@ -1,10 +1,35 @@
-#!/bin/bash
+#!/bin/bash -eu
+#
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -ex
# Install the latest version of Bazel.
if [ -x "$(command -v use_bazel.sh)" ]; then
- use_bazel.sh latest
+ use_bazel.sh 4.1.0
fi
# Verify/query CMake
diff --git a/third_party/upb/tests/BUILD b/third_party/upb/tests/BUILD
index ad12fce14ab..017c9b7f6c1 100644
--- a/third_party/upb/tests/BUILD
+++ b/third_party/upb/tests/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
"//bazel:build_defs.bzl",
"UPB_DEFAULT_COPTS",
@@ -24,12 +49,10 @@ cc_library(
"testmain.cc",
],
hdrs = [
- "test_util.h",
"upb_test.h",
],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
- "//:handlers",
"//:port",
"//:upb",
],
@@ -76,32 +99,6 @@ upb_proto_library(
deps = ["@com_google_protobuf//:test_messages_proto3_proto"],
)
-proto_library(
- name = "test_decoder_proto",
- srcs = [
- "pb/test_decoder.proto",
- ],
-)
-
-upb_proto_reflection_library(
- name = "test_decoder_upb_proto",
- deps = [":test_decoder_proto"],
-)
-
-cc_test(
- name = "test_decoder",
- srcs = ["pb/test_decoder.cc"],
- copts = UPB_DEFAULT_CPPOPTS,
- deps = [
- ":test_decoder_upb_proto",
- ":upb_test",
- "//:handlers",
- "//:port",
- "//:upb",
- "//:upb_pb",
- ],
-)
-
proto_library(
name = "test_cpp_proto",
srcs = [
@@ -109,23 +106,28 @@ proto_library(
],
)
-upb_proto_reflection_library(
+upb_proto_library(
name = "test_cpp_upb_proto",
deps = ["test_cpp_proto"],
)
+upb_proto_reflection_library(
+ name = "test_cpp_upb_proto_reflection",
+ deps = ["test_cpp_proto"],
+)
+
cc_test(
name = "test_cpp",
srcs = ["test_cpp.cc"],
copts = UPB_DEFAULT_CPPOPTS,
deps = [
":test_cpp_upb_proto",
+ ":test_cpp_upb_proto_reflection",
":upb_test",
- "//:handlers",
+ "//:json",
"//:port",
"//:reflection",
"//:upb",
- "//:upb_pb",
],
)
@@ -160,61 +162,6 @@ cc_binary(
],
)
-# copybara:strip_for_google3_begin
-cc_test(
- name = "test_encoder",
- srcs = ["pb/test_encoder.cc"],
- copts = UPB_DEFAULT_CPPOPTS,
- deps = [
- ":upb_test",
- "//:descriptor_upb_proto",
- "//:descriptor_upb_proto_reflection",
- "//:upb",
- "//:upb_pb",
- ],
-)
-
-proto_library(
- name = "test_json_enum_from_separate",
- srcs = ["json/enum_from_separate_file.proto"],
- deps = [":test_json_proto"],
-)
-
-proto_library(
- name = "test_json_proto",
- srcs = ["json/test.proto"],
-)
-
-upb_proto_reflection_library(
- name = "test_json_upb_proto_reflection",
- deps = ["test_json_proto"],
-)
-
-upb_proto_library(
- name = "test_json_enum_from_separate_upb_proto",
- deps = [":test_json_enum_from_separate"],
-)
-
-upb_proto_library(
- name = "test_json_upb_proto",
- deps = [":test_json_proto"],
-)
-
-cc_test(
- name = "test_json",
- srcs = [
- "json/test_json.cc",
- ],
- copts = UPB_DEFAULT_CPPOPTS,
- deps = [
- ":test_json_upb_proto",
- ":test_json_upb_proto_reflection",
- ":upb_test",
- "//:upb_json",
- ],
-)
-# copybara:strip_end
-
upb_proto_library(
name = "conformance_proto_upb",
testonly = 1,
diff --git a/third_party/upb/tests/bindings/lua/BUILD b/third_party/upb/tests/bindings/lua/BUILD
index a065b1df55a..5a4f805178d 100644
--- a/third_party/upb/tests/bindings/lua/BUILD
+++ b/third_party/upb/tests/bindings/lua/BUILD
@@ -1,3 +1,28 @@
+# Copyright (c) 2009-2021, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google LLC nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
load(
"//upb/bindings/lua:lua_proto_library.bzl",
"lua_proto_library",
@@ -37,6 +62,7 @@ proto_library(
name = "test_proto",
testonly = 1,
srcs = ["test.proto"],
+ deps = ["@com_google_protobuf//:timestamp_proto"],
)
lua_proto_library(
diff --git a/third_party/upb/tests/bindings/lua/main.c b/third_party/upb/tests/bindings/lua/main.c
index 6e48ccaf24d..40f72a2a191 100644
--- a/third_party/upb/tests/bindings/lua/main.c
+++ b/third_party/upb/tests/bindings/lua/main.c
@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2009-2021, Google LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Google LLC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include
#include
diff --git a/third_party/upb/tests/bindings/lua/test.proto b/third_party/upb/tests/bindings/lua/test.proto
index 6b453502089..4c3b64edb5b 100644
--- a/third_party/upb/tests/bindings/lua/test.proto
+++ b/third_party/upb/tests/bindings/lua/test.proto
@@ -1,6 +1,8 @@
syntax = "proto2";
+import "google/protobuf/timestamp.proto";
+
package upb_test;
message MapTest {
@@ -26,3 +28,7 @@ message UnpackedTest {
message TestLargeFieldNumber {
optional int32 i32 = 456214797;
}
+
+message TestTimestamp {
+ optional google.protobuf.Timestamp ts = 1;
+}
diff --git a/third_party/upb/tests/bindings/lua/test_upb.lua b/third_party/upb/tests/bindings/lua/test_upb.lua
index e2d53450baf..98468970e8d 100644
--- a/third_party/upb/tests/bindings/lua/test_upb.lua
+++ b/third_party/upb/tests/bindings/lua/test_upb.lua
@@ -1,3 +1,31 @@
+--[[--------------------------------------------------------------------------
+
+ Copyright (c) 2009-2021, Google LLC
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Google LLC nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--]]--------------------------------------------------------------------------
local upb = require "lupb"
local lunit = require "lunit"
@@ -321,6 +349,16 @@ function test_msg_array()
assert_error_match("array expected", function() msg.repeated_int32 = print end)
end
+function test_array_append()
+ local arr = upb.Array(upb.TYPE_INT32)
+ for i=1,200000 do
+ arr[i] = i
+ end
+ for i=1,200000 do
+ assert_equal(i, arr[i])
+ end
+end
+
function test_msg_submsg()
--msg = test_messages_proto3.TestAllTypesProto3()
msg = test_messages_proto3['TestAllTypesProto3']()
@@ -679,6 +717,15 @@ function test_descriptor_error()
assert_nil(symtab:lookup_msg("ABC"))
end
+function test_duplicate_filename_error()
+ local symtab = upb.SymbolTable()
+ local file = descriptor.FileDescriptorProto()
+ file.name = "test.proto"
+ symtab:add_file(upb.encode(file))
+ -- Second add with the same filename fails.
+ assert_error(function () symtab:add_file(upb.encode(file)) end)
+end
+
function test_encode_skipunknown()
-- Test that upb.ENCODE_SKIPUNKNOWN does not encode unknown fields.
local msg = test_messages_proto3.TestAllTypesProto3{
@@ -700,6 +747,17 @@ function test_json_emit_defaults()
local json = upb.json_encode(msg, {upb.JSONENC_EMITDEFAULTS})
end
+function test_json_locale()
+ local msg = test_messages_proto3.TestAllTypesProto3()
+ msg.optional_double = 1.1
+ local original_locale = os.setlocale(nil)
+ os.setlocale("C")
+ local json = upb.json_encode(msg)
+ os.setlocale("de_DE.utf8")
+ assert_equal(json, upb.json_encode(msg))
+ os.setlocale(original_locale) -- Restore.
+end
+
function test_encode_depth_limit()
local msg = test_messages_proto3.TestAllTypesProto3()
msg.recursive_message = msg
@@ -714,6 +772,11 @@ function test_large_field_number()
assert_equal(msg.i32, msg2.i32)
end
+function test_timestamp_minutes()
+ local msg = upb.json_decode(upb_test.TestTimestamp, '{"ts": "2000-01-01T00:00:00-06:59"}')
+ assert_equal(msg.ts.seconds, 946684800 + ((6 * 60) + 59) * 60)
+end
+
function test_gc()
local top = test_messages_proto3.TestAllTypesProto3()
local n = 100
diff --git a/third_party/upb/tests/conformance_upb.c b/third_party/upb/tests/conformance_upb.c
index f444180b199..12c7f1f469a 100644
--- a/third_party/upb/tests/conformance_upb.c
+++ b/third_party/upb/tests/conformance_upb.c
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 2009-2021, Google LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Google LLC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
/* This is a upb implementation of the upb conformance tests, see:
* https://github.com/google/protobuf/tree/master/conformance
*/
diff --git a/third_party/upb/tests/corpus/temp.cc b/third_party/upb/tests/corpus/temp.cc
index 2bf1160ce69..c8f2691a94a 100644
--- a/third_party/upb/tests/corpus/temp.cc
+++ b/third_party/upb/tests/corpus/temp.cc
@@ -1 +1,26 @@
+// Copyright (c) 2009-2021, Google LLC
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Google LLC nor the
+// names of its contributors may be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
// Hello World
diff --git a/third_party/upb/tests/file_descriptor_parsenew_fuzzer.cc b/third_party/upb/tests/file_descriptor_parsenew_fuzzer.cc
index 966a468063a..55fff0408c0 100644
--- a/third_party/upb/tests/file_descriptor_parsenew_fuzzer.cc
+++ b/third_party/upb/tests/file_descriptor_parsenew_fuzzer.cc
@@ -1,3 +1,28 @@
+// Copyright (c) 2009-2021, Google LLC
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Google LLC nor the
+// names of its contributors may be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
#include
#include "google/protobuf/descriptor.upb.h"
diff --git a/third_party/upb/tests/json/enum_from_separate_file.proto b/third_party/upb/tests/json/enum_from_separate_file.proto
deleted file mode 100644
index ceb9b42aa1c..00000000000
--- a/third_party/upb/tests/json/enum_from_separate_file.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto2";
-
-import "tests/json/test.proto";
-
-package upb.test.json;
-
-message ImportEnum {
- optional MyEnum e = 1;
-}
diff --git a/third_party/upb/tests/json/test.proto b/third_party/upb/tests/json/test.proto
deleted file mode 100644
index 2db0388d778..00000000000
--- a/third_party/upb/tests/json/test.proto
+++ /dev/null
@@ -1,47 +0,0 @@
-syntax = "proto3";
-
-package upb.test.json;
-
-message TestMessage {
- int32 optional_int32 = 1;
- int64 optional_int64 = 2;
- int32 optional_uint32 = 3;
- int64 optional_uint64 = 4;
- string optional_string = 5;
- bytes optional_bytes = 6;
- bool optional_bool = 7;
- SubMessage optional_msg = 8;
- MyEnum optional_enum = 9;
-
- repeated int32 repeated_int32 = 11;
- repeated int64 repeated_int64 = 12;
- repeated uint32 repeated_uint32 = 13;
- repeated uint64 repeated_uint64 = 14;
- repeated string repeated_string = 15;
- repeated bytes repeated_bytes = 16;
- repeated bool repeated_bool = 17;
- repeated SubMessage repeated_msg = 18;
- repeated MyEnum repeated_enum = 19;
-
- map map_string_string = 20;
- map map_int32_string = 21;
- map map_bool_string = 22;
- map map_string_int32 = 23;
- map map_string_bool = 24;
- map map_string_msg = 25;
-
- oneof o {
- int32 oneof_int32 = 26;
- int64 oneof_int64 = 27;
- }
-}
-
-message SubMessage {
- int32 foo = 1;
-}
-
-enum MyEnum {
- A = 0;
- B = 1;
- C = 2;
-}
diff --git a/third_party/upb/tests/json/test.proto.pb b/third_party/upb/tests/json/test.proto.pb
deleted file mode 100644
index 94b8b92e616..00000000000
Binary files a/third_party/upb/tests/json/test.proto.pb and /dev/null differ
diff --git a/third_party/upb/tests/json/test_json.cc b/third_party/upb/tests/json/test_json.cc
deleted file mode 100644
index 18ab07fe50a..00000000000
--- a/third_party/upb/tests/json/test_json.cc
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- *
- * A set of tests for JSON parsing and serialization.
- */
-
-#include
-
-#include "tests/json/test.upb.h" // Test that it compiles for C++.
-#include "tests/json/test.upbdefs.h"
-#include "tests/test_util.h"
-#include "tests/upb_test.h"
-#include "upb/def.hpp"
-#include "upb/handlers.h"
-#include "upb/json/parser.h"
-#include "upb/json/printer.h"
-#include "upb/port_def.inc"
-#include "upb/upb.h"
-
-// Macros for readability in test case list: allows us to give TEST("...") /
-// EXPECT("...") pairs.
-#define TEST(x) x
-#define EXPECT_SAME NULL
-#define EXPECT(x) x
-#define TEST_SENTINEL { NULL, NULL }
-
-struct TestCase {
- const char* input;
- const char* expected;
-};
-
-bool verbose = false;
-
-static TestCase kTestRoundtripMessages[] = {
- // Test most fields here.
- {
- TEST("{\"optionalInt32\":-42,\"optionalString\":\"Test\\u0001Message\","
- "\"optionalMsg\":{\"foo\":42},"
- "\"optionalBool\":true,\"repeatedMsg\":[{\"foo\":1},"
- "{\"foo\":2}]}"),
- EXPECT_SAME
- },
- // We must also recognize raw proto names.
- {
- TEST("{\"optional_int32\":-42,\"optional_string\":\"Test\\u0001Message\","
- "\"optional_msg\":{\"foo\":42},"
- "\"optional_bool\":true,\"repeated_msg\":[{\"foo\":1},"
- "{\"foo\":2}]}"),
- EXPECT("{\"optionalInt32\":-42,\"optionalString\":\"Test\\u0001Message\","
- "\"optionalMsg\":{\"foo\":42},"
- "\"optionalBool\":true,\"repeatedMsg\":[{\"foo\":1},"
- "{\"foo\":2}]}")
- },
- // Test special escapes in strings.
- {
- TEST("{\"repeatedString\":[\"\\b\",\"\\r\",\"\\n\",\"\\f\",\"\\t\","
- "\"\uFFFF\"]}"),
- EXPECT_SAME
- },
- // Test enum symbolic names.
- {
- // The common case: parse and print the symbolic name.
- TEST("{\"optionalEnum\":\"A\"}"),
- EXPECT_SAME
- },
- {
- // Unknown enum value: will be printed as an integer.
- TEST("{\"optionalEnum\":42}"),
- EXPECT_SAME
- },
- {
- // Known enum value: we're happy to parse an integer but we will re-emit the
- // symbolic name.
- TEST("{\"optionalEnum\":1}"),
- EXPECT("{\"optionalEnum\":\"B\"}")
- },
- // UTF-8 tests: escapes -> literal UTF8 in output.
- {
- // Note double escape on \uXXXX: we want the escape to be processed by the
- // JSON parser, not by the C++ compiler!
- TEST("{\"optionalString\":\"\\u007F\"}"),
- EXPECT("{\"optionalString\":\"\x7F\"}")
- },
- {
- TEST("{\"optionalString\":\"\\u0080\"}"),
- EXPECT("{\"optionalString\":\"\xC2\x80\"}")
- },
- {
- TEST("{\"optionalString\":\"\\u07FF\"}"),
- EXPECT("{\"optionalString\":\"\xDF\xBF\"}")
- },
- {
- TEST("{\"optionalString\":\"\\u0800\"}"),
- EXPECT("{\"optionalString\":\"\xE0\xA0\x80\"}")
- },
- {
- TEST("{\"optionalString\":\"\\uFFFF\"}"),
- EXPECT("{\"optionalString\":\"\xEF\xBF\xBF\"}")
- },
- // map-field tests
- {
- TEST("{\"mapStringString\":{\"a\":\"value1\",\"b\":\"value2\","
- "\"c\":\"value3\"}}"),
- EXPECT_SAME
- },
- {
- TEST("{\"mapInt32String\":{\"1\":\"value1\",\"-1\":\"value2\","
- "\"1234\":\"value3\"}}"),
- EXPECT_SAME
- },
- {
- TEST("{\"mapBoolString\":{\"false\":\"value1\",\"true\":\"value2\"}}"),
- EXPECT_SAME
- },
- {
- TEST("{\"mapStringInt32\":{\"asdf\":1234,\"jkl;\":-1}}"),
- EXPECT_SAME
- },
- {
- TEST("{\"mapStringBool\":{\"asdf\":true,\"jkl;\":false}}"),
- EXPECT_SAME
- },
- {
- TEST("{\"mapStringMsg\":{\"asdf\":{\"foo\":42},\"jkl;\":{\"foo\":84}}}"),
- EXPECT_SAME
- },
- TEST_SENTINEL
-};
-
-static TestCase kTestRoundtripMessagesPreserve[] = {
- // Test most fields here.
- {
- TEST("{\"optional_int32\":-42,\"optional_string\":\"Test\\u0001Message\","
- "\"optional_msg\":{\"foo\":42},"
- "\"optional_bool\":true,\"repeated_msg\":[{\"foo\":1},"
- "{\"foo\":2}]}"),
- EXPECT_SAME
- },
- TEST_SENTINEL
-};
-
-static TestCase kTestSkipUnknown[] = {
- {
- TEST("{\"optionalEnum\":\"UNKNOWN_ENUM_VALUE\"}"),
- EXPECT("{}"),
- },
- TEST_SENTINEL
-};
-
-static TestCase kTestFailure[] = {
- {
- TEST("{\"optionalEnum\":\"UNKNOWN_ENUM_VALUE\"}"),
- EXPECT("{}"), /* Actually we expect error, this is checked later. */
- },
- TEST_SENTINEL
-};
-
-class StringSink {
- public:
- StringSink() {
- upb_byteshandler_init(&byteshandler_);
- upb_byteshandler_setstring(&byteshandler_, &str_handler, NULL);
- upb_bytessink_reset(&bytessink_, &byteshandler_, &s_);
- }
- ~StringSink() { }
-
- upb_bytessink Sink() { return bytessink_; }
-
- const std::string& Data() { return s_; }
-
- private:
-
- static size_t str_handler(void* _closure, const void* hd,
- const char* data, size_t len,
- const upb_bufhandle* handle) {
- UPB_UNUSED(hd);
- UPB_UNUSED(handle);
- std::string* s = static_cast(_closure);
- std::string appended(data, len);
- s->append(data, len);
- return len;
- }
-
- upb_byteshandler byteshandler_;
- upb_bytessink bytessink_;
- std::string s_;
-};
-
-void test_json_roundtrip_message(const char* json_src,
- const char* json_expected,
- const upb::Handlers* serialize_handlers,
- const upb::json::ParserMethodPtr parser_method,
- int seam,
- bool ignore_unknown) {
- VerboseParserEnvironment env(verbose);
- StringSink data_sink;
- upb::json::PrinterPtr printer = upb::json::PrinterPtr::Create(
- env.arena(), serialize_handlers, data_sink.Sink());
- upb::json::ParserPtr parser = upb::json::ParserPtr::Create(
- env.arena(), parser_method, NULL, printer.input(),
- env.status(), ignore_unknown);
- env.ResetBytesSink(parser.input());
- env.Reset(json_src, strlen(json_src), false, false);
-
- bool ok = env.Start() &&
- env.ParseBuffer(seam) &&
- env.ParseBuffer(-1) &&
- env.End();
-
- ASSERT(ok);
- ASSERT(env.CheckConsistency());
-
- if (memcmp(json_expected,
- data_sink.Data().data(),
- data_sink.Data().size())) {
- fprintf(stderr,
- "JSON parse/serialize roundtrip result differs:\n"
- "Expected:\n%s\nParsed/Serialized:\n%s\n",
- json_expected, data_sink.Data().c_str());
- abort();
- }
-}
-
-// Starts with a message in JSON format, parses and directly serializes again,
-// and compares the result.
-void test_json_roundtrip() {
- upb::SymbolTable symtab;
- upb::HandlerCache serialize_handlercache(
- upb::json::PrinterPtr::NewCache(false));
- upb::json::CodeCache parse_codecache;
-
- upb::MessageDefPtr md(upb_test_json_TestMessage_getmsgdef(symtab.ptr()));
- ASSERT(md);
- const upb::Handlers* serialize_handlers = serialize_handlercache.Get(md);
- const upb::json::ParserMethodPtr parser_method = parse_codecache.Get(md);
- ASSERT(serialize_handlers);
-
- for (const TestCase* test_case = kTestRoundtripMessages;
- test_case->input != NULL; test_case++) {
- const char *expected =
- (test_case->expected == EXPECT_SAME) ?
- test_case->input :
- test_case->expected;
-
- for (size_t i = 0; i < strlen(test_case->input); i++) {
- test_json_roundtrip_message(test_case->input, expected,
- serialize_handlers, parser_method, (int)i,
- false);
- }
- }
-
- // Tests ignore unknown.
- for (const TestCase* test_case = kTestSkipUnknown;
- test_case->input != NULL; test_case++) {
- const char *expected =
- (test_case->expected == EXPECT_SAME) ?
- test_case->input :
- test_case->expected;
-
- for (size_t i = 0; i < strlen(test_case->input); i++) {
- test_json_roundtrip_message(test_case->input, expected,
- serialize_handlers, parser_method, (int)i,
- true);
- }
- }
-
- serialize_handlercache = upb::json::PrinterPtr::NewCache(true);
- serialize_handlers = serialize_handlercache.Get(md);
-
- for (const TestCase* test_case = kTestRoundtripMessagesPreserve;
- test_case->input != NULL; test_case++) {
- const char *expected =
- (test_case->expected == EXPECT_SAME) ?
- test_case->input :
- test_case->expected;
-
- for (size_t i = 0; i < strlen(test_case->input); i++) {
- test_json_roundtrip_message(test_case->input, expected,
- serialize_handlers, parser_method, (int)i,
- false);
- }
- }
-}
-
-void test_json_parse_failure(const char* json_src,
- const upb::Handlers* serialize_handlers,
- const upb::json::ParserMethodPtr parser_method,
- int seam) {
- VerboseParserEnvironment env(verbose);
- StringSink data_sink;
- upb::json::PrinterPtr printer = upb::json::PrinterPtr::Create(
- env.arena(), serialize_handlers, data_sink.Sink());
- upb::json::ParserPtr parser = upb::json::ParserPtr::Create(
- env.arena(), parser_method, NULL, printer.input(), env.status(), false);
- env.ResetBytesSink(parser.input());
- env.Reset(json_src, strlen(json_src), false, true);
-
- bool ok = env.Start() &&
- env.ParseBuffer(seam) &&
- env.ParseBuffer(-1) &&
- env.End();
-
- ASSERT(!ok);
- ASSERT(env.CheckConsistency());
-}
-
-// Starts with a proto message in JSON format, parses and expects failre.
-void test_json_failure() {
- upb::SymbolTable symtab;
- upb::HandlerCache serialize_handlercache(
- upb::json::PrinterPtr::NewCache(false));
- upb::json::CodeCache parse_codecache;
-
- upb::MessageDefPtr md(upb_test_json_TestMessage_getmsgdef(symtab.ptr()));
- ASSERT(md);
- const upb::Handlers* serialize_handlers = serialize_handlercache.Get(md);
- const upb::json::ParserMethodPtr parser_method = parse_codecache.Get(md);
- ASSERT(serialize_handlers);
-
- for (const TestCase* test_case = kTestFailure;
- test_case->input != NULL; test_case++) {
- for (size_t i = 0; i < strlen(test_case->input); i++) {
- test_json_parse_failure(test_case->input, serialize_handlers,
- parser_method, (int)i);
- }
- }
-}
-
-extern "C" {
-int run_tests(int argc, char *argv[]) {
- UPB_UNUSED(argc);
- UPB_UNUSED(argv);
- test_json_roundtrip();
- test_json_failure();
- return 0;
-}
-}
diff --git a/third_party/upb/tests/pb/test_decoder.cc b/third_party/upb/tests/pb/test_decoder.cc
deleted file mode 100644
index 110dd2f9bed..00000000000
--- a/third_party/upb/tests/pb/test_decoder.cc
+++ /dev/null
@@ -1,1194 +0,0 @@
-/*
- *
- * An exhaustive set of tests for parsing both valid and invalid protobuf
- * input, with buffer breaks in arbitrary places.
- *
- * Tests to add:
- * - string/bytes
- * - unknown field handler called appropriately
- * - unknown fields can be inserted in random places
- * - fuzzing of valid input
- * - resource limits (max stack depth, max string len)
- * - testing of groups
- * - more throrough testing of sequences
- * - test skipping of submessages
- * - test suspending the decoder
- * - buffers that are close enough to the end of the address space that
- * pointers overflow (this might be difficult).
- * - a few "kitchen sink" examples (one proto that uses all types, lots
- * of submsg/sequences, etc.
- * - test different handlers at every level and whether handlers fire at
- * the correct field path.
- * - test skips that extend past the end of current buffer (where decoder
- * returns value greater than the size param).
- */
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS // For PRIuS, etc.
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "tests/test_util.h"
-#include "tests/upb_test.h"
-#include "tests/pb/test_decoder.upbdefs.h"
-
-#ifdef AMALGAMATED
-#include "upb.h"
-#else // AMALGAMATED
-#include "upb/handlers.h"
-#include "upb/pb/decoder.h"
-#include "upb/upb.h"
-#endif // !AMALGAMATED
-
-#include "upb/port_def.inc"
-
-#undef PRINT_FAILURE
-#define PRINT_FAILURE(expr) \
- fprintf(stderr, "Assertion failed: %s:%d\n", __FILE__, __LINE__); \
- fprintf(stderr, "expr: %s\n", #expr); \
-
-#define MAX_NESTING 64
-
-#define LINE(x) x "\n"
-
-uint32_t filter_hash = 0;
-double completed;
-double total;
-double *count;
-
-enum TestMode {
- COUNT_ONLY = 1,
- NO_HANDLERS = 2,
- ALL_HANDLERS = 3
-} test_mode;
-
-// Copied from decoder.c, since this is not a public interface.
-typedef struct {
- uint8_t native_wire_type;
- bool is_numeric;
-} upb_decoder_typeinfo;
-
-static const upb_decoder_typeinfo upb_decoder_types[] = {
- {UPB_WIRE_TYPE_END_GROUP, false}, // ENDGROUP
- {UPB_WIRE_TYPE_64BIT, true}, // DOUBLE
- {UPB_WIRE_TYPE_32BIT, true}, // FLOAT
- {UPB_WIRE_TYPE_VARINT, true}, // INT64
- {UPB_WIRE_TYPE_VARINT, true}, // UINT64
- {UPB_WIRE_TYPE_VARINT, true}, // INT32
- {UPB_WIRE_TYPE_64BIT, true}, // FIXED64
- {UPB_WIRE_TYPE_32BIT, true}, // FIXED32
- {UPB_WIRE_TYPE_VARINT, true}, // BOOL
- {UPB_WIRE_TYPE_DELIMITED, false}, // STRING
- {UPB_WIRE_TYPE_START_GROUP, false}, // GROUP
- {UPB_WIRE_TYPE_DELIMITED, false}, // MESSAGE
- {UPB_WIRE_TYPE_DELIMITED, false}, // BYTES
- {UPB_WIRE_TYPE_VARINT, true}, // UINT32
- {UPB_WIRE_TYPE_VARINT, true}, // ENUM
- {UPB_WIRE_TYPE_32BIT, true}, // SFIXED32
- {UPB_WIRE_TYPE_64BIT, true}, // SFIXED64
- {UPB_WIRE_TYPE_VARINT, true}, // SINT32
- {UPB_WIRE_TYPE_VARINT, true}, // SINT64
-};
-
-#ifndef USE_GOOGLE
-using std::string;
-#endif
-
-void vappendf(string* str, const char *format, va_list args) {
- va_list copy;
- va_copy(copy, args);
-
- int count = vsnprintf(NULL, 0, format, args);
- if (count >= 0)
- {
- UPB_ASSERT(count < 32768);
- char *buffer = new char[count + 1];
- UPB_ASSERT(buffer);
- count = vsnprintf(buffer, count + 1, format, copy);
- UPB_ASSERT(count >= 0);
- str->append(buffer, count);
- delete [] buffer;
- }
- va_end(copy);
-}
-
-void appendf(string* str, const char *fmt, ...) {
- va_list args;
- va_start(args, fmt);
- vappendf(str, fmt, args);
- va_end(args);
-}
-
-void PrintBinary(const string& str) {
- for (size_t i = 0; i < str.size(); i++) {
- if (isprint(str[i])) {
- fprintf(stderr, "%c", str[i]);
- } else {
- fprintf(stderr, "\\x%02x", (int)(uint8_t)str[i]);
- }
- }
-}
-
-#define UPB_PB_VARINT_MAX_LEN 10
-
-static size_t upb_vencode64(uint64_t val, char *buf) {
- size_t i;
- if (val == 0) { buf[0] = 0; return 1; }
- i = 0;
- while (val) {
- uint8_t byte = val & 0x7fU;
- val >>= 7;
- if (val) byte |= 0x80U;
- buf[i++] = byte;
- }
- return i;
-}
-
-static uint32_t upb_zzenc_32(int32_t n) {
- return ((uint32_t)n << 1) ^ (n >> 31);
-}
-
-static uint64_t upb_zzenc_64(int64_t n) {
- return ((uint64_t)n << 1) ^ (n >> 63);
-}
-
-/* Routines for building arbitrary protos *************************************/
-
-const string empty;
-
-string cat(const string& a, const string& b,
- const string& c = empty,
- const string& d = empty,
- const string& e = empty,
- const string& f = empty,
- const string& g = empty,
- const string& h = empty,
- const string& i = empty,
- const string& j = empty,
- const string& k = empty,
- const string& l = empty) {
- string ret;
- ret.reserve(a.size() + b.size() + c.size() + d.size() + e.size() + f.size() +
- g.size() + h.size() + i.size() + j.size() + k.size() + l.size());
- ret.append(a);
- ret.append(b);
- ret.append(c);
- ret.append(d);
- ret.append(e);
- ret.append(f);
- ret.append(g);
- ret.append(h);
- ret.append(i);
- ret.append(j);
- ret.append(k);
- ret.append(l);
- return ret;
-}
-
-template
-string num2string(T num) {
- std::ostringstream ss;
- ss << num;
- return ss.str();
-}
-
-string varint(uint64_t x) {
- char buf[UPB_PB_VARINT_MAX_LEN];
- size_t len = upb_vencode64(x, buf);
- return string(buf, len);
-}
-
-// TODO: proper byte-swapping for big-endian machines.
-string fixed32(void *data) { return string(static_cast(data), 4); }
-string fixed64(void *data) { return string(static_cast(data), 8); }
-
-string delim(const string& buf) { return cat(varint(buf.size()), buf); }
-string uint32(uint32_t u32) { return fixed32(&u32); }
-string uint64(uint64_t u64) { return fixed64(&u64); }
-string flt(float f) { return fixed32(&f); }
-string dbl(double d) { return fixed64(&d); }
-string zz32(int32_t x) { return varint(upb_zzenc_32(x)); }
-string zz64(int64_t x) { return varint(upb_zzenc_64(x)); }
-
-string tag(uint32_t fieldnum, char wire_type) {
- return varint((fieldnum << 3) | wire_type);
-}
-
-string submsg(uint32_t fn, const string& buf) {
- return cat( tag(fn, UPB_WIRE_TYPE_DELIMITED), delim(buf) );
-}
-
-string group(uint32_t fn, const string& buf) {
- return cat(tag(fn, UPB_WIRE_TYPE_START_GROUP), buf,
- tag(fn, UPB_WIRE_TYPE_END_GROUP));
-}
-
-// Like delim()/submsg(), but intentionally encodes an incorrect length.
-// These help test when a delimited boundary doesn't land in the right place.
-string badlen_delim(int err, const string& buf) {
- return cat(varint(buf.size() + err), buf);
-}
-
-string badlen_submsg(int err, uint32_t fn, const string& buf) {
- return cat( tag(fn, UPB_WIRE_TYPE_DELIMITED), badlen_delim(err, buf) );
-}
-
-
-/* A set of handlers that covers all .proto types *****************************/
-
-// The handlers simply append to a string indicating what handlers were called.
-// This string is similar to protobuf text format but fields are referred to by
-// number instead of name and sequences are explicitly delimited. We indent
-// using the closure depth to test that the stack of closures is properly
-// handled.
-
-int closures[MAX_NESTING];
-string output;
-
-void indentbuf(string *buf, int depth) {
- buf->append(2 * depth, ' ');
-}
-
-#define NUMERIC_VALUE_HANDLER(member, ctype, fmt) \
- bool value_##member(int* depth, const uint32_t* num, ctype val) { \
- indentbuf(&output, *depth); \
- appendf(&output, "%" PRIu32 ":%" fmt "\n", *num, val); \
- return true; \
- }
-
-NUMERIC_VALUE_HANDLER(uint32, uint32_t, PRIu32)
-NUMERIC_VALUE_HANDLER(uint64, uint64_t, PRIu64)
-NUMERIC_VALUE_HANDLER(int32, int32_t, PRId32)
-NUMERIC_VALUE_HANDLER(int64, int64_t, PRId64)
-NUMERIC_VALUE_HANDLER(float, float, "g")
-NUMERIC_VALUE_HANDLER(double, double, "g")
-
-bool value_bool(int* depth, const uint32_t* num, bool val) {
- indentbuf(&output, *depth);
- appendf(&output, "%" PRIu32 ":%s\n", *num, val ? "true" : "false");
- return true;
-}
-
-int* startstr(int* depth, const uint32_t* num, size_t size_hint) {
- indentbuf(&output, *depth);
- appendf(&output, "%" PRIu32 ":(%zu)\"", *num, size_hint);
- return depth + 1;
-}
-
-size_t value_string(int* depth, const uint32_t* num, const char* buf,
- size_t n, const upb_bufhandle* handle) {
- UPB_UNUSED(num);
- UPB_UNUSED(depth);
- output.append(buf, n);
- ASSERT(handle == &global_handle);
- return n;
-}
-
-bool endstr(int* depth, const uint32_t* num) {
- UPB_UNUSED(num);
- output.append("\n");
- indentbuf(&output, *depth);
- appendf(&output, "%" PRIu32 ":\"\n", *num);
- return true;
-}
-
-int* startsubmsg(int* depth, const uint32_t* num) {
- indentbuf(&output, *depth);
- appendf(&output, "%" PRIu32 ":{\n", *num);
- return depth + 1;
-}
-
-bool endsubmsg(int* depth, const uint32_t* num) {
- UPB_UNUSED(num);
- indentbuf(&output, *depth);
- output.append("}\n");
- return true;
-}
-
-int* startseq(int* depth, const uint32_t* num) {
- indentbuf(&output, *depth);
- appendf(&output, "%" PRIu32 ":[\n", *num);
- return depth + 1;
-}
-
-bool endseq(int* depth, const uint32_t* num) {
- UPB_UNUSED(num);
- indentbuf(&output, *depth);
- output.append("]\n");
- return true;
-}
-
-bool startmsg(int* depth) {
- indentbuf(&output, *depth);
- output.append("<\n");
- return true;
-}
-
-bool endmsg(int* depth, upb_status* status) {
- UPB_UNUSED(status);
- indentbuf(&output, *depth);
- output.append(">\n");
- return true;
-}
-
-void free_uint32(void *val) {
- uint32_t *u32 = static_cast(val);
- delete u32;
-}
-
-template
-void doreg(upb::HandlersPtr h, uint32_t num) {
- upb::FieldDefPtr f = h.message_def().FindFieldByNumber(num);
- ASSERT(f);
- ASSERT(h.SetValueHandler(f, UpbBind(F, new uint32_t(num))));
- if (f.IsSequence()) {
- ASSERT(h.SetStartSequenceHandler(f, UpbBind(startseq, new uint32_t(num))));
- ASSERT(h.SetEndSequenceHandler(f, UpbBind(endseq, new uint32_t(num))));
- }
-}
-
-// The repeated field number to correspond to the given non-repeated field
-// number.
-uint32_t rep_fn(uint32_t fn) {
- return (UPB_MAX_FIELDNUMBER - 1000) + fn;
-}
-
-#define NOP_FIELD 40
-#define UNKNOWN_FIELD 666
-
-template
-void reg(upb::HandlersPtr h, upb_descriptortype_t type) {
- // We register both a repeated and a non-repeated field for every type.
- // For the non-repeated field we make the field number the same as the
- // type. For the repeated field we make it a function of the type.
- doreg(h, type);
- doreg(h, rep_fn(type));
-}
-
-void regseq(upb::HandlersPtr h, upb::FieldDefPtr f, uint32_t num) {
- ASSERT(h.SetStartSequenceHandler(f, UpbBind(startseq, new uint32_t(num))));
- ASSERT(h.SetEndSequenceHandler(f, UpbBind(endseq, new uint32_t(num))));
-}
-
-void reg_subm(upb::HandlersPtr h, uint32_t num) {
- upb::FieldDefPtr f = h.message_def().FindFieldByNumber(num);
- ASSERT(f);
- if (f.IsSequence()) regseq(h, f, num);
- ASSERT(
- h.SetStartSubMessageHandler(f, UpbBind(startsubmsg, new uint32_t(num))));
- ASSERT(h.SetEndSubMessageHandler(f, UpbBind(endsubmsg, new uint32_t(num))));
-}
-
-void reg_str(upb::HandlersPtr h, uint32_t num) {
- upb::FieldDefPtr f = h.message_def().FindFieldByNumber(num);
- ASSERT(f);
- if (f.IsSequence()) regseq(h, f, num);
- ASSERT(h.SetStartStringHandler(f, UpbBind(startstr, new uint32_t(num))));
- ASSERT(h.SetEndStringHandler(f, UpbBind(endstr, new uint32_t(num))));
- ASSERT(h.SetStringHandler(f, UpbBind(value_string, new uint32_t(num))));
-}
-
-struct HandlerRegisterData {
- TestMode mode;
-};
-
-void callback(const void *closure, upb::Handlers* h_ptr) {
- upb::HandlersPtr h(h_ptr);
- const HandlerRegisterData* data =
- static_cast(closure);
- if (data->mode == ALL_HANDLERS) {
- h.SetStartMessageHandler(UpbMakeHandler(startmsg));
- h.SetEndMessageHandler(UpbMakeHandler(endmsg));
-
- // Register handlers for each type.
- reg(h, UPB_DESCRIPTOR_TYPE_DOUBLE);
- reg (h, UPB_DESCRIPTOR_TYPE_FLOAT);
- reg (h, UPB_DESCRIPTOR_TYPE_INT64);
- reg(h, UPB_DESCRIPTOR_TYPE_UINT64);
- reg (h, UPB_DESCRIPTOR_TYPE_INT32);
- reg(h, UPB_DESCRIPTOR_TYPE_FIXED64);
- reg(h, UPB_DESCRIPTOR_TYPE_FIXED32);
- reg (h, UPB_DESCRIPTOR_TYPE_BOOL);
- reg(h, UPB_DESCRIPTOR_TYPE_UINT32);
- reg (h, UPB_DESCRIPTOR_TYPE_ENUM);
- reg (h, UPB_DESCRIPTOR_TYPE_SFIXED32);
- reg (h, UPB_DESCRIPTOR_TYPE_SFIXED64);
- reg (h, UPB_DESCRIPTOR_TYPE_SINT32);
- reg (h, UPB_DESCRIPTOR_TYPE_SINT64);
-
- reg_str(h, UPB_DESCRIPTOR_TYPE_STRING);
- reg_str(h, UPB_DESCRIPTOR_TYPE_BYTES);
- reg_str(h, rep_fn(UPB_DESCRIPTOR_TYPE_STRING));
- reg_str(h, rep_fn(UPB_DESCRIPTOR_TYPE_BYTES));
-
- // Register submessage/group handlers that are self-recursive
- // to this type, eg: message M { optional M m = 1; }
- reg_subm(h, UPB_DESCRIPTOR_TYPE_MESSAGE);
- reg_subm(h, rep_fn(UPB_DESCRIPTOR_TYPE_MESSAGE));
-
- if (h.message_def().full_name() == std::string("DecoderTest")) {
- reg_subm(h, UPB_DESCRIPTOR_TYPE_GROUP);
- reg_subm(h, rep_fn(UPB_DESCRIPTOR_TYPE_GROUP));
- }
-
- // For NOP_FIELD we register no handlers, so we can pad a proto freely without
- // changing the output.
- }
-}
-
-/* Running of test cases ******************************************************/
-
-const upb::Handlers *global_handlers;
-upb::pb::DecoderMethodPtr global_method;
-
-upb::pb::DecoderPtr CreateDecoder(upb::Arena* arena,
- upb::pb::DecoderMethodPtr method,
- upb::Sink sink, upb::Status* status) {
- upb::pb::DecoderPtr ret =
- upb::pb::DecoderPtr::Create(arena, method, sink, status);
- ret.set_max_nesting(MAX_NESTING);
- return ret;
-}
-
-void CheckBytesParsed(upb::pb::DecoderPtr decoder, size_t ofs) {
- // We can't have parsed more data than the decoder callback is telling us it
- // parsed.
- ASSERT(decoder.BytesParsed() <= ofs);
-
- // The difference between what we've decoded and what the decoder has accepted
- // represents the internally buffered amount. This amount should not exceed
- // this value which comes from decoder.int.h.
- ASSERT(ofs <= (decoder.BytesParsed() + UPB_DECODER_MAX_RESIDUAL_BYTES));
-}
-
-static bool parse(VerboseParserEnvironment* env,
- upb::pb::DecoderPtr decoder, int bytes) {
- CheckBytesParsed(decoder, env->ofs());
- bool ret = env->ParseBuffer(bytes);
- if (ret) {
- CheckBytesParsed(decoder, env->ofs());
- }
-
- return ret;
-}
-
-void do_run_decoder(VerboseParserEnvironment* env, upb::pb::DecoderPtr decoder,
- const string& proto, const string* expected_output,
- size_t i, size_t j, bool may_skip) {
- env->Reset(proto.c_str(), proto.size(), may_skip, expected_output == NULL);
- decoder.Reset();
-
- if (test_mode != COUNT_ONLY) {
- output.clear();
-
- if (filter_hash) {
- fprintf(stderr, "RUNNING TEST CASE\n");
- fprintf(stderr, "Input (len=%u): ", (unsigned)proto.size());
- PrintBinary(proto);
- fprintf(stderr, "\n");
- if (expected_output) {
- if (test_mode == ALL_HANDLERS) {
- fprintf(stderr, "Expected output: %s\n", expected_output->c_str());
- } else if (test_mode == NO_HANDLERS) {
- fprintf(stderr,
- "No handlers are registered, BUT if they were "
- "the expected output would be: %s\n",
- expected_output->c_str());
- }
- } else {
- fprintf(stderr, "Expected to FAIL\n");
- }
- }
-
- bool ok = env->Start() &&
- parse(env, decoder, (int)i) &&
- parse(env, decoder, (int)(j - i)) &&
- parse(env, decoder, -1) &&
- env->End();
-
- ASSERT(env->CheckConsistency());
-
- if (test_mode == ALL_HANDLERS) {
- if (expected_output) {
- if (output != *expected_output) {
- fprintf(stderr, "Text mismatch: '%s' vs '%s'\n",
- output.c_str(), expected_output->c_str());
- }
- ASSERT(ok);
- ASSERT(output == *expected_output);
- } else {
- if (ok) {
- fprintf(stderr, "Didn't expect ok result, but got output: '%s'\n",
- output.c_str());
- }
- ASSERT(!ok);
- }
- }
- }
- (*count)++;
-}
-
-void run_decoder(const string& proto, const string* expected_output) {
- VerboseParserEnvironment env(filter_hash != 0);
- upb::Sink sink(global_handlers, &closures[0]);
- upb::pb::DecoderPtr decoder = CreateDecoder(env.arena(), global_method, sink, env.status());
- env.ResetBytesSink(decoder.input());
- for (size_t i = 0; i < proto.size(); i++) {
- for (size_t j = i; j < UPB_MIN(proto.size(), i + 5); j++) {
- do_run_decoder(&env, decoder, proto, expected_output, i, j, true);
- if (env.SkippedWithNull()) {
- do_run_decoder(&env, decoder, proto, expected_output, i, j, false);
- }
- }
- }
-}
-
-const static string thirty_byte_nop = cat(
- tag(NOP_FIELD, UPB_WIRE_TYPE_DELIMITED), delim(string(30, 'X')) );
-
-// Indents and wraps text as if it were a submessage with this field number
-string wrap_text(int32_t fn, const string& text) {
- string wrapped_text = text;
- size_t pos = 0;
- string replace_with = "\n ";
- while ((pos = wrapped_text.find("\n", pos)) != string::npos &&
- pos != wrapped_text.size() - 1) {
- wrapped_text.replace(pos, 1, replace_with);
- pos += replace_with.size();
- }
- wrapped_text = cat(
- LINE("<"),
- num2string(fn), LINE(":{")
- " ", wrapped_text,
- LINE(" }")
- LINE(">"));
- return wrapped_text;
-}
-
-void assert_successful_parse(const string& proto,
- const char *expected_fmt, ...) {
- string expected_text;
- va_list args;
- va_start(args, expected_fmt);
- vappendf(&expected_text, expected_fmt, args);
- va_end(args);
- // To test both middle-of-buffer and end-of-buffer code paths,
- // repeat once with no-op padding data at the end of buffer.
- run_decoder(proto, &expected_text);
- run_decoder(cat( proto, thirty_byte_nop ), &expected_text);
-
- // Test that this also works when wrapped in a submessage or group.
- // Indent the expected text one level and wrap it.
- string wrapped_text1 = wrap_text(UPB_DESCRIPTOR_TYPE_MESSAGE, expected_text);
- string wrapped_text2 = wrap_text(UPB_DESCRIPTOR_TYPE_GROUP, expected_text);
-
- run_decoder(submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, proto), &wrapped_text1);
- run_decoder(group(UPB_DESCRIPTOR_TYPE_GROUP, proto), &wrapped_text2);
-}
-
-void assert_does_not_parse_at_eof(const string& proto) {
- run_decoder(proto, NULL);
-
- // Also test that we fail to parse at end-of-submessage, not just
- // end-of-message. But skip this if we have no handlers, because in that
- // case we won't descend into the submessage.
- if (test_mode != NO_HANDLERS) {
- run_decoder(submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, proto), NULL);
- run_decoder(cat(submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, proto),
- thirty_byte_nop), NULL);
- }
-}
-
-void assert_does_not_parse(const string& proto) {
- // Test that the error is caught both at end-of-buffer and middle-of-buffer.
- assert_does_not_parse_at_eof(proto);
- assert_does_not_parse_at_eof(cat( proto, thirty_byte_nop ));
-}
-
-
-/* The actual tests ***********************************************************/
-
-void test_premature_eof_for_type(upb_descriptortype_t type) {
- // Incomplete values for each wire type.
- static const string incompletes[6] = {
- string("\x80"), // UPB_WIRE_TYPE_VARINT
- string("abcdefg"), // UPB_WIRE_TYPE_64BIT
- string("\x80"), // UPB_WIRE_TYPE_DELIMITED (partial length)
- string(), // UPB_WIRE_TYPE_START_GROUP (no value required)
- string(), // UPB_WIRE_TYPE_END_GROUP (no value required)
- string("abc") // UPB_WIRE_TYPE_32BIT
- };
-
- uint32_t fieldnum = type;
- uint32_t rep_fieldnum = rep_fn(type);
- int wire_type = upb_decoder_types[type].native_wire_type;
- const string& incomplete = incompletes[wire_type];
-
- // EOF before a known non-repeated value.
- assert_does_not_parse_at_eof(tag(fieldnum, wire_type));
-
- // EOF before a known repeated value.
- assert_does_not_parse_at_eof(tag(rep_fieldnum, wire_type));
-
- // EOF before an unknown value.
- assert_does_not_parse_at_eof(tag(UNKNOWN_FIELD, wire_type));
-
- // EOF inside a known non-repeated value.
- assert_does_not_parse_at_eof(
- cat( tag(fieldnum, wire_type), incomplete ));
-
- // EOF inside a known repeated value.
- assert_does_not_parse_at_eof(
- cat( tag(rep_fieldnum, wire_type), incomplete ));
-
- // EOF inside an unknown value.
- assert_does_not_parse_at_eof(
- cat( tag(UNKNOWN_FIELD, wire_type), incomplete ));
-
- if (wire_type == UPB_WIRE_TYPE_DELIMITED) {
- // EOF in the middle of delimited data for known non-repeated value.
- assert_does_not_parse_at_eof(
- cat( tag(fieldnum, wire_type), varint(1) ));
-
- // EOF in the middle of delimited data for known repeated value.
- assert_does_not_parse_at_eof(
- cat( tag(rep_fieldnum, wire_type), varint(1) ));
-
- // EOF in the middle of delimited data for unknown value.
- assert_does_not_parse_at_eof(
- cat( tag(UNKNOWN_FIELD, wire_type), varint(1) ));
-
- if (type == UPB_DESCRIPTOR_TYPE_MESSAGE) {
- // Submessage ends in the middle of a value.
- string incomplete_submsg =
- cat ( tag(UPB_DESCRIPTOR_TYPE_INT32, UPB_WIRE_TYPE_VARINT),
- incompletes[UPB_WIRE_TYPE_VARINT] );
- assert_does_not_parse(
- cat( tag(fieldnum, UPB_WIRE_TYPE_DELIMITED),
- varint(incomplete_submsg.size()),
- incomplete_submsg ));
- }
- } else {
- // Packed region ends in the middle of a value.
- assert_does_not_parse(
- cat( tag(rep_fieldnum, UPB_WIRE_TYPE_DELIMITED),
- varint(incomplete.size()),
- incomplete ));
-
- // EOF in the middle of packed region.
- assert_does_not_parse_at_eof(
- cat( tag(rep_fieldnum, UPB_WIRE_TYPE_DELIMITED), varint(1) ));
- }
-}
-
-// "33" and "66" are just two random values that all numeric types can
-// represent.
-void test_valid_data_for_type(upb_descriptortype_t type,
- const string& enc33, const string& enc66) {
- uint32_t fieldnum = type;
- uint32_t rep_fieldnum = rep_fn(type);
- int wire_type = upb_decoder_types[type].native_wire_type;
-
- // Non-repeated
- assert_successful_parse(
- cat( tag(fieldnum, wire_type), enc33,
- tag(fieldnum, wire_type), enc66 ),
- LINE("<")
- LINE("%u:33")
- LINE("%u:66")
- LINE(">"), fieldnum, fieldnum);
-
- // Non-packed repeated.
- assert_successful_parse(
- cat( tag(rep_fieldnum, wire_type), enc33,
- tag(rep_fieldnum, wire_type), enc66 ),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:33")
- LINE(" %u:66")
- LINE("]")
- LINE(">"), rep_fieldnum, rep_fieldnum, rep_fieldnum);
-
- // Packed repeated.
- assert_successful_parse(
- cat( tag(rep_fieldnum, UPB_WIRE_TYPE_DELIMITED),
- delim(cat( enc33, enc66 )) ),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:33")
- LINE(" %u:66")
- LINE("]")
- LINE(">"), rep_fieldnum, rep_fieldnum, rep_fieldnum);
-}
-
-void test_valid_data_for_signed_type(upb_descriptortype_t type,
- const string& enc33, const string& enc66) {
- uint32_t fieldnum = type;
- uint32_t rep_fieldnum = rep_fn(type);
- int wire_type = upb_decoder_types[type].native_wire_type;
-
- // Non-repeated
- assert_successful_parse(
- cat( tag(fieldnum, wire_type), enc33,
- tag(fieldnum, wire_type), enc66 ),
- LINE("<")
- LINE("%u:33")
- LINE("%u:-66")
- LINE(">"), fieldnum, fieldnum);
-
- // Non-packed repeated.
- assert_successful_parse(
- cat( tag(rep_fieldnum, wire_type), enc33,
- tag(rep_fieldnum, wire_type), enc66 ),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:33")
- LINE(" %u:-66")
- LINE("]")
- LINE(">"), rep_fieldnum, rep_fieldnum, rep_fieldnum);
-
- // Packed repeated.
- assert_successful_parse(
- cat( tag(rep_fieldnum, UPB_WIRE_TYPE_DELIMITED),
- delim(cat( enc33, enc66 )) ),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:33")
- LINE(" %u:-66")
- LINE("]")
- LINE(">"), rep_fieldnum, rep_fieldnum, rep_fieldnum);
-}
-
-// Test that invalid protobufs are properly detected (without crashing) and
-// have an error reported. Field numbers match registered handlers above.
-void test_invalid() {
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_DOUBLE);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_FLOAT);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_INT64);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_UINT64);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_INT32);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_FIXED64);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_FIXED32);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_BOOL);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_STRING);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_BYTES);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_UINT32);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_ENUM);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_SFIXED32);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_SFIXED64);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_SINT32);
- test_premature_eof_for_type(UPB_DESCRIPTOR_TYPE_SINT64);
-
- // EOF inside a tag's varint.
- assert_does_not_parse_at_eof( string("\x80") );
-
- // EOF inside a known group.
- // TODO(haberman): add group to decoder test schema.
- //assert_does_not_parse_at_eof( tag(4, UPB_WIRE_TYPE_START_GROUP) );
-
- // EOF inside an unknown group.
- assert_does_not_parse_at_eof( tag(UNKNOWN_FIELD, UPB_WIRE_TYPE_START_GROUP) );
-
- // End group that we are not currently in.
- assert_does_not_parse( tag(4, UPB_WIRE_TYPE_END_GROUP) );
-
- // Field number is 0.
- assert_does_not_parse(
- cat( tag(0, UPB_WIRE_TYPE_DELIMITED), varint(0) ));
- // The previous test alone did not catch this particular pattern which could
- // corrupt the internal state.
- assert_does_not_parse(
- cat( tag(0, UPB_WIRE_TYPE_64BIT), uint64(0) ));
-
- // Field number is too large.
- assert_does_not_parse(
- cat( tag(UPB_MAX_FIELDNUMBER + 1, UPB_WIRE_TYPE_DELIMITED),
- varint(0) ));
-
- // Known group inside a submessage has ENDGROUP tag AFTER submessage end.
- assert_does_not_parse(
- cat ( submsg(UPB_DESCRIPTOR_TYPE_MESSAGE,
- tag(UPB_DESCRIPTOR_TYPE_GROUP, UPB_WIRE_TYPE_START_GROUP)),
- tag(UPB_DESCRIPTOR_TYPE_GROUP, UPB_WIRE_TYPE_END_GROUP)));
-
- // Unknown string extends past enclosing submessage.
- assert_does_not_parse(
- cat (badlen_submsg(-1, UPB_DESCRIPTOR_TYPE_MESSAGE,
- submsg(12345, string(" "))),
- submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, string(" "))));
-
- // Unknown fixed-length field extends past enclosing submessage.
- assert_does_not_parse(
- cat (badlen_submsg(-1, UPB_DESCRIPTOR_TYPE_MESSAGE,
- cat( tag(12345, UPB_WIRE_TYPE_64BIT), uint64(0))),
- submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, string(" "))));
-
- // Test exceeding the resource limit of stack depth.
- if (test_mode != NO_HANDLERS) {
- string buf;
- for (int i = 0; i <= MAX_NESTING; i++) {
- buf.assign(submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, buf));
- }
- assert_does_not_parse(buf);
- }
-}
-
-void test_valid() {
- // Empty protobuf.
- assert_successful_parse(string(""), "<\n>\n");
-
- // Empty protobuf where we never call PutString between
- // StartString/EndString.
-
- upb::Status status;
- upb::Arena arena;
- upb::Sink sink(global_handlers, &closures[0]);
- upb::pb::DecoderPtr decoder =
- CreateDecoder(&arena, global_method, sink, &status);
- output.clear();
- bool ok = upb::PutBuffer(std::string(), decoder.input());
- ASSERT(ok);
- ASSERT(status.ok());
- if (test_mode == ALL_HANDLERS) {
- ASSERT(output == string("<\n>\n"));
- }
-
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_DOUBLE,
- dbl(33),
- dbl(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_FLOAT, flt(33), flt(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_INT64,
- varint(33),
- varint(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_INT32,
- varint(33),
- varint(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_ENUM,
- varint(33),
- varint(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_SFIXED32,
- uint32(33),
- uint32(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_SFIXED64,
- uint64(33),
- uint64(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_SINT32,
- zz32(33),
- zz32(-66));
- test_valid_data_for_signed_type(UPB_DESCRIPTOR_TYPE_SINT64,
- zz64(33),
- zz64(-66));
-
- test_valid_data_for_type(UPB_DESCRIPTOR_TYPE_UINT64, varint(33), varint(66));
- test_valid_data_for_type(UPB_DESCRIPTOR_TYPE_UINT32, varint(33), varint(66));
- test_valid_data_for_type(UPB_DESCRIPTOR_TYPE_FIXED64, uint64(33), uint64(66));
- test_valid_data_for_type(UPB_DESCRIPTOR_TYPE_FIXED32, uint32(33), uint32(66));
-
- // Unknown fields.
- int int32_type = UPB_DESCRIPTOR_TYPE_INT32;
- int msg_type = UPB_DESCRIPTOR_TYPE_MESSAGE;
- assert_successful_parse(
- cat( tag(12345, UPB_WIRE_TYPE_VARINT), varint(2345678) ),
- "<\n>\n");
- assert_successful_parse(
- cat( tag(12345, UPB_WIRE_TYPE_32BIT), uint32(2345678) ),
- "<\n>\n");
- assert_successful_parse(
- cat( tag(12345, UPB_WIRE_TYPE_64BIT), uint64(2345678) ),
- "<\n>\n");
- assert_successful_parse(
- submsg(12345, string(" ")),
- "<\n>\n");
-
- // Unknown field inside a known submessage.
- assert_successful_parse(
- submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, submsg(12345, string(" "))),
- LINE("<")
- LINE("%u:{")
- LINE(" <")
- LINE(" >")
- LINE(" }")
- LINE(">"), UPB_DESCRIPTOR_TYPE_MESSAGE);
-
- assert_successful_parse(
- cat (submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, submsg(12345, string(" "))),
- tag(UPB_DESCRIPTOR_TYPE_INT32, UPB_WIRE_TYPE_VARINT),
- varint(5)),
- LINE("<")
- LINE("%u:{")
- LINE(" <")
- LINE(" >")
- LINE(" }")
- LINE("%u:5")
- LINE(">"), UPB_DESCRIPTOR_TYPE_MESSAGE, UPB_DESCRIPTOR_TYPE_INT32);
-
- // This triggered a previous bug in the decoder.
- assert_successful_parse(
- cat( tag(UPB_DESCRIPTOR_TYPE_SFIXED32, UPB_WIRE_TYPE_VARINT),
- varint(0) ),
- "<\n>\n");
-
- assert_successful_parse(
- cat(
- submsg(UPB_DESCRIPTOR_TYPE_MESSAGE,
- submsg(UPB_DESCRIPTOR_TYPE_MESSAGE,
- cat( tag(int32_type, UPB_WIRE_TYPE_VARINT), varint(2345678),
- tag(12345, UPB_WIRE_TYPE_VARINT), varint(2345678) ))),
- tag(int32_type, UPB_WIRE_TYPE_VARINT), varint(22222)),
- LINE("<")
- LINE("%u:{")
- LINE(" <")
- LINE(" %u:{")
- LINE(" <")
- LINE(" %u:2345678")
- LINE(" >")
- LINE(" }")
- LINE(" >")
- LINE(" }")
- LINE("%u:22222")
- LINE(">"), msg_type, msg_type, int32_type, int32_type);
-
- assert_successful_parse(
- cat( tag(UPB_DESCRIPTOR_TYPE_INT32, UPB_WIRE_TYPE_VARINT), varint(1),
- tag(12345, UPB_WIRE_TYPE_VARINT), varint(2345678) ),
- LINE("<")
- LINE("%u:1")
- LINE(">"), UPB_DESCRIPTOR_TYPE_INT32);
-
- // String inside submsg.
- uint32_t msg_fn = UPB_DESCRIPTOR_TYPE_MESSAGE;
- assert_successful_parse(
- submsg(msg_fn,
- cat ( tag(UPB_DESCRIPTOR_TYPE_STRING, UPB_WIRE_TYPE_DELIMITED),
- delim(string("abcde"))
- )
- ),
- LINE("<")
- LINE("%u:{")
- LINE(" <")
- LINE(" %u:(5)\"abcde")
- LINE(" %u:\"")
- LINE(" >")
- LINE(" }")
- LINE(">"), msg_fn, UPB_DESCRIPTOR_TYPE_STRING,
- UPB_DESCRIPTOR_TYPE_STRING);
-
- // Test implicit startseq/endseq.
- uint32_t repfl_fn = rep_fn(UPB_DESCRIPTOR_TYPE_FLOAT);
- uint32_t repdb_fn = rep_fn(UPB_DESCRIPTOR_TYPE_DOUBLE);
- assert_successful_parse(
- cat( tag(repfl_fn, UPB_WIRE_TYPE_32BIT), flt(33),
- tag(repdb_fn, UPB_WIRE_TYPE_64BIT), dbl(66) ),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:33")
- LINE("]")
- LINE("%u:[")
- LINE(" %u:66")
- LINE("]")
- LINE(">"), repfl_fn, repfl_fn, repdb_fn, repdb_fn);
-
- // Submessage tests.
- assert_successful_parse(
- submsg(msg_fn, submsg(msg_fn, submsg(msg_fn, string()))),
- LINE("<")
- LINE("%u:{")
- LINE(" <")
- LINE(" %u:{")
- LINE(" <")
- LINE(" %u:{")
- LINE(" <")
- LINE(" >")
- LINE(" }")
- LINE(" >")
- LINE(" }")
- LINE(" >")
- LINE(" }")
- LINE(">"), msg_fn, msg_fn, msg_fn);
-
- uint32_t repm_fn = rep_fn(UPB_DESCRIPTOR_TYPE_MESSAGE);
- assert_successful_parse(
- submsg(repm_fn, submsg(repm_fn, string())),
- LINE("<")
- LINE("%u:[")
- LINE(" %u:{")
- LINE(" <")
- LINE(" %u:[")
- LINE(" %u:{")
- LINE(" <")
- LINE(" >")
- LINE(" }")
- LINE(" ]")
- LINE(" >")
- LINE(" }")
- LINE("]")
- LINE(">"), repm_fn, repm_fn, repm_fn, repm_fn);
-
- // Test unknown group.
- uint32_t unknown_group_fn = 12321;
- assert_successful_parse(
- cat( tag(unknown_group_fn, UPB_WIRE_TYPE_START_GROUP),
- tag(unknown_group_fn, UPB_WIRE_TYPE_END_GROUP) ),
- LINE("<")
- LINE(">")
- );
-
- // Test some unknown fields inside an unknown group.
- const string unknown_group_with_data =
- cat(
- tag(unknown_group_fn, UPB_WIRE_TYPE_START_GROUP),
- tag(12345, UPB_WIRE_TYPE_VARINT), varint(2345678),
- tag(123456789, UPB_WIRE_TYPE_32BIT), uint32(2345678),
- tag(123477, UPB_WIRE_TYPE_64BIT), uint64(2345678),
- tag(123, UPB_WIRE_TYPE_DELIMITED), varint(0),
- tag(unknown_group_fn, UPB_WIRE_TYPE_END_GROUP)
- );
-
- // Nested unknown group with data.
- assert_successful_parse(
- cat(
- tag(unknown_group_fn, UPB_WIRE_TYPE_START_GROUP),
- unknown_group_with_data,
- tag(unknown_group_fn, UPB_WIRE_TYPE_END_GROUP),
- tag(UPB_DESCRIPTOR_TYPE_INT32, UPB_WIRE_TYPE_VARINT), varint(1)
- ),
- LINE("<")
- LINE("%u:1")
- LINE(">"),
- UPB_DESCRIPTOR_TYPE_INT32
- );
-
- assert_successful_parse(
- cat( tag(unknown_group_fn, UPB_WIRE_TYPE_START_GROUP),
- tag(unknown_group_fn + 1, UPB_WIRE_TYPE_START_GROUP),
- tag(unknown_group_fn + 1, UPB_WIRE_TYPE_END_GROUP),
- tag(unknown_group_fn, UPB_WIRE_TYPE_END_GROUP) ),
- LINE("<")
- LINE(">")
- );
-
- // Staying within the stack limit should work properly.
- string buf;
- string textbuf;
- int total = MAX_NESTING - 1;
- for (int i = 0; i < total; i++) {
- buf.assign(submsg(UPB_DESCRIPTOR_TYPE_MESSAGE, buf));
- indentbuf(&textbuf, i);
- textbuf.append("<\n");
- indentbuf(&textbuf, i);
- appendf(&textbuf, "%u:{\n", UPB_DESCRIPTOR_TYPE_MESSAGE);
- }
- indentbuf(&textbuf, total);
- textbuf.append("<\n");
- indentbuf(&textbuf, total);
- textbuf.append(">\n");
- for (int i = 0; i < total; i++) {
- indentbuf(&textbuf, total - i - 1);
- textbuf.append(" }\n");
- indentbuf(&textbuf, total - i - 1);
- textbuf.append(">\n");
- }
- // Have to use run_decoder directly, because we are at max nesting and can't
- // afford the extra nesting that assert_successful_parse() will do.
- run_decoder(buf, &textbuf);
-}
-
-void empty_callback(const void* /* closure */, upb::Handlers* /* h_ptr */) {}
-
-void test_emptyhandlers(upb::SymbolTable* symtab) {
- // Create an empty handlers to make sure that the decoder can handle empty
- // messages.
- HandlerRegisterData handlerdata;
- handlerdata.mode = test_mode;
-
- upb::HandlerCache handler_cache(empty_callback, &handlerdata);
- upb::pb::CodeCache pb_code_cache(&handler_cache);
-
- upb::MessageDefPtr md = upb::MessageDefPtr(Empty_getmsgdef(symtab->ptr()));
- global_handlers = handler_cache.Get(md);
- global_method = pb_code_cache.Get(md);
-
- // TODO: also test the case where a message has fields, but the fields are
- // submessage fields and have no handlers. This also results in a decoder
- // method with no field-handling code.
-
- // Ensure that the method can run with empty and non-empty input.
- string test_unknown_field_msg =
- cat(tag(1, UPB_WIRE_TYPE_VARINT), varint(42),
- tag(2, UPB_WIRE_TYPE_DELIMITED), delim("My test data"));
- const struct {
- const char* data;
- size_t length;
- } testdata[] = {
- { "", 0 },
- { test_unknown_field_msg.data(), test_unknown_field_msg.size() },
- { NULL, 0 },
- };
- for (int i = 0; testdata[i].data; i++) {
- VerboseParserEnvironment env(filter_hash != 0);
- upb::Sink sink(global_method.dest_handlers(), &closures[0]);
- upb::pb::DecoderPtr decoder =
- CreateDecoder(env.arena(), global_method, sink, env.status());
- env.ResetBytesSink(decoder.input());
- env.Reset(testdata[i].data, testdata[i].length, true, false);
- ASSERT(env.Start());
- ASSERT(env.ParseBuffer(-1));
- ASSERT(env.End());
- ASSERT(env.CheckConsistency());
- }
-}
-
-void run_tests() {
- HandlerRegisterData handlerdata;
- handlerdata.mode = test_mode;
-
- upb::SymbolTable symtab;
- upb::HandlerCache handler_cache(callback, &handlerdata);
- upb::pb::CodeCache pb_code_cache(&handler_cache);
-
- upb::MessageDefPtr md(DecoderTest_getmsgdef(symtab.ptr()));
- global_handlers = handler_cache.Get(md);
- global_method = pb_code_cache.Get(md);
- completed = 0;
-
- test_invalid();
- test_valid();
-
- test_emptyhandlers(&symtab);
-}
-
-extern "C" {
-
-int run_tests(int argc, char *argv[]) {
- if (argc > 1)
- filter_hash = (uint32_t)strtol(argv[1], NULL, 16);
- for (int i = 0; i < MAX_NESTING; i++) {
- closures[i] = i;
- }
-
- // Count tests.
- count = &total;
- total = 0;
- test_mode = COUNT_ONLY;
- run_tests();
- count = &completed;
-
- total *= 2; // NO_HANDLERS, ALL_HANDLERS.
-
- test_mode = NO_HANDLERS;
- run_tests();
-
- test_mode = ALL_HANDLERS;
- run_tests();
-
- printf("All tests passed, %d assertions.\n", num_assertions);
- return 0;
-}
-
-}
diff --git a/third_party/upb/tests/pb/test_decoder.proto b/third_party/upb/tests/pb/test_decoder.proto
deleted file mode 100644
index e9fa6ad32ce..00000000000
--- a/third_party/upb/tests/pb/test_decoder.proto
+++ /dev/null
@@ -1,128 +0,0 @@
-
-syntax = "proto2";
-
-enum TestEnum {
- FOO = 1;
-}
-
-message Empty {}
-
-message DecoderTest {
- optional double f_double = 1;
- optional float f_float = 2;
- optional int64 f_int64 = 3;
- optional uint64 f_uint64 = 4;
- optional int32 f_int32 = 5;
- optional fixed64 f_fixed64 = 6;
- optional fixed32 f_fixed32 = 7;
- optional bool f_bool = 8;
- optional string f_string = 9;
- optional DecoderTest f_message = 11;
- optional bytes f_bytes = 12;
- optional uint32 f_uint32 = 13;
- optional TestEnum f_enum = 14;
- optional sfixed32 f_sfixed32 = 15;
- optional sfixed64 f_sfixed64 = 16;
- optional sint32 f_sint32 = 17;
- optional sint64 f_sint64 = 18;
-
- optional string nop_field = 40;
-
- repeated double r_double = 536869912;
- repeated float r_float = 536869913;
- repeated int64 r_int64 = 536869914;
- repeated uint64 r_uint64 = 536869915;
- repeated int32 r_int32 = 536869916;
- repeated fixed64 r_fixed64 = 536869917;
- repeated fixed32 r_fixed32 = 536869918;
- repeated bool r_bool = 536869919;
- repeated string r_string = 536869920;
- repeated DecoderTest r_message = 536869922;
- repeated bytes r_bytes = 536869923;
- repeated uint32 r_uint32 = 536869924;
- repeated TestEnum r_enum = 536869925;
- repeated sfixed32 r_sfixed32 = 536869926;
- repeated sfixed64 r_sfixed64 = 536869927;
- repeated sint32 r_sint32 = 536869928;
- repeated sint64 r_sint64 = 536869929;
-
- optional group F_group = 10 {
- optional double f_double = 1;
- optional float f_float = 2;
- optional int64 f_int64 = 3;
- optional uint64 f_uint64 = 4;
- optional int32 f_int32 = 5;
- optional fixed64 f_fixed64 = 6;
- optional fixed32 f_fixed32 = 7;
- optional bool f_bool = 8;
- optional string f_string = 9;
- optional DecoderTest f_message = 11;
- optional bytes f_bytes = 12;
- optional uint32 f_uint32 = 13;
- optional TestEnum f_enum = 14;
- optional sfixed32 f_sfixed32 = 15;
- optional sfixed64 f_sfixed64 = 16;
- optional sint32 f_sint32 = 17;
- optional sint64 f_sint64 = 18;
-
- optional string nop_field = 40;
-
- repeated double r_double = 536869912;
- repeated float r_float = 536869913;
- repeated int64 r_int64 = 536869914;
- repeated uint64 r_uint64 = 536869915;
- repeated int32 r_int32 = 536869916;
- repeated fixed64 r_fixed64 = 536869917;
- repeated fixed32 r_fixed32 = 536869918;
- repeated bool r_bool = 536869919;
- repeated string r_string = 536869920;
- repeated DecoderTest r_message = 536869922;
- repeated bytes r_bytes = 536869923;
- repeated uint32 r_uint32 = 536869924;
- repeated TestEnum r_enum = 536869925;
- repeated sfixed32 r_sfixed32 = 536869926;
- repeated sfixed64 r_sfixed64 = 536869927;
- repeated sint32 r_sint32 = 536869928;
- repeated sint64 r_sint64 = 536869929;
- }
-
- optional group R_group = 536869921 {
- optional double f_double = 1;
- optional float f_float = 2;
- optional int64 f_int64 = 3;
- optional uint64 f_uint64 = 4;
- optional int32 f_int32 = 5;
- optional fixed64 f_fixed64 = 6;
- optional fixed32 f_fixed32 = 7;
- optional bool f_bool = 8;
- optional string f_string = 9;
- optional DecoderTest f_message = 11;
- optional bytes f_bytes = 12;
- optional uint32 f_uint32 = 13;
- optional TestEnum f_enum = 14;
- optional sfixed32 f_sfixed32 = 15;
- optional sfixed64 f_sfixed64 = 16;
- optional sint32 f_sint32 = 17;
- optional sint64 f_sint64 = 18;
-
- optional string nop_field = 40;
-
- repeated double r_double = 536869912;
- repeated float r_float = 536869913;
- repeated int64 r_int64 = 536869914;
- repeated uint64 r_uint64 = 536869915;
- repeated int32 r_int32 = 536869916;
- repeated fixed64 r_fixed64 = 536869917;
- repeated fixed32 r_fixed32 = 536869918;
- repeated bool r_bool = 536869919;
- repeated string r_string = 536869920;
- repeated DecoderTest r_message = 536869922;
- repeated bytes r_bytes = 536869923;
- repeated uint32 r_uint32 = 536869924;
- repeated TestEnum r_enum = 536869925;
- repeated sfixed32 r_sfixed32 = 536869926;
- repeated sfixed64 r_sfixed64 = 536869927;
- repeated sint32 r_sint32 = 536869928;
- repeated sint64 r_sint64 = 536869929;
- }
-}
diff --git a/third_party/upb/tests/pb/test_encoder.cc b/third_party/upb/tests/pb/test_encoder.cc
deleted file mode 100644
index b358ef592c0..00000000000
--- a/third_party/upb/tests/pb/test_encoder.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-
-#include
-
-#include "google/protobuf/descriptor.upb.h"
-#include "google/protobuf/descriptor.upbdefs.h"
-#include "tests/test_util.h"
-#include "tests/upb_test.h"
-#include "upb/pb/decoder.h"
-#include "upb/pb/encoder.h"
-#include "upb/port_def.inc"
-#include "upb/upb.hpp"
-
-template
-class FillStringHandler {
- public:
- static void SetHandler(upb_byteshandler* handler) {
- upb_byteshandler_setstartstr(handler, &FillStringHandler::StartString,
- NULL);
- upb_byteshandler_setstring(handler, &FillStringHandler::StringBuf, NULL);
- }
-
- private:
- // TODO(haberman): add UpbBind/UpbMakeHandler support to BytesHandler so these
- // can be prettier callbacks.
- static void* StartString(void *c, const void *hd, size_t size) {
- UPB_UNUSED(hd);
- UPB_UNUSED(size);
-
- T* str = static_cast(c);
- str->clear();
- return c;
- }
-
- static size_t StringBuf(void* c, const void* hd, const char* buf, size_t n,
- const upb_bufhandle* h) {
- UPB_UNUSED(hd);
- UPB_UNUSED(h);
-
- T* str = static_cast(c);
- try {
- str->append(buf, n);
- return n;
- } catch (const std::exception&) {
- return 0;
- }
- }
-};
-
-class StringSink {
- public:
- template
- explicit StringSink(T* target) {
- // TODO(haberman): we need to avoid rebuilding a new handler every time,
- // but with class globals disallowed for google3 C++ this is tricky.
- upb_byteshandler_init(&handler_);
- FillStringHandler::SetHandler(&handler_);
- input_.Reset(&handler_, target);
- }
-
- upb::BytesSink input() { return input_; }
-
- private:
- upb_byteshandler handler_;
- upb::BytesSink input_;
-};
-
-void test_pb_roundtrip() {
- std::string input(
- google_protobuf_descriptor_proto_upbdefinit.descriptor.data,
- google_protobuf_descriptor_proto_upbdefinit.descriptor.size);
- std::cout << input.size() << "\n";
- upb::SymbolTable symtab;
- upb::HandlerCache encoder_cache(upb::pb::EncoderPtr::NewCache());
- upb::pb::CodeCache decoder_cache(&encoder_cache);
- upb::Arena arena;
- upb::Status status;
- upb::MessageDefPtr md(
- google_protobuf_FileDescriptorProto_getmsgdef(symtab.ptr()));
- ASSERT(md);
- const upb::Handlers *encoder_handlers = encoder_cache.Get(md);
- ASSERT(encoder_handlers);
- const upb::pb::DecoderMethodPtr method = decoder_cache.Get(md);
-
- std::string output;
- StringSink string_sink(&output);
- upb::pb::EncoderPtr encoder =
- upb::pb::EncoderPtr::Create(&arena, encoder_handlers, string_sink.input());
- upb::pb::DecoderPtr decoder =
- upb::pb::DecoderPtr::Create(&arena, method, encoder.input(), &status);
- bool ok = upb::PutBuffer(input, decoder.input());
- ASSERT(ok);
- ASSERT(input == output);
-}
-
-extern "C" {
-int run_tests(int argc, char *argv[]) {
- UPB_UNUSED(argc);
- UPB_UNUSED(argv);
- test_pb_roundtrip();
- return 0;
-}
-}
diff --git a/third_party/upb/tests/test_cpp.cc b/third_party/upb/tests/test_cpp.cc
index 9d3f64acb3f..ece707b1db6 100644
--- a/third_party/upb/tests/test_cpp.cc
+++ b/third_party/upb/tests/test_cpp.cc
@@ -1,5 +1,29 @@
+// Copyright (c) 2009-2021, Google LLC
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of Google LLC nor the
+// names of its contributors may be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
/*
- *
* Tests for C++ wrappers.
*/
@@ -12,889 +36,16 @@
#include
#include "tests/test_cpp.upbdefs.h"
+#include "tests/test_cpp.upb.h"
#include "tests/upb_test.h"
#include "upb/def.h"
-#include "upb/handlers.h"
-#include "upb/pb/decoder.h"
-#include "upb/pb/textprinter.h"
-#include "upb/port_def.inc"
+#include "upb/def.hpp"
+#include "upb/json_decode.h"
+#include "upb/json_encode.h"
#include "upb/upb.h"
-template
-void AssertInsert(T* const container, const typename T::value_type& val) {
- bool inserted = container->insert(val).second;
- ASSERT(inserted);
-}
-
-//
-// Tests for registering and calling handlers in all their variants.
-// This test code is very repetitive because we have to declare each
-// handler function variant separately, and they all have different
-// signatures so it does not lend itself well to templates.
-//
-// We test three handler types:
-// StartMessage (no data params)
-// Int32 (1 data param (int32_t))
-// String Buf (2 data params (const char*, size_t))
-//
-// For each handler type we test all 8 handler variants:
-// (handler data?) x (function/method) x (returns {void, success})
-//
-// The one notable thing we don't test at the moment is
-// StartSequence/StartString handlers: these are different from StartMessage()
-// in that they return void* for the sub-closure. But this is exercised in
-// other tests.
-//
-
-static const int kExpectedHandlerData = 1232323;
-
-class StringBufTesterBase {
- public:
- static constexpr int kFieldNumber = 3;
-
- StringBufTesterBase() : seen_(false), handler_data_val_(0) {}
-
- void CallAndVerify(upb::Sink sink, upb::FieldDefPtr f) {
- upb_selector_t start;
- ASSERT(upb_handlers_getselector(f.ptr(), UPB_HANDLER_STARTSTR, &start));
- upb_selector_t str;
- ASSERT(upb_handlers_getselector(f.ptr(), UPB_HANDLER_STRING, &str));
-
- ASSERT(!seen_);
- upb::Sink sub;
- sink.StartMessage();
- sink.StartString(start, 0, &sub);
- size_t ret = sub.PutStringBuffer(str, &buf_, 5, &handle_);
- ASSERT(seen_);
- ASSERT(len_ == 5);
- ASSERT(ret == 5);
- ASSERT(handler_data_val_ == kExpectedHandlerData);
- }
-
- protected:
- bool seen_;
- int handler_data_val_;
- size_t len_;
- char buf_;
- upb_bufhandle handle_;
-};
-
-// Test 8 combinations of:
-// (handler data?) x (buffer handle?) x (function/method)
-//
-// Then we add one test each for this variation: to prevent combinatorial
-// explosion of these tests we don't test the full 16 combinations, but
-// rely on our knowledge that the implementation processes the return wrapping
-// in a second separate and independent stage:
-//
-// (function/method)
-
-class StringBufTesterVoidMethodNoHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidMethodNoHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- void Handler(const char *buf, size_t len) {
- ASSERT(buf == &buf_);
- seen_ = true;
- len_ = len;
- }
-};
-
-class StringBufTesterVoidMethodNoHandlerDataWithHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidMethodNoHandlerDataWithHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- void Handler(const char *buf, size_t len, const upb_bufhandle* handle) {
- ASSERT(buf == &buf_);
- ASSERT(handle == &handle_);
- seen_ = true;
- len_ = len;
- }
-};
-
-class StringBufTesterVoidMethodWithHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidMethodWithHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- void Handler(const int* hd, const char *buf, size_t len) {
- ASSERT(buf == &buf_);
- handler_data_val_ = *hd;
- seen_ = true;
- len_ = len;
- }
-};
-
-class StringBufTesterVoidMethodWithHandlerDataWithHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidMethodWithHandlerDataWithHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- void Handler(const int* hd, const char* buf, size_t len,
- const upb_bufhandle* handle) {
- ASSERT(buf == &buf_);
- ASSERT(handle == &handle_);
- handler_data_val_ = *hd;
- seen_ = true;
- len_ = len;
- }
-};
-
-class StringBufTesterVoidFunctionNoHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidFunctionNoHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- static void Handler(ME* t, const char *buf, size_t len) {
- ASSERT(buf == &t->buf_);
- t->seen_ = true;
- t->len_ = len;
- }
-};
-
-class StringBufTesterVoidFunctionNoHandlerDataWithHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidFunctionNoHandlerDataWithHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- static void Handler(ME* t, const char* buf, size_t len,
- const upb_bufhandle* handle) {
- ASSERT(buf == &t->buf_);
- ASSERT(handle == &t->handle_);
- t->seen_ = true;
- t->len_ = len;
- }
-};
-
-class StringBufTesterVoidFunctionWithHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidFunctionWithHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static void Handler(ME* t, const int* hd, const char *buf, size_t len) {
- ASSERT(buf == &t->buf_);
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- t->len_ = len;
- }
-};
-
-class StringBufTesterVoidFunctionWithHandlerDataWithHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterVoidFunctionWithHandlerDataWithHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static void Handler(ME* t, const int* hd, const char* buf, size_t len,
- const upb_bufhandle* handle) {
- ASSERT(buf == &t->buf_);
- ASSERT(handle == &t->handle_);
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- t->len_ = len;
- }
-};
-
-class StringBufTesterSizeTMethodNoHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterSizeTMethodNoHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- size_t Handler(const char *buf, size_t len) {
- ASSERT(buf == &buf_);
- seen_ = true;
- len_ = len;
- return len;
- }
-};
-
-class StringBufTesterBoolMethodNoHandlerDataNoHandle
- : public StringBufTesterBase {
- public:
- typedef StringBufTesterBoolMethodNoHandlerDataNoHandle ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStringHandler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- bool Handler(const char *buf, size_t len) {
- ASSERT(buf == &buf_);
- seen_ = true;
- len_ = len;
- return true;
- }
-};
-
-class StartMsgTesterBase {
- public:
- // We don't need the FieldDef it will create, but the test harness still
- // requires that we provide one.
- static constexpr int kFieldNumber = 3;
-
- StartMsgTesterBase() : seen_(false), handler_data_val_(0) {}
-
- void CallAndVerify(upb::Sink sink, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(!seen_);
- sink.StartMessage();
- ASSERT(seen_);
- ASSERT(handler_data_val_ == kExpectedHandlerData);
- }
-
- protected:
- bool seen_;
- int handler_data_val_;
-};
-
-// Test all 8 combinations of:
-// (handler data?) x (function/method) x (returns {void, bool})
-
-class StartMsgTesterVoidFunctionNoHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterVoidFunctionNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(UpbMakeHandler(&Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- //static void Handler(ME* t) {
- static void Handler(ME* t) {
- t->seen_ = true;
- }
-};
-
-class StartMsgTesterBoolFunctionNoHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterBoolFunctionNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(UpbMakeHandler(&Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- static bool Handler(ME* t) {
- t->seen_ = true;
- return true;
- }
-};
-
-class StartMsgTesterVoidMethodNoHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterVoidMethodNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- void Handler() {
- seen_ = true;
- }
-};
-
-class StartMsgTesterBoolMethodNoHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterBoolMethodNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- bool Handler() {
- seen_ = true;
- return true;
- }
-};
-
-class StartMsgTesterVoidFunctionWithHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterVoidFunctionWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(
- UpbBind(&Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static void Handler(ME* t, const int* hd) {
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- }
-};
-
-class StartMsgTesterBoolFunctionWithHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterBoolFunctionWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(
- UpbBind(&Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static bool Handler(ME* t, const int* hd) {
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- return true;
- }
-};
-
-class StartMsgTesterVoidMethodWithHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterVoidMethodWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(
- UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- void Handler(const int* hd) {
- handler_data_val_ = *hd;
- seen_ = true;
- }
-};
-
-class StartMsgTesterBoolMethodWithHandlerData : public StartMsgTesterBase {
- public:
- typedef StartMsgTesterBoolMethodWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- UPB_UNUSED(f);
- ASSERT(h.SetStartMessageHandler(
- UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- bool Handler(const int* hd) {
- handler_data_val_ = *hd;
- seen_ = true;
- return true;
- }
-};
-
-class Int32ValueTesterBase {
- public:
- static constexpr int kFieldNumber = 1;
-
- Int32ValueTesterBase() : seen_(false), val_(0), handler_data_val_(0) {}
-
- void CallAndVerify(upb::Sink sink, upb::FieldDefPtr f) {
- upb_selector_t s;
- ASSERT(upb_handlers_getselector(f.ptr(), UPB_HANDLER_INT32, &s));
-
- ASSERT(!seen_);
- sink.PutInt32(s, 5);
- ASSERT(seen_);
- ASSERT(handler_data_val_ == kExpectedHandlerData);
- ASSERT(val_ == 5);
- }
-
- protected:
- bool seen_;
- int32_t val_;
- int handler_data_val_;
-};
-
-// Test all 8 combinations of:
-// (handler data?) x (function/method) x (returns {void, bool})
-
-class ValueTesterInt32VoidFunctionNoHandlerData
- : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32VoidFunctionNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(f, UpbMakeHandler(&Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- static void Handler(ME* t, int32_t val) {
- t->val_ = val;
- t->seen_ = true;
- }
-};
-
-class ValueTesterInt32BoolFunctionNoHandlerData
- : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32BoolFunctionNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(f, UpbMakeHandler(&Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- static bool Handler(ME* t, int32_t val) {
- t->val_ = val;
- t->seen_ = true;
- return true;
- }
-};
-
-class ValueTesterInt32VoidMethodNoHandlerData : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32VoidMethodNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- void Handler(int32_t val) {
- val_ = val;
- seen_ = true;
- }
-};
-
-class ValueTesterInt32BoolMethodNoHandlerData : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32BoolMethodNoHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(f, UpbMakeHandler(&ME::Handler)));
- handler_data_val_ = kExpectedHandlerData;
- }
-
- private:
- bool Handler(int32_t val) {
- val_ = val;
- seen_ = true;
- return true;
- }
-};
-
-class ValueTesterInt32VoidFunctionWithHandlerData
- : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32VoidFunctionWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(
- f, UpbBind(&Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static void Handler(ME* t, const int* hd, int32_t val) {
- t->val_ = val;
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- }
-};
-
-class ValueTesterInt32BoolFunctionWithHandlerData
- : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32BoolFunctionWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(
- f, UpbBind(&Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- static bool Handler(ME* t, const int* hd, int32_t val) {
- t->val_ = val;
- t->handler_data_val_ = *hd;
- t->seen_ = true;
- return true;
- }
-};
-
-class ValueTesterInt32VoidMethodWithHandlerData : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32VoidMethodWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- void Handler(const int* hd, int32_t val) {
- val_ = val;
- handler_data_val_ = *hd;
- seen_ = true;
- }
-};
-
-class ValueTesterInt32BoolMethodWithHandlerData : public Int32ValueTesterBase {
- public:
- typedef ValueTesterInt32BoolMethodWithHandlerData ME;
- void Register(upb::HandlersPtr h, upb::FieldDefPtr f) {
- ASSERT(h.SetInt32Handler(
- f, UpbBind(&ME::Handler, new int(kExpectedHandlerData))));
- }
-
- private:
- bool Handler(const int* hd, int32_t val) {
- val_ = val;
- handler_data_val_ = *hd;
- seen_ = true;
- return true;
- }
-};
-
-template
-void RegisterHandlers(const void* closure, upb::Handlers* h_ptr) {
- T* tester = const_cast(static_cast(closure));
- upb::HandlersPtr h(h_ptr);
- upb::FieldDefPtr f = h.message_def().FindFieldByNumber(T::kFieldNumber);
- ASSERT(f);
- tester->Register(h, f);
-}
-
-template
-void TestHandler() {
- T tester;
- upb::SymbolTable symtab;
- upb::HandlerCache cache(&RegisterHandlers, &tester);
- upb::MessageDefPtr md(upb_test_TestMessage_getmsgdef(symtab.ptr()));
- ASSERT(md);
- upb::FieldDefPtr f = md.FindFieldByNumber(T::kFieldNumber);
- ASSERT(f);
-
- const upb::Handlers* h = cache.Get(md);
-
- upb::Sink sink(h, &tester);
- tester.CallAndVerify(sink, f);
-}
-
-class T1 {};
-class T2 {};
-
-template
-void DoNothingHandler(C* closure) {
- UPB_UNUSED(closure);
-}
-
-template
-void DoNothingInt32Handler(C* closure, int32_t val) {
- UPB_UNUSED(closure);
- UPB_UNUSED(val);
-}
-
-template
-class DoNothingStartHandler {
- public:
- // We wrap these functions inside of a class for a somewhat annoying reason.
- // UpbMakeHandler() is a macro, so we can't say
- // UpbMakeHandler(DoNothingStartHandler)
- //
- // because otherwise the preprocessor gets confused at the comma and tries to
- // make it two macro arguments. The usual solution doesn't work either:
- // UpbMakeHandler((DoNothingStartHandler))
- //
- // If we do that the macro expands correctly, but then it tries to pass that
- // parenthesized expression as a template parameter, ie. Type<(F)>, which
- // isn't legal C++ (Clang will compile it but complains with
- // warning: address non-type template argument cannot be surrounded by
- // parentheses
- //
- // This two-level thing allows us to effectively pass two template parameters,
- // but without any commas:
- // UpbMakeHandler(DoNothingStartHandler::Handler)
- template
- static R* Handler(C* closure) {
- UPB_UNUSED(closure);
- return NULL;
- }
-
- template
- static R* String(C* closure, size_t size_len) {
- UPB_UNUSED(closure);
- UPB_UNUSED(size_len);
- return NULL;
- }
-};
-
-template
-void DoNothingStringBufHandler(C* closure, const char *buf, size_t len) {
- UPB_UNUSED(closure);
- UPB_UNUSED(buf);
- UPB_UNUSED(len);
-}
-
-template
-void DoNothingEndMessageHandler(C* closure, upb_status *status) {
- UPB_UNUSED(closure);
- UPB_UNUSED(status);
-}
-
-void RegisterMismatchedTypes(const void* closure, upb::Handlers* h_ptr) {
- upb::HandlersPtr h(h_ptr);
- UPB_UNUSED(closure);
-
- upb::MessageDefPtr md(h.message_def());
- ASSERT(md);
- upb::FieldDefPtr i32 = md.FindFieldByName("i32");
- upb::FieldDefPtr r_i32 = md.FindFieldByName("r_i32");
- upb::FieldDefPtr str = md.FindFieldByName("str");
- upb::FieldDefPtr r_str = md.FindFieldByName("r_str");
- upb::FieldDefPtr msg = md.FindFieldByName("msg");
- upb::FieldDefPtr r_msg = md.FindFieldByName("r_msg");
- ASSERT(i32);
- ASSERT(r_i32);
- ASSERT(str);
- ASSERT(r_str);
- ASSERT(msg);
- ASSERT(r_msg);
-
- // Establish T1 as the top-level closure type.
- ASSERT(h.SetInt32Handler(i32, UpbMakeHandler(DoNothingInt32Handler)));
-
- // Now any other attempt to set another handler with T2 as the top-level
- // closure should fail. But setting these same handlers with T1 as the
- // top-level closure will succeed.
- ASSERT(!h.SetStartMessageHandler(UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetStartMessageHandler(UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(
- !h.SetEndMessageHandler(UpbMakeHandler(DoNothingEndMessageHandler)));
- ASSERT(
- h.SetEndMessageHandler(UpbMakeHandler(DoNothingEndMessageHandler)));
-
- ASSERT(!h.SetStartStringHandler(
- str, UpbMakeHandler(DoNothingStartHandler::String)));
- ASSERT(h.SetStartStringHandler(
- str, UpbMakeHandler(DoNothingStartHandler::String)));
-
- ASSERT(!h.SetEndStringHandler(str, UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndStringHandler(str, UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStartSubMessageHandler(
- msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSubMessageHandler(
- msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- ASSERT(
- !h.SetEndSubMessageHandler(msg, UpbMakeHandler(DoNothingHandler)));
- ASSERT(
- h.SetEndSubMessageHandler(msg, UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStartSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- ASSERT(!h.SetEndSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStartSequenceHandler(
- r_msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSequenceHandler(
- r_msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- ASSERT(!h.SetEndSequenceHandler(
- r_msg, UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndSequenceHandler(
- r_msg, UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStartSequenceHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSequenceHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- ASSERT(!h.SetEndSequenceHandler(
- r_str, UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndSequenceHandler(
- r_str, UpbMakeHandler(DoNothingHandler)));
-
- // By setting T1 as the return type for the Start* handlers we have
- // established T1 as the type of the sequence and string frames.
- // Setting callbacks that use T2 should fail, but T1 should succeed.
- ASSERT(
- !h.SetStringHandler(str, UpbMakeHandler(DoNothingStringBufHandler)));
- ASSERT(
- h.SetStringHandler(str, UpbMakeHandler(DoNothingStringBufHandler)));
-
- ASSERT(!h.SetInt32Handler(r_i32, UpbMakeHandler(DoNothingInt32Handler)));
- ASSERT(h.SetInt32Handler(r_i32, UpbMakeHandler(DoNothingInt32Handler)));
-
- ASSERT(!h.SetStartSubMessageHandler(
- r_msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSubMessageHandler(
- r_msg, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- ASSERT(!h.SetEndSubMessageHandler(r_msg,
- UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndSubMessageHandler(r_msg,
- UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStartStringHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::String)));
- ASSERT(h.SetStartStringHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::String)));
-
- ASSERT(
- !h.SetEndStringHandler(r_str, UpbMakeHandler(DoNothingHandler)));
- ASSERT(h.SetEndStringHandler(r_str, UpbMakeHandler(DoNothingHandler)));
-
- ASSERT(!h.SetStringHandler(r_str,
- UpbMakeHandler(DoNothingStringBufHandler)));
- ASSERT(h.SetStringHandler(r_str,
- UpbMakeHandler(DoNothingStringBufHandler)));
-}
-
-void RegisterMismatchedTypes2(const void* closure, upb::Handlers* h_ptr) {
- upb::HandlersPtr h(h_ptr);
- UPB_UNUSED(closure);
-
- upb::MessageDefPtr md(h.message_def());
- ASSERT(md);
- upb::FieldDefPtr i32 = md.FindFieldByName("i32");
- upb::FieldDefPtr r_i32 = md.FindFieldByName("r_i32");
- upb::FieldDefPtr str = md.FindFieldByName("str");
- upb::FieldDefPtr r_str = md.FindFieldByName("r_str");
- upb::FieldDefPtr msg = md.FindFieldByName("msg");
- upb::FieldDefPtr r_msg = md.FindFieldByName("r_msg");
- ASSERT(i32);
- ASSERT(r_i32);
- ASSERT(str);
- ASSERT(r_str);
- ASSERT(msg);
- ASSERT(r_msg);
-
- // For our second test we do the same in reverse. We directly set the type of
- // the frame and then observe failures at registering a Start* handler that
- // returns a different type.
-
- // First establish the type of a sequence frame directly.
- ASSERT(h.SetInt32Handler(r_i32, UpbMakeHandler(DoNothingInt32Handler)));
-
- // Now setting a StartSequence callback that returns a different type should
- // fail.
- ASSERT(!h.SetStartSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSequenceHandler(
- r_i32, UpbMakeHandler(DoNothingStartHandler::Handler)));
-
- // Establish a string frame directly.
- ASSERT(h.SetStringHandler(r_str,
- UpbMakeHandler(DoNothingStringBufHandler)));
-
- // Fail setting a StartString callback that returns a different type.
- ASSERT(!h.SetStartStringHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::String)));
- ASSERT(h.SetStartStringHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::String)));
-
- // The previous established T1 as the frame for the r_str sequence.
- ASSERT(!h.SetStartSequenceHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::Handler)));
- ASSERT(h.SetStartSequenceHandler(
- r_str, UpbMakeHandler(DoNothingStartHandler::Handler)));
-}
-
-void TestMismatchedTypes() {
- // First create a schema for our test.
- upb::SymbolTable symtab;
- upb::HandlerCache handler_cache(&RegisterMismatchedTypes, nullptr);
- upb::HandlerCache handler_cache2(&RegisterMismatchedTypes2, nullptr);
- const upb::MessageDefPtr md(upb_test_TestMessage_getmsgdef(symtab.ptr()));
-
- // Now test the type-checking in handler registration.
- handler_cache.Get(md);
- handler_cache2.Get(md);
-}
-
-class IntIncrementer {
- public:
- explicit IntIncrementer(int* x) : x_(x) { (*x_)++; }
- ~IntIncrementer() { (*x_)--; }
-
- static void Handler(void* closure, const IntIncrementer* incrementer,
- int32_t x) {
- UPB_UNUSED(closure);
- UPB_UNUSED(incrementer);
- UPB_UNUSED(x);
- }
-
- private:
- int* x_;
-};
-
-void RegisterIncrementor(const void* closure, upb::Handlers* h_ptr) {
- const int* x = static_cast(closure);
- upb::HandlersPtr h(h_ptr);
- upb::FieldDefPtr f = h.message_def().FindFieldByName("i32");
- h.SetInt32Handler(f, UpbBind(&IntIncrementer::Handler,
- new IntIncrementer(const_cast(x))));
-}
-
-void TestHandlerDataDestruction() {
- int x = 0;
-
- {
- upb::SymbolTable symtab;
- upb::HandlerCache cache(&RegisterIncrementor, &x);
- upb::MessageDefPtr md(upb_test_TestMessage_getmsgdef(symtab.ptr()));
- cache.Get(md);
- ASSERT(x == 1);
- }
-
- ASSERT(x == 0);
-}
+// Must be last.
+#include "upb/port_def.inc"
void TestIteration() {
upb::SymbolTable symtab;
@@ -977,43 +128,32 @@ void TestInlinedArena() {
ASSERT(n == 0);
}
-extern "C" {
-
-int run_tests() {
- TestHandler