diff --git a/Package.swift b/Package.swift
index c571733bf3bf9..bf776fc9fb354 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2197,6 +2197,7 @@ let package = Package(
"third_party/upb/upb/reflection/def_type.c",
"third_party/upb/upb/reflection/def_type.h",
"third_party/upb/upb/reflection/desc_state.c",
+ "third_party/upb/upb/reflection/descriptor_bootstrap.h",
"third_party/upb/upb/reflection/enum_def.c",
"third_party/upb/upb/reflection/enum_def.h",
"third_party/upb/upb/reflection/enum_reserved_range.c",
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index 539be2bdd43b0..f90cce94a764e 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -58,12 +58,12 @@ def grpc_deps():
if "com_google_protobuf" not in native.existing_rules():
http_archive(
name = "com_google_protobuf",
- sha256 = "8766fce06ef41d79cb6037d04be37df3d5c493d9da92517a7243640d6389f03c",
- strip_prefix = "protobuf-10ef3f77683f77fb3c059bf47725c27b3ff41e63",
+ sha256 = "cf2db029202bb8eb1471b9bae387cc475d15d9e99c547e6906155033f81249a5",
+ strip_prefix = "protobuf-2d4414f384dc499af113b5991ce3eaa9df6dd931",
urls = [
- # https://github.com/protocolbuffers/protobuf/commits/v28.1
- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz",
- "https://github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz",
+ # https://github.com/protocolbuffers/protobuf/commits/v29.0
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2d4414f384dc499af113b5991ce3eaa9df6dd931.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/2d4414f384dc499af113b5991ce3eaa9df6dd931.tar.gz",
],
patches = [
"@com_github_grpc_grpc//third_party:protobuf.patch",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 925c6ba710b6e..c9015d2e16699 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -3334,6 +3334,7 @@ libs:
- third_party/upb/upb/reflection/def.hpp
- third_party/upb/upb/reflection/def_pool.h
- third_party/upb/upb/reflection/def_type.h
+ - third_party/upb/upb/reflection/descriptor_bootstrap.h
- third_party/upb/upb/reflection/enum_def.h
- third_party/upb/upb/reflection/enum_reserved_range.h
- third_party/upb/upb/reflection/enum_value_def.h
@@ -3538,6 +3539,7 @@ libs:
- third_party/upb/upb/reflection/def.hpp
- third_party/upb/upb/reflection/def_pool.h
- third_party/upb/upb/reflection/def_type.h
+ - third_party/upb/upb/reflection/descriptor_bootstrap.h
- third_party/upb/upb/reflection/enum_def.h
- third_party/upb/upb/reflection/enum_reserved_range.h
- third_party/upb/upb/reflection/enum_value_def.h
diff --git a/build_handwritten.yaml b/build_handwritten.yaml
index 4c75efd19c0ea..3e456bdbc2e7b 100644
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@@ -15,7 +15,7 @@ settings:
core_version: 44.1.0
csharp_major_version: 2
g_stands_for: gridiron
- protobuf_version: 3.28.1
+ protobuf_version: 3.29.0
supported_python_versions:
- '3.8'
- '3.9'
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 7ed582d9010c8..7e47820b4197d 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -1506,6 +1506,7 @@ Pod::Spec.new do |s|
'third_party/upb/upb/reflection/def.hpp',
'third_party/upb/upb/reflection/def_pool.h',
'third_party/upb/upb/reflection/def_type.h',
+ 'third_party/upb/upb/reflection/descriptor_bootstrap.h',
'third_party/upb/upb/reflection/enum_def.h',
'third_party/upb/upb/reflection/enum_reserved_range.h',
'third_party/upb/upb/reflection/enum_value_def.h',
@@ -2748,6 +2749,7 @@ Pod::Spec.new do |s|
'third_party/upb/upb/reflection/def.hpp',
'third_party/upb/upb/reflection/def_pool.h',
'third_party/upb/upb/reflection/def_type.h',
+ 'third_party/upb/upb/reflection/descriptor_bootstrap.h',
'third_party/upb/upb/reflection/enum_def.h',
'third_party/upb/upb/reflection/enum_reserved_range.h',
'third_party/upb/upb/reflection/enum_value_def.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 436b8fb0d82d9..fb7a87f47e83d 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -2327,6 +2327,7 @@ Pod::Spec.new do |s|
'third_party/upb/upb/reflection/def_type.c',
'third_party/upb/upb/reflection/def_type.h',
'third_party/upb/upb/reflection/desc_state.c',
+ 'third_party/upb/upb/reflection/descriptor_bootstrap.h',
'third_party/upb/upb/reflection/enum_def.c',
'third_party/upb/upb/reflection/enum_def.h',
'third_party/upb/upb/reflection/enum_reserved_range.c',
@@ -3589,6 +3590,7 @@ Pod::Spec.new do |s|
'third_party/upb/upb/reflection/def.hpp',
'third_party/upb/upb/reflection/def_pool.h',
'third_party/upb/upb/reflection/def_type.h',
+ 'third_party/upb/upb/reflection/descriptor_bootstrap.h',
'third_party/upb/upb/reflection/enum_def.h',
'third_party/upb/upb/reflection/enum_reserved_range.h',
'third_party/upb/upb/reflection/enum_value_def.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 12c8ece0bd179..141ed8a3b1e2c 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -3264,6 +3264,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/upb/upb/reflection/def_type.c )
s.files += %w( third_party/upb/upb/reflection/def_type.h )
s.files += %w( third_party/upb/upb/reflection/desc_state.c )
+ s.files += %w( third_party/upb/upb/reflection/descriptor_bootstrap.h )
s.files += %w( third_party/upb/upb/reflection/enum_def.c )
s.files += %w( third_party/upb/upb/reflection/enum_def.h )
s.files += %w( third_party/upb/upb/reflection/enum_reserved_range.c )
diff --git a/package.xml b/package.xml
index fa379471d1dd2..64e221f9909ca 100644
--- a/package.xml
+++ b/package.xml
@@ -3178,6 +3178,7 @@
+
diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc
index 3f5014d0db636..6536f9c78a52e 100644
--- a/src/core/client_channel/direct_channel.cc
+++ b/src/core/client_channel/direct_channel.cc
@@ -59,7 +59,7 @@ void DirectChannel::StartCall(UnstartedCallHandler unstarted_handler) {
"start",
[interception_chain = interception_chain_, unstarted_handler]() mutable {
interception_chain->StartCall(std::move(unstarted_handler));
- return []() { return Empty{}; };
+ return []() {};
});
}
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index fd33c44bad66d..9528465b013bb 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -238,7 +238,6 @@ void ChaoticGoodClientTransport::AbortWithError() {
call_handler.SpawnInfallible("cancel", [call_handler]() mutable {
call_handler.PushServerTrailingMetadata(ServerMetadataFromStatus(
absl::UnavailableError("Transport closed.")));
- return Empty{};
});
}
}
diff --git a/src/core/ext/transport/chaotic_good/data_endpoints.cc b/src/core/ext/transport/chaotic_good/data_endpoints.cc
index c69ca25677288..023bd81a70e17 100644
--- a/src/core/ext/transport/chaotic_good/data_endpoints.cc
+++ b/src/core/ext/transport/chaotic_good/data_endpoints.cc
@@ -219,7 +219,6 @@ DataEndpoints::DataEndpoints(
input_queues](absl::StatusOr buffer) {
input_queues->CompleteRead(ticket,
std::move(buffer));
- return Empty{};
});
});
},
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 3a9a75fd6eded..ba8e6155d7629 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -366,10 +366,8 @@ void ChaoticGoodServerTransport::AbortWithError() {
lock.Release();
for (const auto& pair : stream_map) {
auto call_initiator = pair.second;
- call_initiator.SpawnInfallible("cancel", [call_initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ call_initiator.SpawnInfallible(
+ "cancel", [call_initiator]() mutable { call_initiator.Cancel(); });
}
}
@@ -418,10 +416,7 @@ absl::Status ChaoticGoodServerTransport::NewStream(
self->ExtractStream(stream_id);
if (call_initiator.has_value()) {
auto c = std::move(*call_initiator);
- c.SpawnInfallible("cancel", [c]() mutable {
- c.Cancel();
- return Empty{};
- });
+ c.SpawnInfallible("cancel", [c]() mutable { c.Cancel(); });
}
});
if (!on_done_added) {
diff --git a/src/core/ext/transport/chaotic_good_legacy/client_transport.cc b/src/core/ext/transport/chaotic_good_legacy/client_transport.cc
index c8a695fb0ce92..ff25875f55bee 100644
--- a/src/core/ext/transport/chaotic_good_legacy/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good_legacy/client_transport.cc
@@ -246,7 +246,6 @@ void ChaoticGoodClientTransport::AbortWithError() {
call_handler.SpawnInfallible("cancel", [call_handler]() mutable {
call_handler.PushServerTrailingMetadata(ServerMetadataFromStatus(
absl::UnavailableError("Transport closed.")));
- return Empty{};
});
}
}
diff --git a/src/core/ext/transport/chaotic_good_legacy/server_transport.cc b/src/core/ext/transport/chaotic_good_legacy/server_transport.cc
index a7909ff541e37..b78109024a6be 100644
--- a/src/core/ext/transport/chaotic_good_legacy/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good_legacy/server_transport.cc
@@ -224,7 +224,6 @@ auto ChaoticGoodServerTransport::CallOutboundLoop(
GRPC_TRACE_VLOG(chaotic_good, 2)
<< "CHAOTIC_GOOD: CallOutboundLoop: stream_id=" << stream_id
<< " main_body_result=" << main_body_result;
- return Empty{};
}),
call_initiator.PullServerTrailingMetadata(),
// Capture the call_initator to ensure the underlying call_spine
@@ -422,10 +421,8 @@ void ChaoticGoodServerTransport::AbortWithError() {
lock.Release();
for (const auto& pair : stream_map) {
auto call_initiator = pair.second;
- call_initiator.SpawnInfallible("cancel", [call_initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ call_initiator.SpawnInfallible(
+ "cancel", [call_initiator]() mutable { call_initiator.Cancel(); });
}
}
@@ -474,10 +471,7 @@ absl::Status ChaoticGoodServerTransport::NewStream(
self->ExtractStream(stream_id);
if (call_initiator.has_value()) {
auto c = std::move(*call_initiator);
- c.SpawnInfallible("cancel", [c]() mutable {
- c.Cancel();
- return Empty{};
- });
+ c.SpawnInfallible("cancel", [c]() mutable { c.Cancel(); });
}
});
if (!on_done_added) {
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 000767ad0f9ea..0738d371fb828 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -562,6 +562,10 @@ static void read_channel_args(grpc_chttp2_transport* t,
t->max_concurrent_streams_overload_protection =
channel_args.GetBool(GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION)
.value_or(true);
+
+ t->max_concurrent_streams_reject_on_client =
+ channel_args.GetBool(GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT)
+ .value_or(false);
}
static void init_keepalive_pings_if_enabled_locked(
@@ -1427,8 +1431,24 @@ static void send_initial_metadata_locked(
if (t->is_client) {
if (t->closed_with_error.ok()) {
CHECK_EQ(s->id, 0u);
- grpc_chttp2_list_add_waiting_for_concurrency(t, s);
- maybe_start_some_streams(t);
+ if (t->max_concurrent_streams_reject_on_client &&
+ t->stream_map.size() >=
+ t->settings.peer().max_concurrent_streams()) {
+ s->trailing_metadata_buffer.Set(
+ grpc_core::GrpcStreamNetworkState(),
+ grpc_core::GrpcStreamNetworkState::kNotSentOnWire);
+ grpc_chttp2_cancel_stream(
+ t, s,
+ grpc_error_set_int(
+ GRPC_ERROR_CREATE_REFERENCING("Too many streams",
+ &t->closed_with_error, 1),
+ grpc_core::StatusIntProperty::kRpcStatus,
+ GRPC_STATUS_RESOURCE_EXHAUSTED),
+ false);
+ } else {
+ grpc_chttp2_list_add_waiting_for_concurrency(t, s);
+ maybe_start_some_streams(t);
+ }
} else {
s->trailing_metadata_buffer.Set(
grpc_core::GrpcStreamNetworkState(),
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index 6f1dabf8f875b..7336d32322881 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -548,6 +548,7 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport,
/// True if we count stream allocation (instead of HTTP2 concurrency) for
/// MAX_CONCURRENT_STREAMS
bool max_concurrent_streams_overload_protection = false;
+ bool max_concurrent_streams_reject_on_client = false;
// What percentage of rst_stream frames on the server should cause a ping
// frame to be generated.
@@ -706,6 +707,11 @@ struct grpc_chttp2_stream {
#define GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION \
"grpc.http.overload_protection"
+// EXPERIMENTAL: Fail requests at the client if the client is over max
+// concurrent streams, so they may be retried elsewhere.
+#define GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT \
+ "grpc.http.max_concurrent_streams_reject_on_client"
+
/// Transport writing call flow:
/// grpc_chttp2_initiate_write() is called anywhere that we know bytes need to
/// go out on the wire.
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
index f2e222df85e02..183950d3529c4 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -766,4 +766,4 @@ UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
index 945e299b318e8..b60cce35bf566 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_Certificates_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Certificates__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__Certificate_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = {
};
const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
- &envoy_admin_v3_Certificates_submsgs[0],
+ &envoy_admin_v3_Certificates__submsgs[0],
&envoy_admin_v3_Certificates__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__Certificates_msg_init_ptr = &envoy__admin__v3__Certificates_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_Certificate_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Certificate__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr},
};
@@ -50,7 +50,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
};
const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
- &envoy_admin_v3_Certificate_submsgs[0],
+ &envoy_admin_v3_Certificate__submsgs[0],
&envoy_admin_v3_Certificate__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -65,7 +65,7 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__Certificate_msg_init_ptr = &envoy__admin__v3__Certificate_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__SubjectAlternateName_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
@@ -83,7 +83,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
};
const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
- &envoy_admin_v3_CertificateDetails_submsgs[0],
+ &envoy_admin_v3_CertificateDetails__submsgs[0],
&envoy_admin_v3_CertificateDetails__fields[0],
UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -102,7 +102,7 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__CertificateDetails_msg_init_ptr = &envoy__admin__v3__CertificateDetails_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__f
};
const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = {
- &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0],
+ &envoy_admin_v3_CertificateDetails_OcspDetails__submsgs[0],
&envoy_admin_v3_CertificateDetails_OcspDetails__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
index 7174dbbf9eb2c..4cc36e037b499 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
index 675ad836ed31b..a8725113e94ad 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -880,4 +880,4 @@ UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admi
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
index 7782060e992a9..70f4b4e74e9e8 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_Clusters_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Clusters__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClusterStatus_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = {
};
const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
- &envoy_admin_v3_Clusters_submsgs[0],
+ &envoy_admin_v3_Clusters__submsgs[0],
&envoy_admin_v3_Clusters__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -44,7 +44,7 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__Clusters_msg_init_ptr = &envoy__admin__v3__Clusters_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostStatus_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -63,7 +63,7 @@ static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
};
const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
- &envoy_admin_v3_ClusterStatus_submsgs[0],
+ &envoy_admin_v3_ClusterStatus__submsgs[0],
&envoy_admin_v3_ClusterStatus__fields[0],
UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ClusterStatus_msg_init_ptr = &envoy__admin__v3__ClusterStatus_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__SimpleMetric_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostHealthStatus_msg_init_ptr},
@@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
};
const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = {
- &envoy_admin_v3_HostStatus_submsgs[0],
+ &envoy_admin_v3_HostStatus__submsgs[0],
&envoy_admin_v3_HostStatus__fields[0],
UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
index be0925efba9a0..712835d2d747a 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
index becc1985eaee1..81f4529bbce8d 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -777,4 +777,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSe
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
index 3a446cc84548f..9f8b33095138c 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = {
};
const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
- &envoy_admin_v3_ConfigDump_submsgs[0],
+ &envoy_admin_v3_ConfigDump__submsgs[0],
&envoy_admin_v3_ConfigDump__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -42,7 +42,7 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ConfigDump_msg_init_ptr = &envoy__admin__v3__ConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -53,7 +53,7 @@ static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] =
};
const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
- &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
+ &envoy_admin_v3_BootstrapConfigDump__submsgs[0],
&envoy_admin_v3_BootstrapConfigDump__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -62,7 +62,7 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__BootstrapConfigDump_msg_init_ptr = &envoy__admin__v3__BootstrapConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr},
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
};
const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
- &envoy_admin_v3_SecretsConfigDump_submsgs[0],
+ &envoy_admin_v3_SecretsConfigDump__submsgs[0],
&envoy_admin_v3_SecretsConfigDump__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__SecretsConfigDump_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -106,7 +106,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__
};
const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init = {
- &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
+ &envoy_admin_v3_SecretsConfigDump_DynamicSecret__submsgs[0],
&envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -125,7 +125,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init
};
const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -137,7 +137,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__f
};
const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = {
- &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
+ &envoy_admin_v3_SecretsConfigDump_StaticSecret__submsgs[0],
&envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
index 4a92db9585f9a..151259ffd9e51 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
index 925854c0fd270..c3f7e3c738b06 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2957,4 +2957,4 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
index e53741de3d3af..01a408d1e4af9 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
};
const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
- &envoy_admin_v3_UpdateFailureState_submsgs[0],
+ &envoy_admin_v3_UpdateFailureState__submsgs[0],
&envoy_admin_v3_UpdateFailureState__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__UpdateFailureState_msg_init_ptr = &envoy__admin__v3__UpdateFailureState_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr},
};
@@ -62,7 +62,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] =
};
const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
- &envoy_admin_v3_ListenersConfigDump_submsgs[0],
+ &envoy_admin_v3_ListenersConfigDump__submsgs[0],
&envoy_admin_v3_ListenersConfigDump__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -77,7 +77,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ListenersConfigDump_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListene
};
const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init = {
- &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
+ &envoy_admin_v3_ListenersConfigDump_StaticListener__submsgs[0],
&envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -97,7 +97,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in
};
const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -109,7 +109,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
};
const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init = {
- &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
+ &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__submsgs[0],
&envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -122,7 +122,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_
};
const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr},
@@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
};
const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init = {
- &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
+ &envoy_admin_v3_ListenersConfigDump_DynamicListener__submsgs[0],
&envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -158,7 +158,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i
};
const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr},
@@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
};
const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
- &envoy_admin_v3_ClustersConfigDump_submsgs[0],
+ &envoy_admin_v3_ClustersConfigDump__submsgs[0],
&envoy_admin_v3_ClustersConfigDump__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -191,7 +191,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ClustersConfigDump_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -202,7 +202,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster_
};
const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init = {
- &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
+ &envoy_admin_v3_ClustersConfigDump_StaticCluster__submsgs[0],
&envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -211,7 +211,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init
};
const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -226,7 +226,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster
};
const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init = {
- &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
+ &envoy_admin_v3_ClustersConfigDump_DynamicCluster__submsgs[0],
&envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -245,7 +245,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini
};
const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr},
};
@@ -256,7 +256,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
};
const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
- &envoy_admin_v3_RoutesConfigDump_submsgs[0],
+ &envoy_admin_v3_RoutesConfigDump__submsgs[0],
&envoy_admin_v3_RoutesConfigDump__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -271,7 +271,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__RoutesConfigDump_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfi
};
const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init = {
- &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
+ &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__submsgs[0],
&envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -291,7 +291,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in
};
const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -306,7 +306,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConf
};
const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init = {
- &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
+ &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__submsgs[0],
&envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -325,7 +325,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i
};
const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr},
};
@@ -336,7 +336,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2]
};
const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
- &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
+ &envoy_admin_v3_ScopedRoutesConfigDump__submsgs[0],
&envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScop
};
const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init = {
- &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
+ &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__submsgs[0],
&envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -378,7 +378,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC
};
const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -394,7 +394,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicSco
};
const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init = {
- &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
+ &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__submsgs[0],
&envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -413,7 +413,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute
};
const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr},
};
@@ -424,7 +424,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] =
};
const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
- &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
+ &envoy_admin_v3_EndpointsConfigDump__submsgs[0],
&envoy_admin_v3_EndpointsConfigDump__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -439,7 +439,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -450,7 +450,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpoin
};
const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init = {
- &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
+ &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__submsgs[0],
&envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -459,7 +459,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_
};
const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -474,7 +474,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpoi
};
const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init = {
- &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
+ &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__submsgs[0],
&envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -493,7 +493,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig
};
const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr},
};
@@ -502,7 +502,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = {
};
const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
- &envoy_admin_v3_EcdsConfigDump_submsgs[0],
+ &envoy_admin_v3_EcdsConfigDump__submsgs[0],
&envoy_admin_v3_EcdsConfigDump__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -515,7 +515,7 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__EcdsConfigDump_msg_init_ptr = &envoy__admin__v3__EcdsConfigDump_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -530,7 +530,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__
};
const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init = {
- &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0],
+ &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__submsgs[0],
&envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
index fc75e9d4a1874..511f4ab8448a8 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -65,4 +65,4 @@ extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
index 6b8e432f54b9b..699234353e7ca 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -252,4 +252,4 @@ UPB_INLINE bool envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_add_target
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
index 296372af06850..353406b501eb2 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr},
};
@@ -24,7 +24,7 @@ static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] =
};
const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = {
- &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0],
+ &envoy_admin_v3_UnreadyTargetsDumps__submsgs[0],
&envoy_admin_v3_UnreadyTargetsDumps__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
index afd3edd461e0c..06de230e9fb8e 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
index 885a8d3d2a250..ec33a4f35628b 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -292,4 +292,4 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_ad
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
index 1d62eedf11390..e49f7d25cd353 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_Listeners_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_Listeners__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenerStatus_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = {
};
const upb_MiniTable envoy__admin__v3__Listeners_msg_init = {
- &envoy_admin_v3_Listeners_submsgs[0],
+ &envoy_admin_v3_Listeners__submsgs[0],
&envoy_admin_v3_Listeners__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable envoy__admin__v3__Listeners_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__Listeners_msg_init_ptr = &envoy__admin__v3__Listeners_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
};
@@ -51,7 +51,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
};
const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = {
- &envoy_admin_v3_ListenerStatus_submsgs[0],
+ &envoy_admin_v3_ListenerStatus__submsgs[0],
&envoy_admin_v3_ListenerStatus__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
index 998a4b864e961..0d55265067dd6 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
index b7f76250e76bd..1114211e46ad3 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -167,4 +167,4 @@ UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Me
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
index 9a6048ddb24dc..1c70ef5a5fb51 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
index 1fac77166b757..3cbdd32ec4f1e 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -124,4 +124,4 @@ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
index 750f80aa6c980..749d7b8012455 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
index 7f1ea08c32e0a..4e4d05ed9fde4 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -119,4 +119,4 @@ UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
index 44518b846d50e..d6e194e6eb28e 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
index 288d9b6dd85a1..df8c3066d13bd 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1011,4 +1011,4 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_parent_st
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
index 831d87e0f4ffa..38181cf92df2b 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__CommandLineOptions_msg_init_ptr},
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
};
const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
- &envoy_admin_v3_ServerInfo_submsgs[0],
+ &envoy_admin_v3_ServerInfo__submsgs[0],
&envoy_admin_v3_ServerInfo__fields[0],
UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
};
const upb_MiniTable* envoy__admin__v3__ServerInfo_msg_init_ptr = &envoy__admin__v3__ServerInfo_msg_init;
-static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -101,7 +101,7 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] =
};
const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = {
- &envoy_admin_v3_CommandLineOptions_submsgs[0],
+ &envoy_admin_v3_CommandLineOptions__submsgs[0],
&envoy_admin_v3_CommandLineOptions__fields[0],
UPB_SIZE(192, 304), 36, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
index 66fa34fc53813..bd2698123d79b 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
index 763012d156db7..09d186c4dc766 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_
-#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -120,4 +120,4 @@ UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutab
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ */
+#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
index 80e4e0894e23c..cbb0c1d1b699a 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__TapConfig_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
};
const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = {
- &envoy_admin_v3_TapRequest_submsgs[0],
+ &envoy_admin_v3_TapRequest__submsgs[0],
&envoy_admin_v3_TapRequest__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
index 0bd49aa2af7f7..4fd0486202a89 100644
--- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
index 83f8f0a064d33..cc4f98db05dad 100644
--- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_
-#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -128,4 +128,4 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ */
+#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
index 47d7324f0e300..06b1bb04ea0a2 100644
--- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h
index 8210346965843..72033592edf28 100644
--- a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -91,7 +91,7 @@ UPB_INLINE const envoy_annotations_ResourceAnnotation* envoy_annotations_resourc
const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const envoy_annotations_ResourceAnnotation* default_val = NULL;
const envoy_annotations_ResourceAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -101,7 +101,7 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt
const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -120,4 +120,4 @@ UPB_INLINE struct envoy_annotations_ResourceAnnotation* envoy_annotations_mutabl
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ */
+#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
index 56bbdca48414d..f0e785ea56e06 100644
--- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
@@ -35,7 +35,7 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = {
const upb_MiniTable* envoy__annotations__ResourceAnnotation_msg_init_ptr = &envoy__annotations__ResourceAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension envoy_annotations_resource_ext = {
- {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__ServiceOptions_msg_init,
{.UPB_PRIVATE(submsg) = &envoy__annotations__ResourceAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
index b9a0330670b80..31b5c25be5360 100644
--- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
index 1c9e6d5e446bc..71453655ca28a 100644
--- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1851,4 +1851,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
index 807f8ade0dcc6..bae85f03d2a42 100644
--- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
@@ -24,7 +24,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] =
};
const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
- &envoy_config_accesslog_v3_AccessLog_submsgs[0],
+ &envoy_config_accesslog_v3_AccessLog__submsgs[0],
&envoy_config_accesslog_v3_AccessLog__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__AccessLog_msg_init_ptr = &envoy__config__accesslog__v3__AccessLog_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter__submsgs[13] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__DurationFilter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr},
@@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__field
};
const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
- &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0],
+ &envoy_config_accesslog_v3_AccessLogFilter__submsgs[0],
&envoy_config_accesslog_v3_AccessLogFilter__fields[0],
UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr = &envoy__config__accesslog__v3__AccessLogFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeUInt32_msg_init_ptr},
};
@@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fiel
};
const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
- &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0],
+ &envoy_config_accesslog_v3_ComparisonFilter__submsgs[0],
&envoy_config_accesslog_v3_ComparisonFilter__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr = &envoy__config__accesslog__v3__ComparisonFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr},
};
@@ -147,7 +147,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fiel
};
const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
- &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0],
+ &envoy_config_accesslog_v3_StatusCodeFilter__submsgs[0],
&envoy_config_accesslog_v3_StatusCodeFilter__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -156,7 +156,7 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr},
};
@@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields
};
const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = {
- &envoy_config_accesslog_v3_DurationFilter_submsgs[0],
+ &envoy_config_accesslog_v3_DurationFilter__submsgs[0],
&envoy_config_accesslog_v3_DurationFilter__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -194,7 +194,7 @@ const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr = &envoy__config__accesslog__v3__TraceableFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
};
@@ -205,7 +205,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[
};
const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
- &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0],
+ &envoy_config_accesslog_v3_RuntimeFilter__submsgs[0],
&envoy_config_accesslog_v3_RuntimeFilter__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr = &envoy__config__accesslog__v3__RuntimeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
};
@@ -229,7 +229,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] =
};
const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
- &envoy_config_accesslog_v3_AndFilter_submsgs[0],
+ &envoy_config_accesslog_v3_AndFilter__submsgs[0],
&envoy_config_accesslog_v3_AndFilter__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -242,7 +242,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__AndFilter_msg_init_ptr = &envoy__config__accesslog__v3__AndFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
};
@@ -251,7 +251,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] =
};
const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
- &envoy_config_accesslog_v3_OrFilter_submsgs[0],
+ &envoy_config_accesslog_v3_OrFilter__submsgs[0],
&envoy_config_accesslog_v3_OrFilter__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -266,7 +266,7 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__OrFilter_msg_init_ptr = &envoy__config__accesslog__v3__OrFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
};
@@ -275,7 +275,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1
};
const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = {
- &envoy_config_accesslog_v3_HeaderFilter_submsgs[0],
+ &envoy_config_accesslog_v3_HeaderFilter__submsgs[0],
&envoy_config_accesslog_v3_HeaderFilter__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -323,7 +323,7 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -334,7 +334,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields
};
const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = {
- &envoy_config_accesslog_v3_MetadataFilter_submsgs[0],
+ &envoy_config_accesslog_v3_MetadataFilter__submsgs[0],
&envoy_config_accesslog_v3_MetadataFilter__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -364,7 +364,7 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = {
};
const upb_MiniTable* envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr = &envoy__config__accesslog__v3__LogTypeFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -374,7 +374,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__field
};
const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = {
- &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0],
+ &envoy_config_accesslog_v3_ExtensionFilter__submsgs[0],
&envoy_config_accesslog_v3_ExtensionFilter__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
index cce74f27d398f..20cbe2a50c780 100644
--- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_fil
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
index dc32c481dd019..79485c78a0bd8 100644
--- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_
-#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -3993,4 +3993,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
index 563353a211903..501cf7c47342f 100644
--- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
@@ -38,7 +38,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_submsgs[31] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap__submsgs[31] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr},
@@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[39]
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap__fields[0],
UPB_SIZE(192, 344), 39, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -158,7 +158,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_StaticResources__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init_ptr},
@@ -171,7 +171,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResour
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_StaticResources__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -186,7 +186,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_DynamicResources__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr},
@@ -201,7 +201,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResou
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0],
UPB_SIZE(40, 72), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_ms
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init_ptr},
};
@@ -229,7 +229,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationL
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -238,7 +238,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -248,7 +248,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationL
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -281,7 +281,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -290,7 +290,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncCli
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -299,7 +299,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientMana
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -309,7 +309,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateP
};
const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init = {
- &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0],
+ &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__submsgs[0],
&envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -322,7 +322,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProvider
};
const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Admin_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Admin__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr},
@@ -338,7 +338,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = {
};
const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = {
- &envoy_config_bootstrap_v3_Admin_submsgs[0],
+ &envoy_config_bootstrap_v3_Admin__submsgs[0],
&envoy_config_bootstrap_v3_Admin__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -357,7 +357,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__Admin_msg_init_ptr = &envoy__config__bootstrap__v3__Admin_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr},
@@ -372,7 +372,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields
};
const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = {
- &envoy_config_bootstrap_v3_ClusterManager_submsgs[0],
+ &envoy_config_bootstrap_v3_ClusterManager__submsgs[0],
&envoy_config_bootstrap_v3_ClusterManager__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -391,7 +391,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init_ptr},
};
@@ -401,7 +401,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_Outlier
};
const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init = {
- &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0],
+ &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__submsgs[0],
&envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -414,7 +414,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetecti
};
const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdogs__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr},
};
@@ -425,7 +425,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] =
};
const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = {
- &envoy_config_bootstrap_v3_Watchdogs_submsgs[0],
+ &envoy_config_bootstrap_v3_Watchdogs__submsgs[0],
&envoy_config_bootstrap_v3_Watchdogs__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -434,7 +434,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__Watchdogs_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdogs_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -455,7 +455,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] =
};
const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = {
- &envoy_config_bootstrap_v3_Watchdog_submsgs[0],
+ &envoy_config_bootstrap_v3_Watchdog__submsgs[0],
&envoy_config_bootstrap_v3_Watchdog__fields[0],
UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -474,7 +474,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_WatchdogAction__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -484,7 +484,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogActio
};
const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init = {
- &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0],
+ &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__submsgs[0],
&envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -499,7 +499,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_i
};
const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_FatalAction_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_FatalAction__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -508,7 +508,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1]
};
const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = {
- &envoy_config_bootstrap_v3_FatalAction_submsgs[0],
+ &envoy_config_bootstrap_v3_FatalAction__submsgs[0],
&envoy_config_bootstrap_v3_FatalAction__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -517,7 +517,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__FatalAction_msg_init_ptr = &envoy__config__bootstrap__v3__FatalAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Runtime_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Runtime__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -529,7 +529,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = {
};
const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = {
- &envoy_config_bootstrap_v3_Runtime_submsgs[0],
+ &envoy_config_bootstrap_v3_Runtime__submsgs[0],
&envoy_config_bootstrap_v3_Runtime__fields[0],
UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -544,7 +544,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = {
};
const upb_MiniTable* envoy__config__bootstrap__v3__Runtime_msg_init_ptr = &envoy__config__bootstrap__v3__Runtime_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr},
@@ -560,7 +560,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5
};
const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = {
- &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0],
+ &envoy_config_bootstrap_v3_RuntimeLayer__submsgs[0],
&envoy_config_bootstrap_v3_RuntimeLayer__fields[0],
UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -611,7 +611,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_i
};
const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -621,7 +621,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer
};
const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init = {
- &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0],
+ &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__submsgs[0],
&envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -634,7 +634,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_in
};
const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_LayeredRuntime__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init_ptr},
};
@@ -643,7 +643,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields
};
const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = {
- &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0],
+ &envoy_config_bootstrap_v3_LayeredRuntime__submsgs[0],
&envoy_config_bootstrap_v3_LayeredRuntime__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -677,7 +677,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init =
};
const upb_MiniTable* envoy__config__bootstrap__v3__CustomInlineHeader_msg_init_ptr = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init;
-static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_MemoryAllocatorManager__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -687,7 +687,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_MemoryAllocatorManager
};
const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init = {
- &envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[0],
+ &envoy_config_bootstrap_v3_MemoryAllocatorManager__submsgs[0],
&envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
index fc0333a31260e..f55a0226b3e24 100644
--- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -73,4 +73,4 @@ extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_fil
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
index f2a343767357e..e7c8d03a26bc5 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -561,4 +561,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
index 5fa07fe8bef13..699674e161dea 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[
};
const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = {
- &envoy_config_cluster_v3_CircuitBreakers_submsgs[0],
+ &envoy_config_cluster_v3_CircuitBreakers__submsgs[0],
&envoy_config_cluster_v3_CircuitBreakers__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = {
};
const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -67,7 +67,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol
};
const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init = {
- &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0],
+ &envoy_config_cluster_v3_CircuitBreakers_Thresholds__submsgs[0],
&envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0],
UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -86,7 +86,7 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_
};
const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -97,7 +97,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol
};
const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init = {
- &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0],
+ &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__submsgs[0],
&envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
index 7b95c84f89552..8e9d6b14c6906 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
index df151184d331d..c064459b1665f 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -4417,4 +4417,4 @@ UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_per_endpoint_stats
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
index f6b9ba6d2e6f6..970c2279f62c4 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
@@ -38,7 +38,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_ClusterCollection_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_ClusterCollection__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr},
};
@@ -47,7 +47,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__field
};
const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = {
- &envoy_config_cluster_v3_ClusterCollection_submsgs[0],
+ &envoy_config_cluster_v3_ClusterCollection__submsgs[0],
&envoy_config_cluster_v3_ClusterCollection__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -56,7 +56,7 @@ const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = {
};
const upb_MiniTable* envoy__config__cluster__v3__ClusterCollection_msg_init_ptr = &envoy__config__cluster__v3__ClusterCollection_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_submsgs[39] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster__submsgs[39] = {
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -154,7 +154,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[52] = {
};
const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = {
- &envoy_config_cluster_v3_Cluster_submsgs[0],
+ &envoy_config_cluster_v3_Cluster__submsgs[0],
&envoy_config_cluster_v3_Cluster__fields[0],
UPB_SIZE(216, 360), 52, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -197,7 +197,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = {
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster_msg_init_ptr = &envoy__config__cluster__v3__Cluster_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TransportSocketMatch__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr},
};
@@ -209,7 +209,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketM
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init = {
- &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_TransportSocketMatch__submsgs[0],
&envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -222,7 +222,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_ms
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CustomClusterType__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -232,7 +232,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterTyp
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init = {
- &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_CustomClusterType__submsgs[0],
&envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -245,7 +245,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_i
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_EdsClusterConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -255,7 +255,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_EdsClusterConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -270,7 +270,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_in
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LbSubsetConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr},
};
@@ -287,7 +287,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_LbSubsetConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0],
UPB_SIZE(32, 40), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -341,7 +341,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubse
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_SlowStartConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -354,7 +354,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig_
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_SlowStartConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -363,7 +363,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_ini
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr},
};
@@ -372,7 +372,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConf
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -381,7 +381,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr},
@@ -394,7 +394,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbCo
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -403,7 +403,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_ms
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RingHashLbConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -415,7 +415,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_RingHashLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -430,7 +430,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_in
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_MaglevLbConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -439,7 +439,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_MaglevLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -448,7 +448,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr},
};
@@ -461,7 +461,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbCon
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -476,7 +476,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr},
@@ -497,7 +497,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_CommonLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0],
UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -516,7 +516,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -528,7 +528,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_Z
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -553,7 +553,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Localit
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -563,7 +563,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_C
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init = {
- &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__submsgs[0],
&envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -576,7 +576,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Consist
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RefreshRate__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -587,7 +587,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fie
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = {
- &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_RefreshRate__submsgs[0],
&envoy_config_cluster_v3_Cluster_RefreshRate__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -596,7 +596,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init =
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__RefreshRate_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_PreconnectPolicy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr},
};
@@ -607,7 +607,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init = {
- &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_PreconnectPolicy__submsgs[0],
&envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -616,7 +616,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_in
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init_ptr = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -626,7 +626,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionPr
};
const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init = {
- &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0],
+ &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__submsgs[0],
&envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -639,7 +639,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolO
};
const upb_MiniTable* envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr},
};
@@ -648,7 +648,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fie
};
const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = {
- &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0],
+ &envoy_config_cluster_v3_LoadBalancingPolicy__submsgs[0],
&envoy_config_cluster_v3_LoadBalancingPolicy__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -661,7 +661,7 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = {
};
const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_Policy__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -670,7 +670,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Poli
};
const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init = {
- &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0],
+ &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__submsgs[0],
&envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -679,7 +679,7 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_
};
const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TcpKeepalive_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init_ptr},
};
@@ -691,7 +691,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOption
};
const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = {
- &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0],
+ &envoy_config_cluster_v3_UpstreamConnectionOptions__submsgs[0],
&envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -706,7 +706,7 @@ const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_in
};
const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init_ptr = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -716,7 +716,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOption
};
const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init = {
- &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[0],
+ &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__submsgs[0],
&envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
index f25cea5126dda..3544019a86757 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -77,4 +77,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
index 3f9f2e61bea9c..89956626eeac5 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -152,4 +152,4 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_clust
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
index 461ee53b89a81..fc4d1f645b5c3 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_Filter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_Filter__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[3] = {
};
const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = {
- &envoy_config_cluster_v3_Filter_submsgs[0],
+ &envoy_config_cluster_v3_Filter__submsgs[0],
&envoy_config_cluster_v3_Filter__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
index b55f7b8707b85..1ccb0027bb304 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
index 45626ff00ab0f..55b22037fbdba 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_
-#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -852,4 +852,4 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDete
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
index 93855c1c6b4c5..21aba9e266e59 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_cluster_v3_OutlierDetection_submsgs[24] = {
+static const upb_MiniTableSubInternal envoy_config_cluster_v3_OutlierDetection__submsgs[24] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -76,7 +76,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields
};
const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = {
- &envoy_config_cluster_v3_OutlierDetection_submsgs[0],
+ &envoy_config_cluster_v3_OutlierDetection__submsgs[0],
&envoy_config_cluster_v3_OutlierDetection__fields[0],
UPB_SIZE(112, 208), 25, kUpb_ExtMode_NonExtendable, 25, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
index 722d1a241558b..74820ba44cef6 100644
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_u
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
index 11416680b07a4..29becd66eab55 100644
--- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
-#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1974,4 +1974,4 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextM
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
index 37517131a0755..047c2f6a71e09 100644
--- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr},
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher__submsgs[0],
&envoy_config_common_matcher_v3_Matcher__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -47,7 +47,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = {
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_OnMatch__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_OnMatch__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -73,7 +73,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_ini
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr},
};
@@ -82,7 +82,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherList__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -95,7 +95,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
@@ -110,7 +110,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -129,7 +129,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -142,7 +142,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -157,7 +157,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
};
@@ -166,7 +166,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -179,7 +179,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -199,7 +199,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Fi
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
@@ -214,7 +214,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherTree__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -233,7 +233,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr},
};
@@ -242,7 +242,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -251,7 +251,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -261,7 +261,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr
};
const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
- &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
+ &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[0],
&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -274,7 +274,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma
};
const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate__submsgs[9] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr},
@@ -300,7 +300,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__f
};
const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init = {
- &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0],
+ &envoy_config_common_matcher_v3_MatchPredicate__submsgs[0],
&envoy_config_common_matcher_v3_MatchPredicate__fields[0],
UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -327,7 +327,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init
};
const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_MatchSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr},
};
@@ -336,7 +336,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_Ma
};
const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init = {
- &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0],
+ &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__submsgs[0],
&envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -349,7 +349,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet
};
const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpHeadersMatch__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
};
@@ -358,7 +358,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch_
};
const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init = {
- &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0],
+ &envoy_config_common_matcher_v3_HttpHeadersMatch__submsgs[0],
&envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -371,7 +371,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_ini
};
const upb_MiniTable* envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpGenericBodyMatch__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr},
};
@@ -381,7 +381,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMa
};
const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init = {
- &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0],
+ &envoy_config_common_matcher_v3_HttpGenericBodyMatch__submsgs[0],
&envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
index 00db11a07eb58..8312f75af5a13 100644
--- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -57,4 +57,4 @@ extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
index c22a2f0b8164f..9310611605034 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1138,4 +1138,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mu
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
index 132a33c671abe..4e317fb4d6daa 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
@@ -92,7 +92,7 @@ const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__SocketAddress_msg_init_ptr = &envoy__config__core__v3__SocketAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_TcpKeepalive_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_TcpKeepalive__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -105,7 +105,7 @@ static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = {
};
const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = {
- &envoy_config_core_v3_TcpKeepalive_submsgs[0],
+ &envoy_config_core_v3_TcpKeepalive__submsgs[0],
&envoy_config_core_v3_TcpKeepalive__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -114,7 +114,7 @@ const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__TcpKeepalive_msg_init_ptr = &envoy__config__core__v3__TcpKeepalive_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ExtraSourceAddress__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr},
};
@@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[
};
const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = {
- &envoy_config_core_v3_ExtraSourceAddress_submsgs[0],
+ &envoy_config_core_v3_ExtraSourceAddress__submsgs[0],
&envoy_config_core_v3_ExtraSourceAddress__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -134,7 +134,7 @@ const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__ExtraSourceAddress_msg_init_ptr = &envoy__config__core__v3__ExtraSourceAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_BindConfig_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_BindConfig__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr},
@@ -153,7 +153,7 @@ static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[6] = {
};
const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = {
- &envoy_config_core_v3_BindConfig_submsgs[0],
+ &envoy_config_core_v3_BindConfig__submsgs[0],
&envoy_config_core_v3_BindConfig__fields[0],
UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -172,7 +172,7 @@ const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__BindConfig_msg_init_ptr = &envoy__config__core__v3__BindConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Address_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Address__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Pipe_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EnvoyInternalAddress_msg_init_ptr},
@@ -185,7 +185,7 @@ static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = {
};
const upb_MiniTable envoy__config__core__v3__Address_msg_init = {
- &envoy_config_core_v3_Address_submsgs[0],
+ &envoy_config_core_v3_Address__submsgs[0],
&envoy_config_core_v3_Address__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -200,7 +200,7 @@ const upb_MiniTable envoy__config__core__v3__Address_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Address_msg_init_ptr = &envoy__config__core__v3__Address_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_CidrRange_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_CidrRange__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -210,7 +210,7 @@ static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = {
};
const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = {
- &envoy_config_core_v3_CidrRange_submsgs[0],
+ &envoy_config_core_v3_CidrRange__submsgs[0],
&envoy_config_core_v3_CidrRange__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
index 268dbaf0d4e08..589c293ff298d 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
index 067eff56a4968..2244301e42916 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -134,4 +134,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
index 75410131108e9..3e1d3fd22f486 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_BackoffStrategy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_BackoffStrategy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2]
};
const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = {
- &envoy_config_core_v3_BackoffStrategy_submsgs[0],
+ &envoy_config_core_v3_BackoffStrategy__submsgs[0],
&envoy_config_core_v3_BackoffStrategy__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
index ab12e8dcc7b8c..144ffb49080c8 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
index c5ef155ddb722..2735f81007428 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -3214,4 +3214,4 @@ UPB_INLINE void envoy_config_core_v3_ControlPlane_set_identifier(envoy_config_co
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
index cfd0274e7d478..68a640b4803ff 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__core__v3__Locality_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Locality_msg_init_ptr = &envoy__config__core__v3__Locality_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_BuildVersion_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_BuildVersion__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__SemanticVersion_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = {
};
const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = {
- &envoy_config_core_v3_BuildVersion_submsgs[0],
+ &envoy_config_core_v3_BuildVersion__submsgs[0],
&envoy_config_core_v3_BuildVersion__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -70,7 +70,7 @@ const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__BuildVersion_msg_init_ptr = &envoy__config__core__v3__BuildVersion_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Extension_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Extension__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr},
};
@@ -84,7 +84,7 @@ static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = {
};
const upb_MiniTable envoy__config__core__v3__Extension_msg_init = {
- &envoy_config_core_v3_Extension_submsgs[0],
+ &envoy_config_core_v3_Extension__submsgs[0],
&envoy_config_core_v3_Extension__fields[0],
UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -103,7 +103,7 @@ const upb_MiniTable envoy__config__core__v3__Extension_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Extension_msg_init_ptr = &envoy__config__core__v3__Extension_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Node_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Node__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr},
@@ -127,7 +127,7 @@ static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = {
};
const upb_MiniTable envoy__config__core__v3__Node_msg_init = {
- &envoy_config_core_v3_Node_submsgs[0],
+ &envoy_config_core_v3_Node__submsgs[0],
&envoy_config_core_v3_Node__fields[0],
UPB_SIZE(72, 128), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -154,7 +154,7 @@ const upb_MiniTable envoy__config__core__v3__Node_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Node_msg_init_ptr = &envoy__config__core__v3__Node_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Node_DynamicParametersEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr},
};
@@ -164,7 +164,7 @@ static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry
};
const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init = {
- &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0],
+ &envoy_config_core_v3_Node_DynamicParametersEntry__submsgs[0],
&envoy_config_core_v3_Node_DynamicParametersEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -177,7 +177,7 @@ const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_in
};
const upb_MiniTable* envoy__config__core__v3__Node__DynamicParametersEntry_msg_init_ptr = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init_ptr},
};
@@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = {
};
const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = {
- &envoy_config_core_v3_Metadata_submsgs[0],
+ &envoy_config_core_v3_Metadata__submsgs[0],
&envoy_config_core_v3_Metadata__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -197,7 +197,7 @@ const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Metadata_msg_init_ptr = &envoy__config__core__v3__Metadata_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_FilterMetadataEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -207,7 +207,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntr
};
const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init = {
- &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0],
+ &envoy_config_core_v3_Metadata_FilterMetadataEntry__submsgs[0],
&envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_i
};
const upb_MiniTable* envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -230,7 +230,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadat
};
const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init = {
- &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0],
+ &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__submsgs[0],
&envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -264,7 +264,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__RuntimeUInt32_msg_init_ptr = &envoy__config__core__v3__RuntimeUInt32_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimePercent_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimePercent__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
};
@@ -274,7 +274,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] =
};
const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = {
- &envoy_config_core_v3_RuntimePercent_submsgs[0],
+ &envoy_config_core_v3_RuntimePercent__submsgs[0],
&envoy_config_core_v3_RuntimePercent__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -310,7 +310,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__RuntimeDouble_msg_init_ptr = &envoy__config__core__v3__RuntimeDouble_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFeatureFlag__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -320,7 +320,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[
};
const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = {
- &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0],
+ &envoy_config_core_v3_RuntimeFeatureFlag__submsgs[0],
&envoy_config_core_v3_RuntimeFeatureFlag__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -356,7 +356,7 @@ const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__KeyValue_msg_init_ptr = &envoy__config__core__v3__KeyValue_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueAppend_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueAppend__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init_ptr},
};
@@ -366,7 +366,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeyValueAppend__fields[2] =
};
const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = {
- &envoy_config_core_v3_KeyValueAppend_submsgs[0],
+ &envoy_config_core_v3_KeyValueAppend__submsgs[0],
&envoy_config_core_v3_KeyValueAppend__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -381,7 +381,7 @@ const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__KeyValueAppend_msg_init_ptr = &envoy__config__core__v3__KeyValueAppend_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueMutation_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueMutation__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init_ptr},
};
@@ -391,7 +391,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeyValueMutation__fields[2]
};
const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init = {
- &envoy_config_core_v3_KeyValueMutation_submsgs[0],
+ &envoy_config_core_v3_KeyValueMutation__submsgs[0],
&envoy_config_core_v3_KeyValueMutation__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -449,7 +449,7 @@ const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__HeaderValue_msg_init_ptr = &envoy__config__core__v3__HeaderValue_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderValueOption_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderValueOption__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -462,7 +462,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4
};
const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = {
- &envoy_config_core_v3_HeaderValueOption_submsgs[0],
+ &envoy_config_core_v3_HeaderValueOption__submsgs[0],
&envoy_config_core_v3_HeaderValueOption__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -481,7 +481,7 @@ const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__HeaderValueOption_msg_init_ptr = &envoy__config__core__v3__HeaderValueOption_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderMap_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderMap__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr},
};
@@ -490,7 +490,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = {
};
const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = {
- &envoy_config_core_v3_HeaderMap_submsgs[0],
+ &envoy_config_core_v3_HeaderMap__submsgs[0],
&envoy_config_core_v3_HeaderMap__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -521,7 +521,7 @@ const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__WatchedDirectory_msg_init_ptr = &envoy__config__core__v3__WatchedDirectory_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_DataSource_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_DataSource__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr},
};
@@ -534,7 +534,7 @@ static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[5] = {
};
const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = {
- &envoy_config_core_v3_DataSource_submsgs[0],
+ &envoy_config_core_v3_DataSource__submsgs[0],
&envoy_config_core_v3_DataSource__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -553,7 +553,7 @@ const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__DataSource_msg_init_ptr = &envoy__config__core__v3__DataSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BackoffStrategy_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr},
@@ -570,7 +570,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[6] = {
};
const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = {
- &envoy_config_core_v3_RetryPolicy_submsgs[0],
+ &envoy_config_core_v3_RetryPolicy__submsgs[0],
&envoy_config_core_v3_RetryPolicy__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -589,7 +589,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__RetryPolicy_msg_init_ptr = &envoy__config__core__v3__RetryPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryPriority__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -599,7 +599,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryPriority__
};
const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init = {
- &envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[0],
+ &envoy_config_core_v3_RetryPolicy_RetryPriority__submsgs[0],
&envoy_config_core_v3_RetryPolicy_RetryPriority__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -614,7 +614,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init
};
const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryHostPredicate__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -624,7 +624,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryHostPredic
};
const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init = {
- &envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[0],
+ &envoy_config_core_v3_RetryPolicy_RetryHostPredicate__submsgs[0],
&envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -639,7 +639,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg
};
const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RemoteDataSource_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RemoteDataSource__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr},
};
@@ -651,7 +651,7 @@ static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3]
};
const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = {
- &envoy_config_core_v3_RemoteDataSource_submsgs[0],
+ &envoy_config_core_v3_RemoteDataSource__submsgs[0],
&envoy_config_core_v3_RemoteDataSource__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -666,7 +666,7 @@ const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__RemoteDataSource_msg_init_ptr = &envoy__config__core__v3__RemoteDataSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_AsyncDataSource_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_AsyncDataSource__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RemoteDataSource_msg_init_ptr},
};
@@ -677,7 +677,7 @@ static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2]
};
const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = {
- &envoy_config_core_v3_AsyncDataSource_submsgs[0],
+ &envoy_config_core_v3_AsyncDataSource__submsgs[0],
&envoy_config_core_v3_AsyncDataSource__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -692,7 +692,7 @@ const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__AsyncDataSource_msg_init_ptr = &envoy__config__core__v3__AsyncDataSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_TransportSocket_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_TransportSocket__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -702,7 +702,7 @@ static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2]
};
const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = {
- &envoy_config_core_v3_TransportSocket_submsgs[0],
+ &envoy_config_core_v3_TransportSocket__submsgs[0],
&envoy_config_core_v3_TransportSocket__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -717,7 +717,7 @@ const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__TransportSocket_msg_init_ptr = &envoy__config__core__v3__TransportSocket_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFractionalPercent__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
};
@@ -727,7 +727,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__f
};
const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = {
- &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0],
+ &envoy_config_core_v3_RuntimeFractionalPercent__submsgs[0],
&envoy_config_core_v3_RuntimeFractionalPercent__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
index 351591b593cfc..4fa102038f86b 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -85,4 +85,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
index 3aff493e6d757..a2b894903170c 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1193,4 +1193,4 @@ UPB_INLINE bool envoy_config_core_v3_ExtensionConfigSource_add_type_urls(envoy_c
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
index 5b1c268dfeef6..54cf52dae73a0 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
@@ -25,7 +25,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_ApiConfigSource_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ApiConfigSource__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -46,7 +46,7 @@ static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9]
};
const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = {
- &envoy_config_core_v3_ApiConfigSource_submsgs[0],
+ &envoy_config_core_v3_ApiConfigSource__submsgs[0],
&envoy_config_core_v3_ApiConfigSource__fields[0],
UPB_SIZE(48, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -101,7 +101,7 @@ const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__SelfConfigSource_msg_init_ptr = &envoy__config__core__v3__SelfConfigSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_RateLimitSettings_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_RateLimitSettings__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr},
};
@@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2
};
const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = {
- &envoy_config_core_v3_RateLimitSettings_submsgs[0],
+ &envoy_config_core_v3_RateLimitSettings__submsgs[0],
&envoy_config_core_v3_RateLimitSettings__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -121,7 +121,7 @@ const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__RateLimitSettings_msg_init_ptr = &envoy__config__core__v3__RateLimitSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_PathConfigSource_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_PathConfigSource__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr},
};
@@ -131,7 +131,7 @@ static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2]
};
const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = {
- &envoy_config_core_v3_PathConfigSource_submsgs[0],
+ &envoy_config_core_v3_PathConfigSource__submsgs[0],
&envoy_config_core_v3_PathConfigSource__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -144,7 +144,7 @@ const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__PathConfigSource_msg_init_ptr = &envoy__config__core__v3__PathConfigSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_ConfigSource_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ConfigSource__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AggregatedConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = {
};
const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = {
- &envoy_config_core_v3_ConfigSource_submsgs[0],
+ &envoy_config_core_v3_ConfigSource__submsgs[0],
&envoy_config_core_v3_ConfigSource__fields[0],
UPB_SIZE(40, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__ConfigSource_msg_init_ptr = &envoy__config__core__v3__ConfigSource_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ExtensionConfigSource__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -205,7 +205,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fiel
};
const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = {
- &envoy_config_core_v3_ExtensionConfigSource_submsgs[0],
+ &envoy_config_core_v3_ExtensionConfigSource__submsgs[0],
&envoy_config_core_v3_ExtensionConfigSource__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
index 7120bc2b0bc1b..4683a3aa3a055 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
index 7150ab1cbcf07..2820dbcb00bf2 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -113,4 +113,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventSe
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
index f330f5186226a..e5619a34f8f94 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_EventServiceConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_EventServiceConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[
};
const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = {
- &envoy_config_core_v3_EventServiceConfig_submsgs[0],
+ &envoy_config_core_v3_EventServiceConfig__submsgs[0],
&envoy_config_core_v3_EventServiceConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
index 2238246757915..d871cce278938 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_u
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
index 7d8fce0d877d4..864fb81f6b268 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -119,4 +119,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
index a04338ed01684..ca6bcf349b94c 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_TypedExtensionConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__field
};
const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = {
- &envoy_config_core_v3_TypedExtensionConfig_submsgs[0],
+ &envoy_config_core_v3_TypedExtensionConfig__submsgs[0],
&envoy_config_core_v3_TypedExtensionConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
index a4bc7941b96cc..4865fd62039fa 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
index d451c4fb9ea66..bb6c1214d128f 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -254,4 +254,4 @@ UPB_INLINE bool envoy_config_core_v3_GrpcMethodList_Service_add_method_names(env
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
index f4a0f16207fce..a9d1609cae3b6 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcMethodList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcMethodList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcMethodList__Service_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList__fields[1] =
};
const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = {
- &envoy_config_core_v3_GrpcMethodList_submsgs[0],
+ &envoy_config_core_v3_GrpcMethodList__submsgs[0],
&envoy_config_core_v3_GrpcMethodList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
index ab03aa92b8822..304286dc5c180 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_f
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
index d4ab962746d2a..8b21b0a1f05c8 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1892,4 +1892,4 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntr
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
index 0141f1f2a8fb7..1c91a52c75775 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c
@@ -24,7 +24,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = {
};
const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = {
- &envoy_config_core_v3_GrpcService_submsgs[0],
+ &envoy_config_core_v3_GrpcService__submsgs[0],
&envoy_config_core_v3_GrpcService__fields[0],
UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -60,7 +60,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__GrpcService_msg_init_ptr = &envoy__config__core__v3__GrpcService_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fiel
};
const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = {
- &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0],
+ &envoy_config_core_v3_GrpcService_EnvoyGrpc__submsgs[0],
&envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -93,7 +93,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
@@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fie
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0],
UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -132,7 +132,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init =
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
@@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslC
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLoca
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr},
@@ -177,7 +177,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr},
@@ -211,7 +211,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -337,7 +337,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr},
};
@@ -346,7 +346,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -376,7 +376,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg
};
const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr},
};
@@ -386,7 +386,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan
};
const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init = {
- &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0],
+ &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__submsgs[0],
&envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
index eaf8ab0e68992..95d2c3f77adaf 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -55,4 +55,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
index 709a6fb749e82..eeff9bb0d0147 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2109,4 +2109,4 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_TlsOptions_add_alpn_protocols(e
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
index 93be2c354ce9e..4837da7291897 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c
@@ -47,7 +47,7 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__HealthStatusSet_msg_init_ptr = &envoy__config__core__v3__HealthStatusSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_submsgs[21] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck__submsgs[21] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -100,7 +100,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = {
};
const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = {
- &envoy_config_core_v3_HealthCheck_submsgs[0],
+ &envoy_config_core_v3_HealthCheck__submsgs[0],
&envoy_config_core_v3_HealthCheck__fields[0],
UPB_SIZE(112, 184), 25, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr = &envoy__config__core__v3__HealthCheck__Payload_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
@@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck
};
const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init = {
- &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0],
+ &envoy_config_core_v3_HealthCheck_HttpHealthCheck__submsgs[0],
&envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0],
UPB_SIZE(72, 120), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -217,7 +217,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in
};
const upb_MiniTable* envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr},
@@ -230,7 +230,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck_
};
const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init = {
- &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0],
+ &envoy_config_core_v3_HealthCheck_TcpHealthCheck__submsgs[0],
&envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -263,7 +263,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i
};
const upb_MiniTable* envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
};
@@ -274,7 +274,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck
};
const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init = {
- &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0],
+ &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__submsgs[0],
&envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -289,7 +289,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in
};
const upb_MiniTable* envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -299,7 +299,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthChe
};
const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init = {
- &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0],
+ &envoy_config_core_v3_HealthCheck_CustomHealthCheck__submsgs[0],
&envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
index 9078b1706b6e3..60037e1924a14 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -45,4 +45,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h
index 7c72d09e89319..e880686abf66e 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -172,4 +172,4 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c
index eefb3f8629936..1df2e0ef75a06 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpService__fields[2] = {
};
const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = {
- &envoy_config_core_v3_HttpService_submsgs[0],
+ &envoy_config_core_v3_HttpService__submsgs[0],
&envoy_config_core_v3_HttpService__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h
index 46ae377eaf563..9848ffa5fac55 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_http_service_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
index fa9e97e0e1d93..ca22ecd5c1410 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -149,4 +149,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
index b517bd29193eb..a106247fd9fcf 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = {
};
const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = {
- &envoy_config_core_v3_HttpUri_submsgs[0],
+ &envoy_config_core_v3_HttpUri__submsgs[0],
&envoy_config_core_v3_HttpUri__fields[0],
UPB_SIZE(40, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
index 143e570eadb32..9ca02bad1b960 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
index e3cdb760137c5..115f9b3c718d9 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2503,4 +2503,4 @@ UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_match_upstre
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
index 8b7df6696dd0d..21bef489a6c38 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c
@@ -33,7 +33,7 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__TcpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__TcpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -44,7 +44,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fiel
};
const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = {
- &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0],
+ &envoy_config_core_v3_QuicKeepAliveSettings__submsgs[0],
&envoy_config_core_v3_QuicKeepAliveSettings__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -53,7 +53,7 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields
};
const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = {
- &envoy_config_core_v3_QuicProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_QuicProtocolOptions__submsgs[0],
&envoy_config_core_v3_QuicProtocolOptions__fields[0],
UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini
};
const upb_MiniTable* envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr},
@@ -130,7 +130,7 @@ static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOpti
};
const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init = {
- &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0],
+ &envoy_config_core_v3_AlternateProtocolsCacheOptions__submsgs[0],
&envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -170,7 +170,7 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt
};
const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields
};
const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = {
- &envoy_config_core_v3_HttpProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_HttpProtocolOptions__submsgs[0],
&envoy_config_core_v3_HttpProtocolOptions__fields[0],
UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -207,7 +207,7 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__HttpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -228,7 +228,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__field
};
const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = {
- &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_Http1ProtocolOptions__submsgs[0],
&envoy_config_core_v3_Http1ProtocolOptions__fields[0],
UPB_SIZE(56, 64), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -255,7 +255,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -266,7 +266,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_Header
};
const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init = {
- &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0],
+ &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__submsgs[0],
&envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -303,7 +303,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm
};
const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -318,7 +318,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4
};
const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = {
- &envoy_config_core_v3_KeepaliveSettings_submsgs[0],
+ &envoy_config_core_v3_KeepaliveSettings__submsgs[0],
&envoy_config_core_v3_KeepaliveSettings__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -327,7 +327,7 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__KeepaliveSettings_msg_init_ptr = &envoy__config__core__v3__KeepaliveSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions__submsgs[13] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__field
};
const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = {
- &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_Http2ProtocolOptions__submsgs[0],
&envoy_config_core_v3_Http2ProtocolOptions__fields[0],
UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -390,7 +390,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -401,7 +401,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_Settin
};
const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init = {
- &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0],
+ &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__submsgs[0],
&envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -410,7 +410,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam
};
const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr},
};
@@ -419,7 +419,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields
};
const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = {
- &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_GrpcProtocolOptions__submsgs[0],
&envoy_config_core_v3_GrpcProtocolOptions__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -428,7 +428,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__GrpcProtocolOptions_msg_init_ptr = &envoy__config__core__v3__GrpcProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -441,7 +441,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__field
};
const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = {
- &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0],
+ &envoy_config_core_v3_Http3ProtocolOptions__submsgs[0],
&envoy_config_core_v3_Http3ProtocolOptions__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
index 81ce39069fa3b..2de89c7585c20 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
index 69bfb167094b3..433b249b9652a 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -242,4 +242,4 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_confi
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
index 518271704af7b..5193d9d6be2b6 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c
@@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in
};
const upb_MiniTable* envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr},
};
@@ -47,7 +47,7 @@ static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields
};
const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = {
- &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0],
+ &envoy_config_core_v3_ProxyProtocolConfig__submsgs[0],
&envoy_config_core_v3_ProxyProtocolConfig__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
index a0a769b6f081d..691a3a276db53 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_fil
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
index 9b745f5d108ea..3cf3c7fb0c376 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -241,4 +241,4 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
index d51a4993058ab..ab69ebeea141a 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c
@@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__DnsResolverOptions_msg_init_ptr = &envoy__config__core__v3__DnsResolverOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolverOptions_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields
};
const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = {
- &envoy_config_core_v3_DnsResolutionConfig_submsgs[0],
+ &envoy_config_core_v3_DnsResolutionConfig__submsgs[0],
&envoy_config_core_v3_DnsResolutionConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
index 11224a9955b9f..45dc183b07a58 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
index de96ce4954aed..fb1a1753f1be1 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -298,4 +298,4 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_Socket
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
index 8b75d1e6aa164..2b98b4db4f88f 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c
@@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__SocketOption_msg_init_ptr = &envoy__config__core__v3__SocketOption_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr},
};
@@ -55,7 +55,7 @@ static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fiel
};
const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = {
- &envoy_config_core_v3_SocketOptionsOverride_submsgs[0],
+ &envoy_config_core_v3_SocketOptionsOverride__submsgs[0],
&envoy_config_core_v3_SocketOptionsOverride__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
index c65b232123b97..a41e250e2eca9 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
index 0442752ab6d65..c83d226fe94e5 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -353,4 +353,4 @@ UPB_INLINE struct envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_S
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
index ce65701fd0698..6c69add4b22e7 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c
@@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = {
};
const upb_MiniTable* envoy__config__core__v3__JsonFormatOptions_msg_init_ptr = &envoy__config__core__v3__JsonFormatOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -56,7 +56,7 @@ static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__f
};
const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = {
- &envoy_config_core_v3_SubstitutionFormatString_submsgs[0],
+ &envoy_config_core_v3_SubstitutionFormatString__submsgs[0],
&envoy_config_core_v3_SubstitutionFormatString__fields[0],
UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
index a18cc1b1e04ce..14f36ea476a5d 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_p
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
index 1de84f71b5368..5df933672ca6d 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -134,4 +134,4 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfi
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
index 9867e78b4f537..301421ee2d46a 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2]
};
const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = {
- &envoy_config_core_v3_UdpSocketConfig_submsgs[0],
+ &envoy_config_core_v3_UdpSocketConfig__submsgs[0],
&envoy_config_core_v3_UdpSocketConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
index 670fee212a5b1..0a9d22805ed69 100644
--- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
index 47b95a2bfd942..69184e862acb0 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -549,4 +549,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEnt
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
index efdce57ee239a..a887b85ebde68 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr},
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__
};
const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init = {
- &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0],
+ &envoy_config_endpoint_v3_ClusterLoadAssignment__submsgs[0],
&envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init
};
const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P
};
const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init = {
- &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0],
+ &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__submsgs[0],
&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -83,7 +83,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m
};
const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
};
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P
};
const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init = {
- &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0],
+ &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__submsgs[0],
&envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__
};
const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr},
};
@@ -116,7 +116,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_N
};
const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init = {
- &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0],
+ &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__submsgs[0],
&envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
index dfeb1d9f68466..aa1a7e36e8380 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
index 787315ed4156a..bbba5d52e92a5 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1089,4 +1089,4 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
index ee22570993bc7..13871d19153cc 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr},
@@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = {
};
const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = {
- &envoy_config_endpoint_v3_Endpoint_submsgs[0],
+ &envoy_config_endpoint_v3_Endpoint__submsgs[0],
&envoy_config_endpoint_v3_Endpoint__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = {
};
const upb_MiniTable* envoy__config__endpoint__v3__Endpoint_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
};
@@ -67,7 +67,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckCon
};
const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init = {
- &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0],
+ &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__submsgs[0],
&envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -86,7 +86,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg
};
const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
};
@@ -95,7 +95,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddr
};
const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init = {
- &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0],
+ &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__submsgs[0],
&envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg
};
const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -119,7 +119,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] =
};
const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = {
- &envoy_config_endpoint_v3_LbEndpoint_submsgs[0],
+ &envoy_config_endpoint_v3_LbEndpoint__submsgs[0],
&envoy_config_endpoint_v3_LbEndpoint__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = {
};
const upb_MiniTable* envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr = &envoy__config__endpoint__v3__LbEndpoint_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -148,7 +148,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConf
};
const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init = {
- &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0],
+ &envoy_config_endpoint_v3_LedsClusterLocalityConfig__submsgs[0],
&envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -163,7 +163,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i
};
const upb_MiniTable* envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -185,7 +185,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fi
};
const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = {
- &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0],
+ &envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[0],
&envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0],
UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -212,7 +212,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init =
};
const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr},
};
@@ -221,7 +221,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbE
};
const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init = {
- &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0],
+ &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__submsgs[0],
&envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
index 4b1b2f6633572..b1df0cfea0b06 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_prot
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
index 5594fea3230cc..7b58751f9f08d 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1173,4 +1173,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_droppe
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
index 71df180686c3a..52a09f2855f63 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr},
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__
};
const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = {
- &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0],
+ &envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[0],
&envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0],
UPB_SIZE(96, 120), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -76,7 +76,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init
};
const upb_MiniTable* envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__
};
const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init = {
- &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0],
+ &envoy_config_endpoint_v3_UpstreamEndpointStats__submsgs[0],
&envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0],
UPB_SIZE(56, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -155,7 +155,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_
};
const upb_MiniTable* envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init;
-static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr},
@@ -171,7 +171,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6]
};
const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = {
- &envoy_config_endpoint_v3_ClusterStats_submsgs[0],
+ &envoy_config_endpoint_v3_ClusterStats__submsgs[0],
&envoy_config_endpoint_v3_ClusterStats__fields[0],
UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
index 2cd4049e32be2..68d4c6caaa3b0 100644
--- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -39,4 +39,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_fi
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
index 23a268a85a114..fc85a2437a405 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -103,4 +103,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_muta
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
index 857456f690057..7d876a750eab5 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1]
};
const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = {
- &envoy_config_listener_v3_ApiListener_submsgs[0],
+ &envoy_config_listener_v3_ApiListener__submsgs[0],
&envoy_config_listener_v3_ApiListener__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
index 29d6a53f75fb5..c53c45ce4f82a 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_f
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
index 64ff9d5818cda..79d9ac7aa4a5c 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1743,4 +1743,4 @@ UPB_INLINE char* envoy_config_listener_v3_ApiListenerManager_serialize_ex(const
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
index 5b19dd1bc57a9..3eb7ebd7696d6 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c
@@ -32,7 +32,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr},
};
@@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fiel
};
const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = {
- &envoy_config_listener_v3_AdditionalAddress_submsgs[0],
+ &envoy_config_listener_v3_AdditionalAddress__submsgs[0],
&envoy_config_listener_v3_AdditionalAddress__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__AdditionalAddress_msg_init_ptr = &envoy__config__listener__v3__AdditionalAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr},
};
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fie
};
const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = {
- &envoy_config_listener_v3_ListenerCollection_submsgs[0],
+ &envoy_config_listener_v3_ListenerCollection__submsgs[0],
&envoy_config_listener_v3_ListenerCollection__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -74,7 +74,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__ListenerCollection_msg_init_ptr = &envoy__config__listener__v3__ListenerCollection_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_submsgs[24] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener__submsgs[24] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -138,7 +138,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] =
};
const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = {
- &envoy_config_listener_v3_Listener_submsgs[0],
+ &envoy_config_listener_v3_Listener__submsgs[0],
&envoy_config_listener_v3_Listener__fields[0],
UPB_SIZE(152, 256), 33, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -181,7 +181,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__Listener_msg_init_ptr = &envoy__config__listener__v3__Listener_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__
};
const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init = {
- &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0],
+ &envoy_config_listener_v3_Listener_DeprecatedV1__submsgs[0],
&envoy_config_listener_v3_Listener_DeprecatedV1__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -199,7 +199,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init
};
const upb_MiniTable* envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -210,7 +210,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBala
};
const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init = {
- &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0],
+ &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__submsgs[0],
&envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
index 7e125b19f3546..dd2119477537e 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -47,4 +47,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
index 4257dc6236fee..60c104450caf1 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1533,4 +1533,4 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_liste
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
index 36d5e3897b5b5..5e863a4d7f7c2 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c
@@ -25,7 +25,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
};
@@ -37,7 +37,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = {
};
const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = {
- &envoy_config_listener_v3_Filter_submsgs[0],
+ &envoy_config_listener_v3_Filter__submsgs[0],
&envoy_config_listener_v3_Filter__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -56,7 +56,7 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__Filter_msg_init_ptr = &envoy__config__listener__v3__Filter_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
@@ -79,7 +79,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__field
};
const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = {
- &envoy_config_listener_v3_FilterChainMatch_submsgs[0],
+ &envoy_config_listener_v3_FilterChainMatch__submsgs[0],
&envoy_config_listener_v3_FilterChainMatch__fields[0],
UPB_SIZE(64, 112), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__FilterChainMatch_msg_init_ptr = &envoy__config__listener__v3__FilterChainMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChainMatch_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Filter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -128,7 +128,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8]
};
const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = {
- &envoy_config_listener_v3_FilterChain_submsgs[0],
+ &envoy_config_listener_v3_FilterChain__submsgs[0],
&envoy_config_listener_v3_FilterChain__fields[0],
UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -147,7 +147,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = {
};
const upb_MiniTable* envoy__config__listener__v3__FilterChain_msg_init_ptr = &envoy__config__listener__v3__FilterChain_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandCon
};
const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init = {
- &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0],
+ &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__submsgs[0],
&envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -165,7 +165,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat
};
const upb_MiniTable* envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
@@ -181,7 +181,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc
};
const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init = {
- &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0],
+ &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__submsgs[0],
&envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0],
UPB_SIZE(16, 24), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -200,7 +200,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica
};
const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
};
@@ -209,7 +209,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc
};
const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init = {
- &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0],
+ &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__submsgs[0],
&envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -222,7 +222,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica
};
const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
@@ -236,7 +236,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[
};
const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = {
- &envoy_config_listener_v3_ListenerFilter_submsgs[0],
+ &envoy_config_listener_v3_ListenerFilter__submsgs[0],
&envoy_config_listener_v3_ListenerFilter__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
index d4c6ff64e27e0..581cde3b522c7 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_prot
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
index ac4d3f0042a88..ad6f16aebb2d9 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -414,4 +414,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
index 8556c90dd0925..6c5277f4bf1fb 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c
@@ -23,7 +23,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions__submsgs[11] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fi
};
const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = {
- &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0],
+ &envoy_config_listener_v3_QuicProtocolOptions__submsgs[0],
&envoy_config_listener_v3_QuicProtocolOptions__fields[0],
UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
index c9007f487df2b..bd788c2b64544 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_fi
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
index 94b16291c8adb..8275ea5a72ae7 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_
-#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -206,4 +206,4 @@ UPB_INLINE char* envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize_e
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
index 6570ad43fadc6..77b1c7bf3350a 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UdpSocketConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fiel
};
const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = {
- &envoy_config_listener_v3_UdpListenerConfig_submsgs[0],
+ &envoy_config_listener_v3_UdpListenerConfig__submsgs[0],
&envoy_config_listener_v3_UdpListenerConfig__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
index e998a4fd97848..0cb4fc7f86d80 100644
--- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_prot
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
index b7ffb1c62f3dc..ddc9ca95e2095 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -191,4 +191,4 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
index 669b310608c31..3fcdf58bd46aa 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -34,7 +34,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fi
};
const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = {
- &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0],
+ &envoy_config_metrics_v3_MetricsServiceConfig__submsgs[0],
&envoy_config_metrics_v3_MetricsServiceConfig__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
index 3b8ec578b2dbe..4fbc721a7ba78 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
index 2d06ee4d3b7f2..176a231acfada 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_
-#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1028,4 +1028,4 @@ UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
index 87436173c54ee..c17d4f41ce158 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = {
};
const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = {
- &envoy_config_metrics_v3_StatsSink_submsgs[0],
+ &envoy_config_metrics_v3_StatsSink__submsgs[0],
&envoy_config_metrics_v3_StatsSink__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = {
};
const upb_MiniTable* envoy__config__metrics__v3__StatsSink_msg_init_ptr = &envoy__config__metrics__v3__StatsSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__TagSpecifier_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsMatcher_msg_init_ptr},
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] =
};
const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = {
- &envoy_config_metrics_v3_StatsConfig_submsgs[0],
+ &envoy_config_metrics_v3_StatsConfig__submsgs[0],
&envoy_config_metrics_v3_StatsConfig__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -80,7 +80,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = {
};
const upb_MiniTable* envoy__config__metrics__v3__StatsConfig_msg_init_ptr = &envoy__config__metrics__v3__StatsConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr},
};
@@ -92,7 +92,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3]
};
const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = {
- &envoy_config_metrics_v3_StatsMatcher_submsgs[0],
+ &envoy_config_metrics_v3_StatsMatcher__submsgs[0],
&envoy_config_metrics_v3_StatsMatcher__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -129,7 +129,7 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = {
};
const upb_MiniTable* envoy__config__metrics__v3__TagSpecifier_msg_init_ptr = &envoy__config__metrics__v3__TagSpecifier_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings_
};
const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init = {
- &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0],
+ &envoy_config_metrics_v3_HistogramBucketSettings__submsgs[0],
&envoy_config_metrics_v3_HistogramBucketSettings__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -154,7 +154,7 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init
};
const upb_MiniTable* envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
};
@@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] =
};
const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = {
- &envoy_config_metrics_v3_StatsdSink_submsgs[0],
+ &envoy_config_metrics_v3_StatsdSink__submsgs[0],
&envoy_config_metrics_v3_StatsdSink__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -180,7 +180,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = {
};
const upb_MiniTable* envoy__config__metrics__v3__StatsdSink_msg_init_ptr = &envoy__config__metrics__v3__StatsdSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -192,7 +192,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3]
};
const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = {
- &envoy_config_metrics_v3_DogStatsdSink_submsgs[0],
+ &envoy_config_metrics_v3_DogStatsdSink__submsgs[0],
&envoy_config_metrics_v3_DogStatsdSink__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
index f27f3f4ed850d..5ebc8d7914f78 100644
--- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
index dfff896252799..49620f701b5d6 100644
--- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_
-#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1251,4 +1251,4 @@ UPB_INLINE struct envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
index b17c6021f04a1..5d406181b902f 100644
--- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields
};
const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = {
- &envoy_config_overload_v3_ResourceMonitor_submsgs[0],
+ &envoy_config_overload_v3_ResourceMonitor__submsgs[0],
&envoy_config_overload_v3_ResourceMonitor__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -84,7 +84,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = {
};
const upb_MiniTable* envoy__config__overload__v3__ScaledTrigger_msg_init_ptr = &envoy__config__overload__v3__ScaledTrigger_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaledTrigger_msg_init_ptr},
};
@@ -96,7 +96,7 @@ static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = {
};
const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = {
- &envoy_config_overload_v3_Trigger_submsgs[0],
+ &envoy_config_overload_v3_Trigger__submsgs[0],
&envoy_config_overload_v3_Trigger__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -111,7 +111,7 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = {
};
const upb_MiniTable* envoy__config__overload__v3__Trigger_msg_init_ptr = &envoy__config__overload__v3__Trigger_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr},
};
@@ -120,7 +120,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi
};
const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init = {
- &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0],
+ &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__submsgs[0],
&envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -133,7 +133,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig
};
const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
};
@@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi
};
const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init = {
- &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0],
+ &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__submsgs[0],
&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0],
24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -160,7 +160,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig
};
const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[
};
const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = {
- &envoy_config_overload_v3_OverloadAction_submsgs[0],
+ &envoy_config_overload_v3_OverloadAction__submsgs[0],
&envoy_config_overload_v3_OverloadAction__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -187,7 +187,7 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = {
};
const upb_MiniTable* envoy__config__overload__v3__OverloadAction_msg_init_ptr = &envoy__config__overload__v3__OverloadAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr},
};
@@ -197,7 +197,7 @@ static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2
};
const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = {
- &envoy_config_overload_v3_LoadShedPoint_submsgs[0],
+ &envoy_config_overload_v3_LoadShedPoint__submsgs[0],
&envoy_config_overload_v3_LoadShedPoint__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -230,7 +230,7 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init =
};
const upb_MiniTable* envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr = &envoy__config__overload__v3__BufferFactoryConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ResourceMonitor_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadAction_msg_init_ptr},
@@ -247,7 +247,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields
};
const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = {
- &envoy_config_overload_v3_OverloadManager_submsgs[0],
+ &envoy_config_overload_v3_OverloadManager__submsgs[0],
&envoy_config_overload_v3_OverloadManager__fields[0],
UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
index e91a7a06ff4ff..f6a5dcb55b2eb 100644
--- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -47,4 +47,4 @@ extern const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
index abfdd76f19afd..917735b7af954 100644
--- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1872,4 +1872,4 @@ UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Acti
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
index fbcde8c9a8959..0271d9071e358 100644
--- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c
@@ -29,7 +29,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr},
};
@@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = {
};
const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = {
- &envoy_config_rbac_v3_RBAC_submsgs[0],
+ &envoy_config_rbac_v3_RBAC__submsgs[0],
&envoy_config_rbac_v3_RBAC__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -54,7 +54,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__RBAC_msg_init_ptr = &envoy__config__rbac__v3__RBAC_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr},
};
@@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__f
};
const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init = {
- &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0],
+ &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__submsgs[0],
&envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -79,7 +79,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init
};
const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -89,7 +89,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_Au
};
const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init = {
- &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0],
+ &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__submsgs[0],
&envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog
};
const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Policy_msg_init_ptr},
};
@@ -114,7 +114,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[
};
const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = {
- &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0],
+ &envoy_config_rbac_v3_RBAC_PoliciesEntry__submsgs[0],
&envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -127,7 +127,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
@@ -142,7 +142,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = {
};
const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = {
- &envoy_config_rbac_v3_Policy_submsgs[0],
+ &envoy_config_rbac_v3_Policy__submsgs[0],
&envoy_config_rbac_v3_Policy__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -157,7 +157,7 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__Policy_msg_init_ptr = &envoy__config__rbac__v3__Policy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission__submsgs[11] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
@@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = {
};
const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = {
- &envoy_config_rbac_v3_Permission_submsgs[0],
+ &envoy_config_rbac_v3_Permission__submsgs[0],
&envoy_config_rbac_v3_Permission__fields[0],
UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -215,7 +215,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__Permission_msg_init_ptr = &envoy__config__rbac__v3__Permission_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr},
};
@@ -224,7 +224,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] =
};
const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = {
- &envoy_config_rbac_v3_Permission_Set_submsgs[0],
+ &envoy_config_rbac_v3_Permission_Set__submsgs[0],
&envoy_config_rbac_v3_Permission_Set__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -237,7 +237,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__Permission__Set_msg_init_ptr = &envoy__config__rbac__v3__Permission__Set_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal__submsgs[11] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr},
@@ -267,7 +267,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = {
};
const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = {
- &envoy_config_rbac_v3_Principal_submsgs[0],
+ &envoy_config_rbac_v3_Principal__submsgs[0],
&envoy_config_rbac_v3_Principal__fields[0],
UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -294,7 +294,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__Principal_msg_init_ptr = &envoy__config__rbac__v3__Principal_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr},
};
@@ -303,7 +303,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] =
};
const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = {
- &envoy_config_rbac_v3_Principal_Set_submsgs[0],
+ &envoy_config_rbac_v3_Principal_Set__submsgs[0],
&envoy_config_rbac_v3_Principal_Set__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -316,7 +316,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = {
};
const upb_MiniTable* envoy__config__rbac__v3__Principal__Set_msg_init_ptr = &envoy__config__rbac__v3__Principal__Set_msg_init;
-static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -325,7 +325,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fi
};
const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = {
- &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0],
+ &envoy_config_rbac_v3_Principal_Authenticated__submsgs[0],
&envoy_config_rbac_v3_Principal_Authenticated__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
index 0c40e3a57ffb4..dbb797c5faec6 100644
--- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -49,4 +49,4 @@ extern const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
index 25ae4043eabb4..9c32f40a4f528 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -942,4 +942,4 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
index 44b3a48007b4a..4c8df18368fca 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_submsgs[10] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration__submsgs[10] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
@@ -56,7 +56,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration__fields
};
const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = {
- &envoy_config_route_v3_RouteConfiguration_submsgs[0],
+ &envoy_config_route_v3_RouteConfiguration__submsgs[0],
&envoy_config_route_v3_RouteConfiguration__fields[0],
UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 17, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -83,7 +83,7 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RouteConfiguration_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration_TypedPe
};
const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init = {
- &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0],
+ &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__submsgs[0],
&envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilter
};
const upb_MiniTable* envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_Vhds_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_Vhds__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_config_route_v3_Vhds__fields[1] = {
};
const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = {
- &envoy_config_route_v3_Vhds_submsgs[0],
+ &envoy_config_route_v3_Vhds__submsgs[0],
&envoy_config_route_v3_Vhds__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
index 0005b2b5021a6..bf5b5620ec236 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
index e5bb26b657fb5..0344c7f8d5c56 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -10488,4 +10488,4 @@ UPB_INLINE void envoy_config_route_v3_FilterConfig_set_disabled(envoy_config_rou
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
index 710fbc5cf76eb..899cb9421e7bf 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c
@@ -34,7 +34,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_submsgs[14] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost__submsgs[14] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init_ptr},
@@ -77,7 +77,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualHost__fields[22] =
};
const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = {
- &envoy_config_route_v3_VirtualHost_submsgs[0],
+ &envoy_config_route_v3_VirtualHost__submsgs[0],
&envoy_config_route_v3_VirtualHost__fields[0],
UPB_SIZE(104, 176), 22, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -120,7 +120,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__VirtualHost_msg_init_ptr = &envoy__config__route__v3__VirtualHost_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -130,7 +130,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualHost_TypedPerFilter
};
const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init = {
- &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0],
+ &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__submsgs[0],
&envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -143,7 +143,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigE
};
const upb_MiniTable* envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_FilterAction_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_FilterAction__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -152,7 +152,7 @@ static const upb_MiniTableField envoy_config_route_v3_FilterAction__fields[1] =
};
const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = {
- &envoy_config_route_v3_FilterAction_submsgs[0],
+ &envoy_config_route_v3_FilterAction__submsgs[0],
&envoy_config_route_v3_FilterAction__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -161,7 +161,7 @@ const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__FilterAction_msg_init_ptr = &envoy__config__route__v3__FilterAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr},
};
@@ -170,7 +170,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteList__fields[1] = {
};
const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = {
- &envoy_config_route_v3_RouteList_submsgs[0],
+ &envoy_config_route_v3_RouteList__submsgs[0],
&envoy_config_route_v3_RouteList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -183,7 +183,7 @@ const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RouteList_msg_init_ptr = &envoy__config__route__v3__RouteList_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_Route_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_Route__submsgs[13] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RedirectAction_msg_init_ptr},
@@ -220,7 +220,7 @@ static const upb_MiniTableField envoy_config_route_v3_Route__fields[17] = {
};
const upb_MiniTable envoy__config__route__v3__Route_msg_init = {
- &envoy_config_route_v3_Route_submsgs[0],
+ &envoy_config_route_v3_Route__submsgs[0],
&envoy_config_route_v3_Route__fields[0],
UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -263,7 +263,7 @@ const upb_MiniTable envoy__config__route__v3__Route_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__Route_msg_init_ptr = &envoy__config__route__v3__Route_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_Route_TypedPerFilterConfigEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -273,7 +273,7 @@ static const upb_MiniTableField envoy_config_route_v3_Route_TypedPerFilterConfig
};
const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init = {
- &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0],
+ &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__submsgs[0],
&envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -286,7 +286,7 @@ const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_m
};
const upb_MiniTable* envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -299,7 +299,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster__fields[4]
};
const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = {
- &envoy_config_route_v3_WeightedCluster_submsgs[0],
+ &envoy_config_route_v3_WeightedCluster__submsgs[0],
&envoy_config_route_v3_WeightedCluster__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -318,7 +318,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__WeightedCluster_msg_init_ptr = &envoy__config__route__v3__WeightedCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr},
@@ -340,7 +340,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWei
};
const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init = {
- &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0],
+ &envoy_config_route_v3_WeightedCluster_ClusterWeight__submsgs[0],
&envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0],
UPB_SIZE(72, 120), 10, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -367,7 +367,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg
};
const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -377,7 +377,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWei
};
const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init = {
- &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0],
+ &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__submsgs[0],
&envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -390,7 +390,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__Ty
};
const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_ClusterSpecifierPlugin__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -400,7 +400,7 @@ static const upb_MiniTableField envoy_config_route_v3_ClusterSpecifierPlugin__fi
};
const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = {
- &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0],
+ &envoy_config_route_v3_ClusterSpecifierPlugin__submsgs[0],
&envoy_config_route_v3_ClusterSpecifierPlugin__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -415,7 +415,7 @@ const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init =
};
const upb_MiniTable* envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_submsgs[10] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch__submsgs[10] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr},
@@ -445,7 +445,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteMatch__fields[13] = {
};
const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = {
- &envoy_config_route_v3_RouteMatch_submsgs[0],
+ &envoy_config_route_v3_RouteMatch__submsgs[0],
&envoy_config_route_v3_RouteMatch__fields[0],
UPB_SIZE(56, 88), 13, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -482,7 +482,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_
};
const upb_MiniTable* envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init_ptr = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -493,7 +493,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteMatch_TlsContextMatch
};
const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init = {
- &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0],
+ &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__submsgs[0],
&envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -512,7 +512,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_ini
};
const upb_MiniTable* envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init_ptr = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_CorsPolicy_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_CorsPolicy__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr},
@@ -535,7 +535,7 @@ static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[10] = {
};
const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = {
- &envoy_config_route_v3_CorsPolicy_submsgs[0],
+ &envoy_config_route_v3_CorsPolicy__submsgs[0],
&envoy_config_route_v3_CorsPolicy__fields[0],
UPB_SIZE(72, 128), 10, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -562,7 +562,7 @@ const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__CorsPolicy_msg_init_ptr = &envoy__config__route__v3__CorsPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_submsgs[24] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction__submsgs[24] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -627,7 +627,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction__fields[34] =
};
const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = {
- &envoy_config_route_v3_RouteAction_submsgs[0],
+ &envoy_config_route_v3_RouteAction__submsgs[0],
&envoy_config_route_v3_RouteAction__fields[0],
UPB_SIZE(144, 248), 34, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -670,7 +670,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RouteAction_msg_init_ptr = &envoy__config__route__v3__RouteAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_RequestMirrorPolicy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -684,7 +684,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorP
};
const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init = {
- &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0],
+ &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__submsgs[0],
&envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -703,7 +703,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_m
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init_ptr},
@@ -721,7 +721,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy__fi
};
const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = {
- &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0],
+ &envoy_config_route_v3_RouteAction_HashPolicy__submsgs[0],
&envoy_config_route_v3_RouteAction_HashPolicy__fields[0],
24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -740,7 +740,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init =
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Header__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr},
};
@@ -750,7 +750,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Hea
};
const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init = {
- &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0],
+ &envoy_config_route_v3_RouteAction_HashPolicy_Header__submsgs[0],
&envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -784,7 +784,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAtt
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Cookie__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr},
};
@@ -797,7 +797,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Coo
};
const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init = {
- &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0],
+ &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__submsgs[0],
&envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -870,7 +870,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterSta
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr},
};
@@ -882,7 +882,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_
};
const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init = {
- &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0],
+ &envoy_config_route_v3_RouteAction_UpgradeConfig__submsgs[0],
&envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -895,7 +895,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_ini
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr},
};
@@ -905,7 +905,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_
};
const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init = {
- &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0],
+ &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__submsgs[0],
&envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -920,7 +920,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__Connec
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_MaxStreamDuration__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -933,7 +933,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_MaxStreamDurat
};
const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init = {
- &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0],
+ &envoy_config_route_v3_RouteAction_MaxStreamDuration__submsgs[0],
&envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -942,7 +942,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg
};
const upb_MiniTable* envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init_ptr = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_submsgs[10] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy__submsgs[10] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr},
@@ -972,7 +972,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy__fields[13] =
};
const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = {
- &envoy_config_route_v3_RetryPolicy_submsgs[0],
+ &envoy_config_route_v3_RetryPolicy__submsgs[0],
&envoy_config_route_v3_RetryPolicy__fields[0],
UPB_SIZE(72, 128), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -999,7 +999,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RetryPolicy_msg_init_ptr = &envoy__config__route__v3__RetryPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryPriority__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -1009,7 +1009,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryPriority_
};
const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init = {
- &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0],
+ &envoy_config_route_v3_RetryPolicy_RetryPriority__submsgs[0],
&envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1024,7 +1024,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_ini
};
const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryHostPredicate__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -1034,7 +1034,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryHostPredi
};
const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init = {
- &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0],
+ &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__submsgs[0],
&envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1049,7 +1049,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_ms
};
const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryBackOff__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -1060,7 +1060,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryBackOff__
};
const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init = {
- &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0],
+ &envoy_config_route_v3_RetryPolicy_RetryBackOff__submsgs[0],
&envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1090,7 +1090,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init
};
const upb_MiniTable* envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -1101,7 +1101,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RateLimitedRet
};
const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init = {
- &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0],
+ &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__submsgs[0],
&envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1114,7 +1114,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackO
};
const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_HedgePolicy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_HedgePolicy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
};
@@ -1126,7 +1126,7 @@ static const upb_MiniTableField envoy_config_route_v3_HedgePolicy__fields[3] = {
};
const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = {
- &envoy_config_route_v3_HedgePolicy_submsgs[0],
+ &envoy_config_route_v3_HedgePolicy__submsgs[0],
&envoy_config_route_v3_HedgePolicy__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1141,7 +1141,7 @@ const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__HedgePolicy_msg_init_ptr = &envoy__config__route__v3__HedgePolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RedirectAction_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RedirectAction__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr},
};
@@ -1158,7 +1158,7 @@ static const upb_MiniTableField envoy_config_route_v3_RedirectAction__fields[9]
};
const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = {
- &envoy_config_route_v3_RedirectAction_submsgs[0],
+ &envoy_config_route_v3_RedirectAction__submsgs[0],
&envoy_config_route_v3_RedirectAction__fields[0],
UPB_SIZE(56, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1185,7 +1185,7 @@ const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RedirectAction_msg_init_ptr = &envoy__config__route__v3__RedirectAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_DirectResponseAction_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_DirectResponseAction__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
};
@@ -1195,7 +1195,7 @@ static const upb_MiniTableField envoy_config_route_v3_DirectResponseAction__fiel
};
const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = {
- &envoy_config_route_v3_DirectResponseAction_submsgs[0],
+ &envoy_config_route_v3_DirectResponseAction__submsgs[0],
&envoy_config_route_v3_DirectResponseAction__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1218,7 +1218,7 @@ const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__NonForwardingAction_msg_init_ptr = &envoy__config__route__v3__NonForwardingAction_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_Decorator_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_Decorator__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -1228,7 +1228,7 @@ static const upb_MiniTableField envoy_config_route_v3_Decorator__fields[2] = {
};
const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = {
- &envoy_config_route_v3_Decorator_submsgs[0],
+ &envoy_config_route_v3_Decorator__submsgs[0],
&envoy_config_route_v3_Decorator__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1241,7 +1241,7 @@ const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__Decorator_msg_init_ptr = &envoy__config__route__v3__Decorator_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_Tracing_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_Tracing__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
@@ -1256,7 +1256,7 @@ static const upb_MiniTableField envoy_config_route_v3_Tracing__fields[4] = {
};
const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = {
- &envoy_config_route_v3_Tracing_submsgs[0],
+ &envoy_config_route_v3_Tracing__submsgs[0],
&envoy_config_route_v3_Tracing__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1275,7 +1275,7 @@ const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__Tracing_msg_init_ptr = &envoy__config__route__v3__Tracing_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualCluster_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualCluster__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
};
@@ -1285,7 +1285,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualCluster__fields[2]
};
const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = {
- &envoy_config_route_v3_VirtualCluster_submsgs[0],
+ &envoy_config_route_v3_VirtualCluster__submsgs[0],
&envoy_config_route_v3_VirtualCluster__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1304,7 +1304,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__VirtualCluster_msg_init_ptr = &envoy__config__route__v3__VirtualCluster_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override_msg_init_ptr},
@@ -1318,7 +1318,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit__fields[4] = {
};
const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = {
- &envoy_config_route_v3_RateLimit_submsgs[0],
+ &envoy_config_route_v3_RateLimit__submsgs[0],
&envoy_config_route_v3_RateLimit__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1333,7 +1333,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RateLimit_msg_init_ptr = &envoy__config__route__v3__RateLimit_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_submsgs[11] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action__submsgs[11] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init_ptr},
@@ -1362,7 +1362,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action__fields[1
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action__submsgs[0],
&envoy_config_route_v3_RateLimit_Action__fields[0],
UPB_SIZE(16, 24), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1441,7 +1441,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_m
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -1452,7 +1452,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MaskedRem
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__submsgs[0],
&envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1482,7 +1482,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
};
@@ -1495,7 +1495,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_HeaderVal
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__submsgs[0],
&envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1514,7 +1514,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatc
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_DynamicMetaData__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr},
};
@@ -1525,7 +1525,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_DynamicMe
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__submsgs[0],
&envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0],
UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1540,7 +1540,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MetaData__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr},
};
@@ -1553,7 +1553,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MetaData_
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action_MetaData__submsgs[0],
&envoy_config_route_v3_RateLimit_Action_MetaData__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1572,7 +1572,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_in
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr},
};
@@ -1585,7 +1585,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_QueryPara
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init = {
- &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__submsgs[0],
&envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1604,7 +1604,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterV
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr},
};
@@ -1613,7 +1613,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override__fields
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = {
- &envoy_config_route_v3_RateLimit_Override_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Override__submsgs[0],
&envoy_config_route_v3_RateLimit_Override__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1626,7 +1626,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Override_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_DynamicMetadata__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr},
};
@@ -1635,7 +1635,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override_Dynamic
};
const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init = {
- &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0],
+ &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__submsgs[0],
&envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1644,7 +1644,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetada
};
const upb_MiniTable* envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_HeaderMatcher_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_HeaderMatcher__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
@@ -1665,7 +1665,7 @@ static const upb_MiniTableField envoy_config_route_v3_HeaderMatcher__fields[11]
};
const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = {
- &envoy_config_route_v3_HeaderMatcher_submsgs[0],
+ &envoy_config_route_v3_HeaderMatcher__submsgs[0],
&envoy_config_route_v3_HeaderMatcher__fields[0],
UPB_SIZE(40, 56), 11, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1692,7 +1692,7 @@ const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__HeaderMatcher_msg_init_ptr = &envoy__config__route__v3__HeaderMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_QueryParameterMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -1703,7 +1703,7 @@ static const upb_MiniTableField envoy_config_route_v3_QueryParameterMatcher__fie
};
const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = {
- &envoy_config_route_v3_QueryParameterMatcher_submsgs[0],
+ &envoy_config_route_v3_QueryParameterMatcher__submsgs[0],
&envoy_config_route_v3_QueryParameterMatcher__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1722,7 +1722,7 @@ const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = {
};
const upb_MiniTable* envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr = &envoy__config__route__v3__QueryParameterMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_InternalRedirectPolicy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -1736,7 +1736,7 @@ static const upb_MiniTableField envoy_config_route_v3_InternalRedirectPolicy__fi
};
const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = {
- &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0],
+ &envoy_config_route_v3_InternalRedirectPolicy__submsgs[0],
&envoy_config_route_v3_InternalRedirectPolicy__fields[0],
UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1755,7 +1755,7 @@ const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init =
};
const upb_MiniTable* envoy__config__route__v3__InternalRedirectPolicy_msg_init_ptr = &envoy__config__route__v3__InternalRedirectPolicy_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_FilterConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_FilterConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -1766,7 +1766,7 @@ static const upb_MiniTableField envoy_config_route_v3_FilterConfig__fields[3] =
};
const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = {
- &envoy_config_route_v3_FilterConfig_submsgs[0],
+ &envoy_config_route_v3_FilterConfig__submsgs[0],
&envoy_config_route_v3_FilterConfig__fields[0],
24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
index 35331367f8477..5a7c22a6fbe72 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -143,4 +143,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
index 2378a9d697aba..b0a2a49a76451 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_
-#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -357,4 +357,4 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
index f0c3885812b0e..e6e97d0fb804f 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr},
};
@@ -33,7 +33,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__
};
const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init = {
- &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0],
+ &envoy_config_route_v3_ScopedRouteConfiguration__submsgs[0],
&envoy_config_route_v3_ScopedRouteConfiguration__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init
};
const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init;
-static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr},
};
@@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_K
};
const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init = {
- &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0],
+ &envoy_config_route_v3_ScopedRouteConfiguration_Key__submsgs[0],
&envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
index ab4ede108ea03..092df854c26d5 100644
--- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
index 570c4cf19954a..646207cfe0ff2 100644
--- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1649,4 +1649,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_Streamin
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
index 4b220d0743114..4a87eeddb2dac 100644
--- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c
@@ -25,7 +25,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr},
@@ -40,7 +40,7 @@ static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = {
};
const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = {
- &envoy_config_tap_v3_TapConfig_submsgs[0],
+ &envoy_config_tap_v3_TapConfig__submsgs[0],
&envoy_config_tap_v3_TapConfig__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -49,7 +49,7 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__TapConfig_msg_init_ptr = &envoy__config__tap__v3__TapConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_submsgs[9] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate__submsgs[9] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] =
};
const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = {
- &envoy_config_tap_v3_MatchPredicate_submsgs[0],
+ &envoy_config_tap_v3_MatchPredicate__submsgs[0],
&envoy_config_tap_v3_MatchPredicate__fields[0],
UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -102,7 +102,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__MatchPredicate_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr},
};
@@ -111,7 +111,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fie
};
const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = {
- &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0],
+ &envoy_config_tap_v3_MatchPredicate_MatchSet__submsgs[0],
&envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -124,7 +124,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init =
};
const upb_MiniTable* envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
};
@@ -133,7 +133,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1]
};
const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = {
- &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0],
+ &envoy_config_tap_v3_HttpHeadersMatch__submsgs[0],
&envoy_config_tap_v3_HttpHeadersMatch__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -146,7 +146,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__tap__v3__HttpHeadersMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr},
};
@@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields
};
const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = {
- &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0],
+ &envoy_config_tap_v3_HttpGenericBodyMatch__submsgs[0],
&envoy_config_tap_v3_HttpGenericBodyMatch__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat
};
const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputSink_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -206,7 +206,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = {
};
const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = {
- &envoy_config_tap_v3_OutputConfig_submsgs[0],
+ &envoy_config_tap_v3_OutputConfig__submsgs[0],
&envoy_config_tap_v3_OutputConfig__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -225,7 +225,7 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__OutputConfig_msg_init_ptr = &envoy__config__tap__v3__OutputConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__FilePerTapSink_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr},
@@ -243,7 +243,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[6] = {
};
const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = {
- &envoy_config_tap_v3_OutputSink_submsgs[0],
+ &envoy_config_tap_v3_OutputSink__submsgs[0],
&envoy_config_tap_v3_OutputSink__fields[0],
24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr = &envoy__config__tap__v3__StreamingAdminSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2]
};
const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = {
- &envoy_config_tap_v3_BufferedAdminSink_submsgs[0],
+ &envoy_config_tap_v3_BufferedAdminSink__submsgs[0],
&envoy_config_tap_v3_BufferedAdminSink__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -313,7 +313,7 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = {
};
const upb_MiniTable* envoy__config__tap__v3__FilePerTapSink_msg_init_ptr = &envoy__config__tap__v3__FilePerTapSink_msg_init;
-static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
};
@@ -323,7 +323,7 @@ static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2]
};
const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = {
- &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0],
+ &envoy_config_tap_v3_StreamingGrpcSink__submsgs[0],
&envoy_config_tap_v3_StreamingGrpcSink__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
index 27bd5683c2a6b..fbf2b413f587b 100644
--- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -51,4 +51,4 @@ extern const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
index a3ef65b3f227c..f541eadaea396 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -222,4 +222,4 @@ UPB_INLINE struct envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
index 0d7512e8fcf4d..c9e439a672161 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__field
};
const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = {
- &envoy_config_trace_v3_DatadogRemoteConfig_submsgs[0],
+ &envoy_config_trace_v3_DatadogRemoteConfig__submsgs[0],
&envoy_config_trace_v3_DatadogRemoteConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = {
};
const upb_MiniTable* envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] =
};
const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = {
- &envoy_config_trace_v3_DatadogConfig_submsgs[0],
+ &envoy_config_trace_v3_DatadogConfig__submsgs[0],
&envoy_config_trace_v3_DatadogConfig__fields[0],
UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
index d7d096c7f9ff8..cddf338a8f072 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
index 23124ea5a3863..bfbb040484e37 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -122,4 +122,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
index d05f6993b54ae..8477f3baf910b 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2]
};
const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = {
- &envoy_config_trace_v3_DynamicOtConfig_submsgs[0],
+ &envoy_config_trace_v3_DynamicOtConfig__submsgs[0],
&envoy_config_trace_v3_DynamicOtConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
index 3b8b0edf53606..3789285f69c3c 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
index a3a19e96a2a29..1d45543fb256d 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -198,4 +198,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutabl
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
index b7e3acdf71cf3..d091ace910043 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = {
};
const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = {
- &envoy_config_trace_v3_Tracing_submsgs[0],
+ &envoy_config_trace_v3_Tracing__submsgs[0],
&envoy_config_trace_v3_Tracing__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -36,7 +36,7 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = {
};
const upb_MiniTable* envoy__config__trace__v3__Tracing_msg_init_ptr = &envoy__config__trace__v3__Tracing_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -46,7 +46,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] =
};
const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = {
- &envoy_config_trace_v3_Tracing_Http_submsgs[0],
+ &envoy_config_trace_v3_Tracing_Http__submsgs[0],
&envoy_config_trace_v3_Tracing_Http__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
index 3a73ca85b2edb..bdc7ff343fe5f 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
index 40ed544864a62..e209d7d84e178 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -205,4 +205,4 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_Lightst
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
index 32d753f6414df..272ef77056131 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
};
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4]
};
const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = {
- &envoy_config_trace_v3_LightstepConfig_submsgs[0],
+ &envoy_config_trace_v3_LightstepConfig__submsgs[0],
&envoy_config_trace_v3_LightstepConfig__fields[0],
UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
index 1ba326dce4e3d..e706a3ff94d5f 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
index 6e5b919ff1990..8242b6bc470e7 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -423,4 +423,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCe
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
index 591498a04a06d..70612cf42a529 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__TraceConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
@@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[1
};
const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = {
- &envoy_config_trace_v3_OpenCensusConfig_submsgs[0],
+ &envoy_config_trace_v3_OpenCensusConfig__submsgs[0],
&envoy_config_trace_v3_OpenCensusConfig__fields[0],
UPB_SIZE(72, 120), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
index a50ace9f603f3..7625c551b52d9 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
index dfe7668e2a4ba..d460acc894225 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -250,4 +250,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
index 881108402f231..18acc29777dbb 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__field
};
const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = {
- &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0],
+ &envoy_config_trace_v3_OpenTelemetryConfig__submsgs[0],
&envoy_config_trace_v3_OpenTelemetryConfig__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
index 76c4b4e13ecaf..413f066bfd53f 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_fil
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
index c82e4f2620d8e..0e31775f60d0f 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -104,4 +104,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_TraceS
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
index 33bfcf34a483a..39f693bd06723 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_TraceServiceConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_trace_v3_TraceServiceConfig__fields
};
const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = {
- &envoy_config_trace_v3_TraceServiceConfig_submsgs[0],
+ &envoy_config_trace_v3_TraceServiceConfig__submsgs[0],
&envoy_config_trace_v3_TraceServiceConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
index 2a03b64e0c4a0..28e27f068dd78 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
index a0faa7cf2c869..a06fb59162cf5 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -267,4 +267,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_trace_v3_ClientConfi
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
index 204599f19307c..0075c7bf0c7b5 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_SkyWalkingConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__ClientConfig_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_trace_v3_SkyWalkingConfig__fields[2
};
const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = {
- &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0],
+ &envoy_config_trace_v3_SkyWalkingConfig__submsgs[0],
&envoy_config_trace_v3_SkyWalkingConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -40,7 +40,7 @@ const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = {
};
const upb_MiniTable* envoy__config__trace__v3__SkyWalkingConfig_msg_init_ptr = &envoy__config__trace__v3__SkyWalkingConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_ClientConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_ClientConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_config_trace_v3_ClientConfig__fields[4] =
};
const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = {
- &envoy_config_trace_v3_ClientConfig_submsgs[0],
+ &envoy_config_trace_v3_ClientConfig__submsgs[0],
&envoy_config_trace_v3_ClientConfig__fields[0],
UPB_SIZE(48, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
index 9c8b5dec0679b..a4ef4dc4d9204 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
index 3eb50b671daf8..f7c91f83d94e8 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -47,4 +47,4 @@ extern "C" {
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
index 5975b4104d98c..7f1750ed03a25 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
/* Public Imports. */
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
index c49be10959ec6..cb8d7076b0767 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -270,4 +270,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig_Segme
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
index 7e7e00e2a87ce..c64e879841a9b 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init_ptr},
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_XRayConfig__fields[4] = {
};
const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = {
- &envoy_config_trace_v3_XRayConfig_submsgs[0],
+ &envoy_config_trace_v3_XRayConfig__submsgs[0],
&envoy_config_trace_v3_XRayConfig__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = {
};
const upb_MiniTable* envoy__config__trace__v3__XRayConfig_msg_init_ptr = &envoy__config__trace__v3__XRayConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_SegmentFields__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -60,7 +60,7 @@ static const upb_MiniTableField envoy_config_trace_v3_XRayConfig_SegmentFields__
};
const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init = {
- &envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[0],
+ &envoy_config_trace_v3_XRayConfig_SegmentFields__submsgs[0],
&envoy_config_trace_v3_XRayConfig_SegmentFields__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
index 50d82879aea51..029024b15a990 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
index c3bd9434a8397..99e0cbc076692 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_
-#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_
+#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -209,4 +209,4 @@ UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_split_spans_for_request(e
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
index 24f29ffec73b0..512b9a1e2a511 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_config_trace_v3_ZipkinConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_config_trace_v3_ZipkinConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_ZipkinConfig__fields[7] =
};
const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = {
- &envoy_config_trace_v3_ZipkinConfig_submsgs[0],
+ &envoy_config_trace_v3_ZipkinConfig__submsgs[0],
&envoy_config_trace_v3_ZipkinConfig__fields[0],
UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
index 2e207c74a9723..df4491dd6c475 100644
--- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_
-#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
index 21ea86b140199..d010d80ea5979 100644
--- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
-#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2974,4 +2974,4 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersE
#include "upb/port/undef.inc"
-#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */
+#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
index 2ba6173bf4fa5..b98b0130431a3 100644
--- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c
@@ -24,7 +24,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TCPAccessLogEntry__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr},
};
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TCPAccessLogEntry__field
};
const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = {
- &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0],
+ &envoy_data_accesslog_v3_TCPAccessLogEntry__submsgs[0],
&envoy_data_accesslog_v3_TCPAccessLogEntry__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -44,7 +44,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = {
};
const upb_MiniTable* envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init_ptr = &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPAccessLogEntry__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init_ptr},
@@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPAccessLogEntry__fiel
};
const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = {
- &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0],
+ &envoy_data_accesslog_v3_HTTPAccessLogEntry__submsgs[0],
&envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -94,7 +94,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init =
};
const upb_MiniTable* envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr = &envoy__data__accesslog__v3__ConnectionProperties_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon__submsgs[19] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties_msg_init_ptr},
@@ -153,7 +153,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon__fields[
};
const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = {
- &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0],
+ &envoy_data_accesslog_v3_AccessLogCommon__submsgs[0],
&envoy_data_accesslog_v3_AccessLogCommon__fields[0],
UPB_SIZE(192, 312), 33, kUpb_ExtMode_NonExtendable, 33, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -196,7 +196,7 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = {
};
const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -206,7 +206,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_FilterSt
};
const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init = {
- &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0],
+ &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__submsgs[0],
&envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -240,7 +240,7 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry
};
const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_ResponseFlags__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr},
};
@@ -276,7 +276,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[28
};
const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = {
- &envoy_data_accesslog_v3_ResponseFlags_submsgs[0],
+ &envoy_data_accesslog_v3_ResponseFlags__submsgs[0],
&envoy_data_accesslog_v3_ResponseFlags__fields[0],
48, 28, kUpb_ExtMode_NonExtendable, 28, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -337,7 +337,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_
};
const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr},
@@ -354,7 +354,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties__fields[7]
};
const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = {
- &envoy_data_accesslog_v3_TLSProperties_submsgs[0],
+ &envoy_data_accesslog_v3_TLSProperties__submsgs[0],
&envoy_data_accesslog_v3_TLSProperties__fields[0],
UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -373,7 +373,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = {
};
const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_CertificateProperties__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr},
};
@@ -384,7 +384,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_Certificat
};
const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init = {
- &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0],
+ &envoy_data_accesslog_v3_TLSProperties_CertificateProperties__submsgs[0],
&envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -420,7 +420,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper
};
const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPRequestProperties__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr},
};
@@ -444,7 +444,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties__f
};
const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = {
- &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0],
+ &envoy_data_accesslog_v3_HTTPRequestProperties__submsgs[0],
&envoy_data_accesslog_v3_HTTPRequestProperties__fields[0],
UPB_SIZE(120, 192), 15, kUpb_ExtMode_NonExtendable, 15, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -492,7 +492,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHe
};
const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPResponseProperties__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init_ptr},
@@ -510,7 +510,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties__
};
const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init = {
- &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0],
+ &envoy_data_accesslog_v3_HTTPResponseProperties__submsgs[0],
&envoy_data_accesslog_v3_HTTPResponseProperties__fields[0],
UPB_SIZE(64, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
index ffce3d33589c9..72f952e2a5add 100644
--- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
index 8c6ebbe6a4126..758f9b2dd7ce0 100644
--- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -132,4 +132,4 @@ UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_add_cluster
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
index 266c0efb767cc..30bbabd7a15fc 100644
--- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_pr
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
index 48a4be6ca67d3..792724211e265 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -452,4 +452,4 @@ UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderL
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
index 7e53431d5db42..edf7467ec93a8 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultDelay__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr},
@@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultDe
};
const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init = {
- &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0],
+ &envoy_extensions_filters_common_fault_v3_FaultDelay__submsgs[0],
&envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -61,7 +61,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__H
};
const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultRateLimit__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init_ptr},
@@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRa
};
const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init = {
- &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0],
+ &envoy_extensions_filters_common_fault_v3_FaultRateLimit__submsgs[0],
&envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
index f5047f1468e54..df8d621bd68b0 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_pr
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
index 5d02885458e87..f7be77edc042e 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -693,4 +693,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
index 707992af70841..8ed7c04f090a6 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_FaultAbort__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr},
};
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_FaultAbor
};
const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init = {
- &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0],
+ &envoy_extensions_filters_http_fault_v3_FaultAbort__submsgs[0],
&envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -64,7 +64,7 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__Hea
};
const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_HTTPFault__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr},
@@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_HTTPFault
};
const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init = {
- &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0],
+ &envoy_extensions_filters_http_fault_v3_HTTPFault__submsgs[0],
&envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0],
UPB_SIZE(112, 200), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
index c027169292f1f..fe37dae4ac0d3 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_prot
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h
index 5f22ea41ce0eb..f207651cb8c23 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -441,4 +441,4 @@ UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_set_value
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c
index 546ac22ac0a6b..5a8472bf78272 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init_ptr},
@@ -39,7 +39,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_GcpAu
};
const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init = {
- &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[0],
+ &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__submsgs[0],
&envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__fields[0],
UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -76,7 +76,7 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__Audience_m
};
const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -85,7 +85,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_Token
};
const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init = {
- &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[0],
+ &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__submsgs[0],
&envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h
index e0837c746fef8..f357da0e818bb 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_gcp_authn_v3_gcp_au
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
index fc3bfd9f9f519..7c84475a8a601 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -314,4 +314,4 @@ UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_f
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
index b01ac992b48d3..3c151877148cd 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBAC__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr},
@@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fiel
};
const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = {
- &envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[0],
+ &envoy_extensions_filters_http_rbac_v3_RBAC__submsgs[0],
&envoy_extensions_filters_http_rbac_v3_RBAC__fields[0],
UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -57,7 +57,7 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init =
};
const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBACPerRoute__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr},
};
@@ -66,7 +66,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBACPerRou
};
const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init = {
- &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0],
+ &envoy_extensions_filters_http_rbac_v3_RBACPerRoute__submsgs[0],
&envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
index 242b192bd9f40..cdb0423a3fd07 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
index de9b482468e44..de555813646af 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -484,4 +484,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_router
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
index c0351cb47f757..4793bf8c5de8f 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c
@@ -22,7 +22,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr},
@@ -42,7 +42,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router__
};
const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_init = {
- &envoy_extensions_filters_http_router_v3_Router_submsgs[0],
+ &envoy_extensions_filters_http_router_v3_Router__submsgs[0],
&envoy_extensions_filters_http_router_v3_Router__fields[0],
UPB_SIZE(48, 56), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -69,7 +69,7 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_ini
};
const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router_msg_init_ptr = &envoy__extensions__filters__http__router__v3__Router_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -79,7 +79,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router_U
};
const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init = {
- &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0],
+ &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__submsgs[0],
&envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
index a2a86c4685ff1..b5e4bf1e96237 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_pr
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
index e8e9dd1916881..66bbb512679c6 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -218,4 +218,4 @@ UPB_INLINE struct envoy_extensions_filters_http_stateful_session_v3_StatefulSess
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
index 5f080e14a9fe1..3dc7355742cd8 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSession__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v
};
const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init = {
- &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0],
+ &envoy_extensions_filters_http_stateful_session_v3_StatefulSession__submsgs[0],
&envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -42,7 +42,7 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta
};
const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr},
};
@@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v
};
const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init = {
- &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0],
+ &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__submsgs[0],
&envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
index 93e101e8fb48a..a0538f5977c00 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
index bd62a0fdebc38..50fb380deb596 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#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_
+#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -4294,4 +4294,4 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
index af00227b2eab0..65145acee5251 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c
@@ -36,7 +36,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__submsgs[35] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr},
@@ -133,7 +133,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0],
UPB_SIZE(240, 384), 55, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -176,7 +176,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -198,7 +198,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0],
+ &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(48, 72), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -225,7 +225,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
};
@@ -235,7 +235,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -250,7 +250,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -263,7 +263,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0],
24, 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -282,7 +282,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
};
@@ -294,7 +294,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0],
+ &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(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -309,7 +309,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr},
};
@@ -320,7 +320,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0],
+ &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(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -358,7 +358,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -369,7 +369,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[0],
24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -384,7 +384,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr},
};
@@ -395,7 +395,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -408,7 +408,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
@@ -425,7 +425,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0],
UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -444,7 +444,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_Rds__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -454,7 +454,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_Rds__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -469,7 +469,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr},
};
@@ -478,7 +478,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -491,7 +491,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr},
@@ -507,7 +507,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -526,7 +526,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr},
};
@@ -535,7 +535,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -548,7 +548,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init_ptr},
};
@@ -557,7 +557,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0],
+ &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(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -570,7 +570,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr},
};
@@ -582,7 +582,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init = {
- &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__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -622,7 +622,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -632,7 +632,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -647,7 +647,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr},
};
@@ -661,7 +661,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -680,7 +680,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -689,7 +689,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -698,7 +698,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag
};
const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr},
};
@@ -707,7 +707,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection
};
const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init = {
- &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0],
+ &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__submsgs[0],
&envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
index 9ab23a7a759e9..5a10530c5bef8 100644
--- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -69,4 +69,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_network_http_connection_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
index 52cb6c02065a0..fcad83aba50ca 100644
--- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -103,4 +103,4 @@ UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_sess
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
index 1b86f49d99b76..cbde1caedcede 100644
--- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__Cookie_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_http_stateful_session_cookie_v3
};
const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init = {
- &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0],
+ &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__submsgs[0],
&envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
index bd205f1009ffd..31216935a4946 100644
--- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
index 53d308833564c..7bf9903bec4d5 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -256,4 +256,4 @@ UPB_INLINE struct google_protobuf_FloatValue* envoy_extensions_load_balancing_po
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
index 09683a4aec457..56aaaaf6ad9cc 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -37,7 +37,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_client_
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init = {
- &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[0],
+ &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__submsgs[0],
&envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[0],
UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
index ea08acd3937cf..39b1b2f290a84 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_s
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
index 791b6f0ce491f..d8adb22bb9ff7 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -518,4 +518,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_p
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
index 2673eae423324..a10bfbc6172f6 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c
@@ -20,7 +20,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init = {
- &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0],
+ &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__submsgs[0],
&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo
};
const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
};
@@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init = {
- &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0],
+ &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__submsgs[0],
&envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -83,7 +83,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo
};
const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr},
@@ -96,7 +96,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init = {
- &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0],
+ &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__submsgs[0],
&envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -105,7 +105,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Sl
};
const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init = {
- &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0],
+ &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__submsgs[0],
&envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
index 4625747e38b72..653b56e0084f5 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
index 74da76be89bb2..624349552f81c 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -86,4 +86,4 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
index c3af38b4a9dab..23dfe1c43e0a0 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_fir
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
index 2ce386991b7e6..6f35afd51b35d 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -266,4 +266,4 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbC
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
index c9e4ef663177a..f1b5118715f15 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
@@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_ring_ha
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init = {
- &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0],
+ &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__submsgs[0],
&envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[0],
UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
index b900eeddecd25..b87050409c528 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_has
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
index e765134f4d000..0f15b59ce5e39 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -103,4 +103,4 @@ UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_extensions_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
index 48ded81232439..2d9d2e4278dca 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_wrr_loc
};
const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init = {
- &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0],
+ &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__submsgs[0],
&envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
index b0e444089b081..837143920a1ad 100644
--- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_loca
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
index 7e07f5b8e5c2f..8d631b2e9da58 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -103,4 +103,4 @@ UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_extensions_transpo
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
index b831a158a4ddb..8ddc697d411a5 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_http_11_proxy
};
const upb_MiniTable envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init = {
- &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_submsgs[0],
+ &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__submsgs[0],
&envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
index 5bf5df708810b..2542d995639d4 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_http_11_proxy_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
index d4ddd65a370f2..068186255f520 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern "C" {
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
index 1a0c8be676ed7..20d515eb10b85 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
/* Public Imports. */
@@ -32,4 +32,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_pr
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
index a90abb9e57d47..394f64ada787f 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1645,4 +1645,4 @@ UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidation
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
index a5b3b63750a60..5fc282ec767b5 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
@@ -53,7 +53,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameter
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Privat
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -83,7 +83,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyPr
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsCertificate__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
@@ -106,7 +106,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsCer
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0],
UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -125,7 +125,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertifica
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
};
@@ -134,7 +134,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsSes
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -168,7 +168,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateP
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -179,7 +179,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Subjec
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -194,7 +194,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNa
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[10] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__submsgs[10] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
@@ -226,7 +226,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Certif
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0],
UPB_SIZE(72, 120), 15, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
index fe8e941069216..7a93da32a97ad 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
index 652e2367dd940..26814aec1655e 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -383,4 +383,4 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
index 5e6cbde9c8849..37fdcc15993b7 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_GenericSecret__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Generi
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_GenericSecret__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecre
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SdsSec
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -62,7 +62,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretCon
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_Secret__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr},
@@ -78,7 +78,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Secret
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_Secret__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_Secret__fields[0],
UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
index a7df95d18cba7..243ec808b084c 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
index 0f23e4efb3d3d..965d7d3214a1f 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1619,4 +1619,4 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
index 805e4f0658eda..f6c085ee748ff 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c
@@ -24,7 +24,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -39,7 +39,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Upstre
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -54,7 +54,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsC
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr},
@@ -78,7 +78,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Downst
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0],
UPB_SIZE(48, 72), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -105,7 +105,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTl
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr},
};
@@ -117,7 +117,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsKey
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -132,7 +132,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_ms
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__submsgs[13] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr},
@@ -166,7 +166,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0],
UPB_SIZE(56, 96), 14, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -193,7 +193,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -203,7 +203,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -239,7 +239,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr},
@@ -254,7 +254,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
index f562352ea4e98..e6a4a548822f3 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_pro
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
index b622debd1b707..18d5bf056276d 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -225,4 +225,4 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
index f9d6847d91121..323eb1b01b480 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFE
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa
};
const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFE
};
const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init = {
- &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0],
+ &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__submsgs[0],
&envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
index d6817d60b36e5..ca463e6cde228 100644
--- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spi
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h
index 4a73cb9d201dd..1d6c75b5c2e44 100644
--- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h
+++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_
-#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_
+#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_
+#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -768,4 +768,4 @@ UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_ext
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ */
+#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c
index 84118d2a127ef..53fac542674b1 100644
--- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[7] = {
+static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr},
@@ -40,7 +40,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO
};
const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init = {
- &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[0],
+ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions__submsgs[0],
&envoy_extensions_upstreams_http_v3_HttpProtocolOptions__fields[0],
UPB_SIZE(40, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -59,7 +59,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_
};
const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr},
@@ -72,7 +72,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO
};
const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init = {
- &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[0],
+ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__submsgs[0],
&envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -87,7 +87,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_
};
const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr},
@@ -100,7 +100,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO
};
const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init = {
- &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[0],
+ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__submsgs[0],
&envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -109,7 +109,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_
};
const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr},
@@ -124,7 +124,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO
};
const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init = {
- &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[0],
+ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__submsgs[0],
&envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h
index 6eaf0d58c2638..0b595e844c79c 100644
--- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_extensions_upstreams_http_v3_http_protocol_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
index 147bc33f0df67..df1b6b742fb27 100644
--- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -72,4 +72,4 @@ UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize_ex(const envoy_se
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
index 90fb109d5790a..a44f9d71cdb53 100644
--- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
index eaaf3fe236e08..107fe80d61223 100644
--- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2276,4 +2276,4 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cach
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
index 5793ae610b8fc..ffd2773f0bd34 100644
--- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c
@@ -21,7 +21,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceLocator_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceLocator__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator__fiel
};
const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = {
- &envoy_service_discovery_v3_ResourceLocator_submsgs[0],
+ &envoy_service_discovery_v3_ResourceLocator__submsgs[0],
&envoy_service_discovery_v3_ResourceLocator__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -65,7 +65,7 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParam
};
const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceName_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceName__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr},
};
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_ResourceName__fields[
};
const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = {
- &envoy_service_discovery_v3_ResourceName_submsgs[0],
+ &envoy_service_discovery_v3_ResourceName__submsgs[0],
&envoy_service_discovery_v3_ResourceName__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -88,7 +88,7 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = {
};
const upb_MiniTable* envoy__service__discovery__v3__ResourceName_msg_init_ptr = &envoy__service__discovery__v3__ResourceName_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryRequest__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init_ptr},
@@ -105,7 +105,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryRequest__fie
};
const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = {
- &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0],
+ &envoy_service_discovery_v3_DiscoveryRequest__submsgs[0],
&envoy_service_discovery_v3_DiscoveryRequest__fields[0],
UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -124,7 +124,7 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = {
};
const upb_MiniTable* envoy__service__discovery__v3__DiscoveryRequest_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryRequest_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryResponse__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr},
};
@@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryResponse__fi
};
const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = {
- &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0],
+ &envoy_service_discovery_v3_DiscoveryResponse__submsgs[0],
&envoy_service_discovery_v3_DiscoveryResponse__fields[0],
UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -158,7 +158,7 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init =
};
const upb_MiniTable* envoy__service__discovery__v3__DiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryResponse_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryRequest__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr},
@@ -179,7 +179,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest
};
const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init = {
- &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0],
+ &envoy_service_discovery_v3_DeltaDiscoveryRequest__submsgs[0],
&envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0],
UPB_SIZE(56, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -227,7 +227,7 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__Initia
};
const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryResponse__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init_ptr},
@@ -244,7 +244,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRespons
};
const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init = {
- &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0],
+ &envoy_service_discovery_v3_DeltaDiscoveryResponse__submsgs[0],
&envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0],
UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -271,7 +271,7 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_in
};
const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr},
@@ -286,7 +286,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst
};
const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_msg_init = {
- &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0],
+ &envoy_service_discovery_v3_DynamicParameterConstraints__submsgs[0],
&envoy_service_discovery_v3_DynamicParameterConstraints__fields[0],
UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -305,7 +305,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_m
};
const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr},
};
@@ -316,7 +316,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst
};
const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init = {
- &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0],
+ &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__submsgs[0],
&envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -341,7 +341,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__
};
const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr},
};
@@ -350,7 +350,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst
};
const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init = {
- &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0],
+ &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__submsgs[0],
&envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -363,7 +363,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__
};
const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init;
-static const upb_MiniTableSubInternal envoy_service_discovery_v3_Resource_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_service_discovery_v3_Resource__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource__CacheControl_msg_init_ptr},
@@ -383,7 +383,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_Resource__fields[8] =
};
const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = {
- &envoy_service_discovery_v3_Resource_submsgs[0],
+ &envoy_service_discovery_v3_Resource__submsgs[0],
&envoy_service_discovery_v3_Resource__fields[0],
UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
index 95a5c2f72e7ea..6f02a365931fc 100644
--- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -55,4 +55,4 @@ extern const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_fi
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
index fab8ea107d015..c30e6e2da9d00 100644
--- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_
-#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_
+#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_
+#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -335,4 +335,4 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_send_all_clust
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ */
+#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
index 08ef903046dad..ebbf9304303ac 100644
--- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsRequest__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsRequest__fi
};
const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = {
- &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0],
+ &envoy_service_load_stats_v3_LoadStatsRequest__submsgs[0],
&envoy_service_load_stats_v3_LoadStatsRequest__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -45,7 +45,7 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init =
};
const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsRequest_msg_init_ptr = &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init;
-static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsResponse__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -57,7 +57,7 @@ static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsResponse__f
};
const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init = {
- &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0],
+ &envoy_service_load_stats_v3_LoadStatsResponse__submsgs[0],
&envoy_service_load_stats_v3_LoadStatsResponse__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
index cdcb76f952619..4c348ad5bb760 100644
--- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
index 05c78f8dfc826..918680e050f68 100644
--- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_
-#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_
+#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_
+#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1000,4 +1000,4 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig* envoy_service_status_v3_
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ */
+#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
index b84e5136cc303..e348dfd002c71 100644
--- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c
@@ -23,7 +23,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusRequest_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusRequest__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__NodeMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
};
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientStatusRequest__fie
};
const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = {
- &envoy_service_status_v3_ClientStatusRequest_submsgs[0],
+ &envoy_service_status_v3_ClientStatusRequest__submsgs[0],
&envoy_service_status_v3_ClientStatusRequest__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -50,7 +50,7 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = {
};
const upb_MiniTable* envoy__service__status__v3__ClientStatusRequest_msg_init_ptr = &envoy__service__status__v3__ClientStatusRequest_msg_init;
-static const upb_MiniTableSubInternal envoy_service_status_v3_PerXdsConfig_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_service_status_v3_PerXdsConfig__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump_msg_init_ptr},
@@ -69,7 +69,7 @@ static const upb_MiniTableField envoy_service_status_v3_PerXdsConfig__fields[7]
};
const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = {
- &envoy_service_status_v3_PerXdsConfig_submsgs[0],
+ &envoy_service_status_v3_PerXdsConfig__submsgs[0],
&envoy_service_status_v3_PerXdsConfig__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -88,7 +88,7 @@ const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = {
};
const upb_MiniTable* envoy__service__status__v3__PerXdsConfig_msg_init_ptr = &envoy__service__status__v3__PerXdsConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__status__v3__PerXdsConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr},
@@ -102,7 +102,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientConfig__fields[4]
};
const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = {
- &envoy_service_status_v3_ClientConfig_submsgs[0],
+ &envoy_service_status_v3_ClientConfig__submsgs[0],
&envoy_service_status_v3_ClientConfig__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -121,7 +121,7 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = {
};
const upb_MiniTable* envoy__service__status__v3__ClientConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_GenericXdsConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr},
@@ -140,7 +140,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientConfig_GenericXdsC
};
const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init = {
- &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0],
+ &envoy_service_status_v3_ClientConfig_GenericXdsConfig__submsgs[0],
&envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0],
UPB_SIZE(64, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -167,7 +167,7 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_m
};
const upb_MiniTable* envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init;
-static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusResponse_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusResponse__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig_msg_init_ptr},
};
@@ -176,7 +176,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientStatusResponse__fi
};
const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = {
- &envoy_service_status_v3_ClientStatusResponse_submsgs[0],
+ &envoy_service_status_v3_ClientStatusResponse__submsgs[0],
&envoy_service_status_v3_ClientStatusResponse__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
index 07d360f42f7e5..295aa79282373 100644
--- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
index 179fbe3e289dc..9a69d53d8d6c7 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
-#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -135,4 +135,4 @@ UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *ms
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
index fd87b4de2f782..684c88f99998c 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_http_v3_Cookie_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_http_v3_Cookie__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_http_v3_Cookie__fields[3] = {
};
const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = {
- &envoy_type_http_v3_Cookie_submsgs[0],
+ &envoy_type_http_v3_Cookie__submsgs[0],
&envoy_type_http_v3_Cookie__fields[0],
UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
index 109b94018b40d..9967d424fab30 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
index 57c4f05a6d162..b12b94c859768 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_
-#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -325,4 +325,4 @@ UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_se
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
index 7197abbfd5c98..b02ffa8e518e0 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c
@@ -16,7 +16,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr},
};
@@ -25,7 +25,7 @@ static const upb_MiniTableField envoy_type_http_v3_PathTransformation__fields[1]
};
const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = {
- &envoy_type_http_v3_PathTransformation_submsgs[0],
+ &envoy_type_http_v3_PathTransformation__submsgs[0],
&envoy_type_http_v3_PathTransformation__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -38,7 +38,7 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = {
};
const upb_MiniTable* envoy__type__http__v3__PathTransformation_msg_init_ptr = &envoy__type__http__v3__PathTransformation_msg_init;
-static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_Operation__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_type_http_v3_PathTransformation_Operation_
};
const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init = {
- &envoy_type_http_v3_PathTransformation_Operation_submsgs[0],
+ &envoy_type_http_v3_PathTransformation_Operation__submsgs[0],
&envoy_type_http_v3_PathTransformation_Operation__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
index 27d742c58d166..bfbecd7fc5f08 100644
--- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
index f18ab285bf3ec..cc9cc6c227301 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -128,4 +128,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Fil
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
index f1f79d4e80ad3..e7d3bcb8c9fd4 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields
};
const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = {
- &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0],
+ &envoy_type_matcher_v3_FilterStateMatcher__submsgs[0],
&envoy_type_matcher_v3_FilterStateMatcher__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
index 9477a7b197887..41b739f7255df 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
index 5d8758b8f3ef9..1d4ca31fa912b 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -307,4 +307,4 @@ UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
index 99ec0f45fa7f8..4f2fb8b8b2e87 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
index 77ec26ba48ace..4a0fa175878ba 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -271,4 +271,4 @@ UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
index 4a15c4f545948..a3b6c30a615f4 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_MetadataMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher__fields[4]
};
const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = {
- &envoy_type_matcher_v3_MetadataMatcher_submsgs[0],
+ &envoy_type_matcher_v3_MetadataMatcher__submsgs[0],
&envoy_type_matcher_v3_MetadataMatcher__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
index a157502cb5530..1a6e95dfa0be2 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
index 7473342c82472..589937dd7e749 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -172,4 +172,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_Nod
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
index 25d9d598e72c2..6937c5a5befb9 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_NodeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_NodeMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_NodeMatcher__fields[2] = {
};
const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = {
- &envoy_type_matcher_v3_NodeMatcher_submsgs[0],
+ &envoy_type_matcher_v3_NodeMatcher__submsgs[0],
&envoy_type_matcher_v3_NodeMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
index 6fb41d5c650f0..a78af843e216d 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
index 7d9d0222dc6a0..020a0b57291e2 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -134,4 +134,4 @@ UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_exact(envoy_type_matcher
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
index 268878b1bc388..b8884e9e9fbc9 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_DoubleMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__DoubleRange_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_DoubleMatcher__fields[2] =
};
const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = {
- &envoy_type_matcher_v3_DoubleMatcher_submsgs[0],
+ &envoy_type_matcher_v3_DoubleMatcher__submsgs[0],
&envoy_type_matcher_v3_DoubleMatcher__fields[0],
24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
index 7190e62a9186c..9beadb3352628 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
index 66cd683ce00d2..a3ffdaa4f97bd 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -113,4 +113,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Pat
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
index 997691d98d0df..350f442ba6130 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_PathMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_PathMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_PathMatcher__fields[1] = {
};
const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = {
- &envoy_type_matcher_v3_PathMatcher_submsgs[0],
+ &envoy_type_matcher_v3_PathMatcher__submsgs[0],
&envoy_type_matcher_v3_PathMatcher__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
index 8a7d00590cfe7..2af9a3a7def5b 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
index b2faf366a57cf..646f41fa9e921 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -284,4 +284,4 @@ UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(e
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
index e99f0a58a07e5..bdd16a2c04df1 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher__fields[2] =
};
const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = {
- &envoy_type_matcher_v3_RegexMatcher_submsgs[0],
+ &envoy_type_matcher_v3_RegexMatcher__submsgs[0],
&envoy_type_matcher_v3_RegexMatcher__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -44,7 +44,7 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = {
};
const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_GoogleRE2__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -53,7 +53,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fi
};
const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = {
- &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0],
+ &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__submsgs[0],
&envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -62,7 +62,7 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init =
};
const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init;
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatchAndSubstitute__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr},
};
@@ -72,7 +72,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatchAndSubstitute__f
};
const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = {
- &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0],
+ &envoy_type_matcher_v3_RegexMatchAndSubstitute__submsgs[0],
&envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
index 2ac7b428ba68c..74dc218ed5a08 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
index 7985bdaa742f1..0d344feac6dec 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -109,4 +109,4 @@ UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_ser
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
index dc3f52e5079d3..bf7fafb5a14fc 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
index 00a059731ac26..3aa543af40178 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -352,4 +352,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Lis
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
index 9fe42b9767942..352fd5a331c43 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_StringMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_StringMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[7] =
};
const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = {
- &envoy_type_matcher_v3_StringMatcher_submsgs[0],
+ &envoy_type_matcher_v3_StringMatcher__submsgs[0],
&envoy_type_matcher_v3_StringMatcher__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -62,7 +62,7 @@ const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = {
};
const upb_MiniTable* envoy__type__matcher__v3__StringMatcher_msg_init_ptr = &envoy__type__matcher__v3__StringMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListStringMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -71,7 +71,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ListStringMatcher__fields[
};
const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = {
- &envoy_type_matcher_v3_ListStringMatcher_submsgs[0],
+ &envoy_type_matcher_v3_ListStringMatcher__submsgs[0],
&envoy_type_matcher_v3_ListStringMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
index 2a931f65844b8..0662b98e543dd 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
index 75f10611b7991..97b5447431647 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -239,4 +239,4 @@ UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_ty
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
index 64ddc3a702014..17ee3b42530a1 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_StructMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_StructMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher__fields[2] =
};
const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = {
- &envoy_type_matcher_v3_StructMatcher_submsgs[0],
+ &envoy_type_matcher_v3_StructMatcher__submsgs[0],
&envoy_type_matcher_v3_StructMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
index e5e0662466198..fad11d86c99aa 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
index d68504fe09a4c..2870e8bfaab44 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_
-#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -504,4 +504,4 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_OrMa
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
index a6e3b476ecc9f..eb0ab75956887 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_ValueMatcher_submsgs[5] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_ValueMatcher__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__DoubleMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr},
@@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ValueMatcher__fields[7] =
};
const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = {
- &envoy_type_matcher_v3_ValueMatcher_submsgs[0],
+ &envoy_type_matcher_v3_ValueMatcher__submsgs[0],
&envoy_type_matcher_v3_ValueMatcher__fields[0],
UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -67,7 +67,7 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init =
};
const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init;
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr},
};
@@ -76,7 +76,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ListMatcher__fields[1] = {
};
const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = {
- &envoy_type_matcher_v3_ListMatcher_submsgs[0],
+ &envoy_type_matcher_v3_ListMatcher__submsgs[0],
&envoy_type_matcher_v3_ListMatcher__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -89,7 +89,7 @@ const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = {
};
const upb_MiniTable* envoy__type__matcher__v3__ListMatcher_msg_init_ptr = &envoy__type__matcher__v3__ListMatcher_msg_init;
-static const upb_MiniTableSubInternal envoy_type_matcher_v3_OrMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_matcher_v3_OrMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr},
};
@@ -98,7 +98,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_OrMatcher__fields[1] = {
};
const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init = {
- &envoy_type_matcher_v3_OrMatcher_submsgs[0],
+ &envoy_type_matcher_v3_OrMatcher__submsgs[0],
&envoy_type_matcher_v3_OrMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
index c20dc81a36b9c..275d3b182d97e 100644
--- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
index b5da11c4d5f3d..03f3a934d4e97 100644
--- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
-#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -550,4 +550,4 @@ UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize_ex(const env
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
index 5e474bd440311..b605498b344f8 100644
--- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKey_submsgs[1] = {
+static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKey__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey__fields[2] =
};
const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = {
- &envoy_type_metadata_v3_MetadataKey_submsgs[0],
+ &envoy_type_metadata_v3_MetadataKey__submsgs[0],
&envoy_type_metadata_v3_MetadataKey__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -60,7 +60,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init
};
const upb_MiniTable* envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init;
-static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKind_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKind__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Request_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Route_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init_ptr},
@@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_type_metadata_v3_MetadataKind__fields[4] =
};
const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = {
- &envoy_type_metadata_v3_MetadataKind_submsgs[0],
+ &envoy_type_metadata_v3_MetadataKind__submsgs[0],
&envoy_type_metadata_v3_MetadataKind__fields[0],
UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
index 2d4785965833e..cae6700d0612a 100644
--- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
index 93f025325e127..62729ecc46ef8 100644
--- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_
-#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -535,4 +535,4 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_default_value(envoy
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
index c84c1071af975..52331fe1459d0 100644
--- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_submsgs[4] = {
+static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Literal_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Environment_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr},
@@ -34,7 +34,7 @@ static const upb_MiniTableField envoy_type_tracing_v3_CustomTag__fields[5] = {
};
const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = {
- &envoy_type_tracing_v3_CustomTag_submsgs[0],
+ &envoy_type_tracing_v3_CustomTag__submsgs[0],
&envoy_type_tracing_v3_CustomTag__fields[0],
UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -113,7 +113,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = {
};
const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Header_msg_init;
-static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_Metadata__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr},
};
@@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Metadata__fields
};
const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init = {
- &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0],
+ &envoy_type_tracing_v3_CustomTag_Metadata__submsgs[0],
&envoy_type_tracing_v3_CustomTag_Metadata__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
index bb56ee9735db4..a80c1cf93f2a0 100644
--- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
index ca2c40ea3a036..ec2e04dfebbdc 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -236,4 +236,4 @@ UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_set_key(envoy_type_v3_HashP
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
index 1b4ab885248a3..d6c62c6fca918 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_v3_HashPolicy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_v3_HashPolicy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__SourceIp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__FilterState_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_v3_HashPolicy__fields[2] = {
};
const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = {
- &envoy_type_v3_HashPolicy_submsgs[0],
+ &envoy_type_v3_HashPolicy__submsgs[0],
&envoy_type_v3_HashPolicy__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
index ef433125279bb..55fb17bddde5b 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h
index 5c8d0035b62ae..919a87fbc75cf 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -36,4 +36,4 @@ typedef enum {
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
index a08e816387da0..4aa73bc6b438b 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -27,4 +27,4 @@ extern const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
index 99c392180e2e3..50ee61cdd76f3 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -148,4 +148,4 @@ UPB_INLINE void envoy_type_v3_HttpStatus_set_code(envoy_type_v3_HttpStatus *msg,
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
index 8f71d7e316332..616cb5fc40a9f 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
index 6d211675c931a..47d15c5080811 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -165,4 +165,4 @@ UPB_INLINE void envoy_type_v3_FractionalPercent_set_denominator(envoy_type_v3_Fr
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
index b9eb6640fadca..f66618c9636d9 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h
index 78fc3a58317d0..bb5451e67005d 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -245,4 +245,4 @@ UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
index 006971ebc2dac..4ef1ad441e5c3 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
index 060177c296db3..e97c8a42283fa 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -242,4 +242,4 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_time_uni
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
index 7a4ff32fd9c91..ff9a468edcebc 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_v3_RateLimitStrategy_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_v3_RateLimitStrategy__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &envoy__type__v3__TokenBucket_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_v3_RateLimitStrategy__fields[3] = {
};
const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = {
- &envoy_type_v3_RateLimitStrategy_submsgs[0],
+ &envoy_type_v3_RateLimitStrategy__submsgs[0],
&envoy_type_v3_RateLimitStrategy__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
index 6d696d1ce8c1e..8a8432cce7d4f 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
index 0e03ae6472533..af5bdfc242384 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -40,4 +40,4 @@ typedef enum {
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
index 1a76472912511..57963d0f26ac0 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -27,4 +27,4 @@ extern const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
index f472ac3a66e93..d244b3beac1bc 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -119,4 +119,4 @@ UPB_INLINE void envoy_type_v3_SemanticVersion_set_patch(envoy_type_v3_SemanticVe
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
index 6611d2e608c1c..5a0dfcf902917 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
index 86fb062011222..c14d534b93b50 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_
-#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_
+#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_
+#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -152,4 +152,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_type_v3_TokenBucket_mutable_fi
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ */
+#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
index 4ee1428130d05..af5fd21419e99 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal envoy_type_v3_TokenBucket_submsgs[2] = {
+static const upb_MiniTableSubInternal envoy_type_v3_TokenBucket__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_v3_TokenBucket__fields[3] = {
};
const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = {
- &envoy_type_v3_TokenBucket_submsgs[0],
+ &envoy_type_v3_TokenBucket__submsgs[0],
&envoy_type_v3_TokenBucket__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
index 20a72de42c3be..1ef0eb7e82e5d 100644
--- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_
-#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_
+#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_
+#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ */
+#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/annotations.upb.h b/src/core/ext/upb-gen/google/api/annotations.upb.h
index 5130ecc66da66..dee07c6469fbe 100644
--- a/src/core/ext/upb-gen/google/api/annotations.upb.h
+++ b/src/core/ext/upb-gen/google/api/annotations.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_
-#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_
+#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_
+#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -36,7 +36,7 @@ UPB_INLINE const struct google_api_HttpRule* google_api_http(const struct google
const upb_MiniTableExtension* ext = &google_api_http_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const struct google_api_HttpRule* default_val = NULL;
const struct google_api_HttpRule* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -46,7 +46,7 @@ UPB_INLINE void google_api_set_http(struct google_protobuf_MethodOptions* msg, c
const upb_MiniTableExtension* ext = &google_api_http_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -65,4 +65,4 @@ UPB_INLINE struct google_api_HttpRule* google_api_mutable_http(struct google_pro
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ */
+#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
index fc0e3d6e67b5f..aa3a4acedb38c 100644
--- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c
@@ -18,7 +18,7 @@
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension google_api_http_ext = {
- {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MethodOptions_msg_init,
{.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init},
diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
index 101b37d51eaec..c971809faa480 100644
--- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -28,4 +28,4 @@ extern const upb_MiniTableFile google_api_annotations_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
index 8a1b0be2fd1b9..0109d925b0d19 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1896,4 +1896,4 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Re
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
index 5cc51080242b5..98a424fb85fd7 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
@@ -33,7 +33,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[5]
};
const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = {
- &google_api_expr_v1alpha1_CheckedExpr_submsgs[0],
+ &google_api_expr_v1alpha1_CheckedExpr__submsgs[0],
&google_api_expr_v1alpha1_CheckedExpr__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -52,7 +52,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Reference_msg_init_ptr},
};
@@ -62,7 +62,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_ReferenceMa
};
const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init = {
- &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0],
+ &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__submsgs[0],
&google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -75,7 +75,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_
};
const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -85,7 +85,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_TypeMapEntr
};
const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init = {
- &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0],
+ &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__submsgs[0],
&google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -98,7 +98,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_i
};
const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_submsgs[7] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__ListType_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__MapType_msg_init_ptr},
@@ -125,7 +125,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type__fields[13] = {
};
const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = {
- &google_api_expr_v1alpha1_Type_submsgs[0],
+ &google_api_expr_v1alpha1_Type__submsgs[0],
&google_api_expr_v1alpha1_Type__fields[0],
UPB_SIZE(24, 32), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -152,7 +152,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Type_msg_init_ptr = &google__api__expr__v1alpha1__Type_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_ListType_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_ListType__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -161,7 +161,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_ListType__fields[1
};
const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = {
- &google_api_expr_v1alpha1_Type_ListType_submsgs[0],
+ &google_api_expr_v1alpha1_Type_ListType__submsgs[0],
&google_api_expr_v1alpha1_Type_ListType__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -170,7 +170,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Type__ListType_msg_init_ptr = &google__api__expr__v1alpha1__Type__ListType_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_MapType_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_MapType__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -181,7 +181,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_MapType__fields[2]
};
const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = {
- &google_api_expr_v1alpha1_Type_MapType_submsgs[0],
+ &google_api_expr_v1alpha1_Type_MapType__submsgs[0],
&google_api_expr_v1alpha1_Type_MapType__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -190,7 +190,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Type__MapType_msg_init_ptr = &google__api__expr__v1alpha1__Type__MapType_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_FunctionType__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -201,7 +201,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_FunctionType__fiel
};
const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = {
- &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0],
+ &google_api_expr_v1alpha1_Type_FunctionType__submsgs[0],
&google_api_expr_v1alpha1_Type_FunctionType__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -216,7 +216,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Type__FunctionType_msg_init_ptr = &google__api__expr__v1alpha1__Type__FunctionType_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_AbstractType__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -226,7 +226,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_AbstractType__fiel
};
const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = {
- &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0],
+ &google_api_expr_v1alpha1_Type_AbstractType__submsgs[0],
&google_api_expr_v1alpha1_Type_AbstractType__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -241,7 +241,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Type__AbstractType_msg_init_ptr = &google__api__expr__v1alpha1__Type__AbstractType_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr},
};
@@ -253,7 +253,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl__fields[3] = {
};
const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = {
- &google_api_expr_v1alpha1_Decl_submsgs[0],
+ &google_api_expr_v1alpha1_Decl__submsgs[0],
&google_api_expr_v1alpha1_Decl__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -268,7 +268,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Decl_msg_init_ptr = &google__api__expr__v1alpha1__Decl_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_IdentDecl__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr},
};
@@ -280,7 +280,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_IdentDecl__fields[
};
const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = {
- &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0],
+ &google_api_expr_v1alpha1_Decl_IdentDecl__submsgs[0],
&google_api_expr_v1alpha1_Decl_IdentDecl__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -295,7 +295,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr},
};
@@ -304,7 +304,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl__fiel
};
const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = {
- &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0],
+ &google_api_expr_v1alpha1_Decl_FunctionDecl__submsgs[0],
&google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -317,7 +317,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr},
};
@@ -332,7 +332,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl_Overl
};
const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init = {
- &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0],
+ &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__submsgs[0],
&google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_ms
};
const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Reference_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Reference__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr},
};
@@ -362,7 +362,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Reference__fields[3] =
};
const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = {
- &google_api_expr_v1alpha1_Reference_submsgs[0],
+ &google_api_expr_v1alpha1_Reference__submsgs[0],
&google_api_expr_v1alpha1_Reference__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
index b99fbb20744b4..fba0e3d05033d 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -53,4 +53,4 @@ extern const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_l
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
index c27267eb43bb1..b2999deef6b9a 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -2354,4 +2354,4 @@ UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_column(google_api_ex
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
index 7f4d6951b2995..a2426af257d23 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_ParsedExpr__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init_ptr},
};
@@ -28,7 +28,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_ParsedExpr__fields[2] =
};
const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = {
- &google_api_expr_v1alpha1_ParsedExpr_submsgs[0],
+ &google_api_expr_v1alpha1_ParsedExpr__submsgs[0],
&google_api_expr_v1alpha1_ParsedExpr__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -37,7 +37,7 @@ const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr = &google__api__expr__v1alpha1__ParsedExpr_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_submsgs[7] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Select_msg_init_ptr},
@@ -59,7 +59,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr__fields[8] = {
};
const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = {
- &google_api_expr_v1alpha1_Expr_submsgs[0],
+ &google_api_expr_v1alpha1_Expr__submsgs[0],
&google_api_expr_v1alpha1_Expr__fields[0],
UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -104,7 +104,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Ident_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Select_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Select__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
};
@@ -115,7 +115,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Select__fields[3]
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = {
- &google_api_expr_v1alpha1_Expr_Select_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_Select__submsgs[0],
&google_api_expr_v1alpha1_Expr_Select__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -130,7 +130,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__Select_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Select_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Call_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Call__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
};
@@ -142,7 +142,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Call__fields[3] =
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = {
- &google_api_expr_v1alpha1_Expr_Call_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_Call__submsgs[0],
&google_api_expr_v1alpha1_Expr_Call__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -157,7 +157,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__Call_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Call_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
};
@@ -167,7 +167,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = {
- &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_CreateList__submsgs[0],
&google_api_expr_v1alpha1_Expr_CreateList__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -182,7 +182,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateList_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateList_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr},
};
@@ -192,7 +192,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct__fiel
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = {
- &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_CreateStruct__submsgs[0],
&google_api_expr_v1alpha1_Expr_CreateStruct__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -207,7 +207,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_Entry__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
};
@@ -221,7 +221,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init = {
- &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__submsgs[0],
&google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0],
UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -240,7 +240,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_i
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Comprehension__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
@@ -260,7 +260,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fie
};
const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = {
- &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0],
+ &google_api_expr_v1alpha1_Expr_Comprehension__submsgs[0],
&google_api_expr_v1alpha1_Expr_Comprehension__fields[0],
UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -287,7 +287,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init =
};
const upb_MiniTable* google__api__expr__v1alpha1__Expr__Comprehension_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Constant_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Constant__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
};
@@ -305,7 +305,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Constant__fields[9] = {
};
const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = {
- &google_api_expr_v1alpha1_Constant_submsgs[0],
+ &google_api_expr_v1alpha1_Constant__submsgs[0],
&google_api_expr_v1alpha1_Constant__fields[0],
UPB_SIZE(24, 32), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -332,7 +332,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__Constant_msg_init_ptr = &google__api__expr__v1alpha1__Constant_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_submsgs[3] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init_ptr},
@@ -348,7 +348,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[6] =
};
const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = {
- &google_api_expr_v1alpha1_SourceInfo_submsgs[0],
+ &google_api_expr_v1alpha1_SourceInfo__submsgs[0],
&google_api_expr_v1alpha1_SourceInfo__fields[0],
UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -367,7 +367,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = {
};
const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_Extension__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init_ptr},
};
@@ -378,7 +378,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_Extension__f
};
const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init = {
- &google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[0],
+ &google_api_expr_v1alpha1_SourceInfo_Extension__submsgs[0],
&google_api_expr_v1alpha1_SourceInfo_Extension__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -435,7 +435,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_
};
const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init;
-static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr},
};
@@ -445,7 +445,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_MacroCallsEn
};
const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init = {
- &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0],
+ &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__submsgs[0],
&google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
index 42ea21320835e..ec8b6455e9bb0 100644
--- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -59,4 +59,4 @@ extern const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/http.upb.h b/src/core/ext/upb-gen/google/api/http.upb.h
index 594336aac3724..206e8c39d8e9e 100644
--- a/src/core/ext/upb-gen/google/api/http.upb.h
+++ b/src/core/ext/upb-gen/google/api/http.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTP_PROTO_UPB_H_
-#define GOOGLE_API_HTTP_PROTO_UPB_H_
+#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_
+#define GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/api/http.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -520,4 +521,4 @@ UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPatte
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTP_PROTO_UPB_H_ */
+#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.c b/src/core/ext/upb-gen/google/api/http.upb_minitable.c
index 7c56734b00bd6..b4713538bf244 100644
--- a/src/core/ext/upb-gen/google/api/http.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_api_Http_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_Http__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr},
};
@@ -24,7 +24,7 @@ static const upb_MiniTableField google_api_Http__fields[2] = {
};
const upb_MiniTable google__api__Http_msg_init = {
- &google_api_Http_submsgs[0],
+ &google_api_Http__submsgs[0],
&google_api_Http__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable google__api__Http_msg_init = {
};
const upb_MiniTable* google__api__Http_msg_init_ptr = &google__api__Http_msg_init;
-static const upb_MiniTableSubInternal google_api_HttpRule_submsgs[2] = {
+static const upb_MiniTableSubInternal google_api_HttpRule__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__CustomHttpPattern_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr},
};
@@ -58,7 +58,7 @@ static const upb_MiniTableField google_api_HttpRule__fields[10] = {
};
const upb_MiniTable google__api__HttpRule_msg_init = {
- &google_api_HttpRule_submsgs[0],
+ &google_api_HttpRule__submsgs[0],
&google_api_HttpRule__fields[0],
UPB_SIZE(48, 88), 10, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.h b/src/core/ext/upb-gen/google/api/http.upb_minitable.h
index 3df86fbdd9bf1..425f1e8e764b8 100644
--- a/src/core/ext/upb-gen/google/api/http.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile google_api_http_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb.h b/src/core/ext/upb-gen/google/api/httpbody.upb.h
index a3b257a7c98dd..0b90cb7166481 100644
--- a/src/core/ext/upb-gen/google/api/httpbody.upb.h
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H_
-#define GOOGLE_API_HTTPBODY_PROTO_UPB_H_
+#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_
+#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -170,4 +170,4 @@ UPB_INLINE struct google_protobuf_Any* google_api_HttpBody_add_extensions(google
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H_ */
+#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
index e30cbbcd47735..6ec907dc2b634 100644
--- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_api_HttpBody_submsgs[1] = {
+static const upb_MiniTableSubInternal google_api_HttpBody__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField google_api_HttpBody__fields[3] = {
};
const upb_MiniTable google__api__HttpBody_msg_init = {
- &google_api_HttpBody_submsgs[0],
+ &google_api_HttpBody__submsgs[0],
&google_api_HttpBody__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
index abd05f43c5463..01f1f61d2949b 100644
--- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb.h b/src/core/ext/upb-gen/google/protobuf/any.upb.h
index c41272123ac5e..39832c3f4f6fb 100644
--- a/src/core/ext/upb-gen/google/protobuf/any.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/any.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/any.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Any_set_value(google_protobuf_Any *msg, upb_Stri
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
index 77fecd2617dc0..26fad8894bb2f 100644
--- a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
index af260e7acf760..736f42fe5a9d1 100644
--- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/descriptor.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -6893,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
index 08fa451f750f4..f641f657d63f4 100644
--- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr},
};
@@ -23,9 +23,9 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
};
const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
- &google_protobuf_FileDescriptorSet_submsgs[0],
+ &google_protobuf_FileDescriptorSet__submsgs[0],
&google_protobuf_FileDescriptorSet__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.FileDescriptorSet",
#endif
@@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
@@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13]
};
const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
- &google_protobuf_FileDescriptorProto_submsgs[0],
+ &google_protobuf_FileDescriptorProto__submsgs[0],
&google_protobuf_FileDescriptorProto__fields[0],
UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
@@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
};
const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
- &google_protobuf_DescriptorProto_submsgs[0],
+ &google_protobuf_DescriptorProto__submsgs[0],
&google_protobuf_DescriptorProto__fields[0],
UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr},
};
@@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__
};
const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = {
- &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+ &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0],
&google_protobuf_DescriptorProto_ExtensionRange__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init =
};
const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init},
};
static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
@@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4]
};
const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = {
- &google_protobuf_ExtensionRangeOptions_submsgs[0],
+ &google_protobuf_ExtensionRangeOptions__submsgs[0],
&google_protobuf_ExtensionRangeOptions__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini
};
const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
@@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11]
};
const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
- &google_protobuf_FieldDescriptorProto_submsgs[0],
+ &google_protobuf_FieldDescriptorProto__submsgs[0],
&google_protobuf_FieldDescriptorProto__fields[0],
UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr},
};
@@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2]
};
const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
- &google_protobuf_OneofDescriptorProto_submsgs[0],
+ &google_protobuf_OneofDescriptorProto__submsgs[0],
&google_protobuf_OneofDescriptorProto__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr},
@@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] =
};
const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
- &google_protobuf_EnumDescriptorProto_submsgs[0],
+ &google_protobuf_EnumDescriptorProto__submsgs[0],
&google_protobuf_EnumDescriptorProto__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg
};
const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr},
};
@@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields
};
const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
- &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+ &google_protobuf_EnumValueDescriptorProto__submsgs[0],
&google_protobuf_EnumValueDescriptorProto__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr},
};
@@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3
};
const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
- &google_protobuf_ServiceDescriptorProto_submsgs[0],
+ &google_protobuf_ServiceDescriptorProto__submsgs[0],
&google_protobuf_ServiceDescriptorProto__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr},
};
@@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6]
};
const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
- &google_protobuf_MethodDescriptorProto_submsgs[0],
+ &google_protobuf_MethodDescriptorProto__submsgs[0],
&google_protobuf_MethodDescriptorProto__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init},
};
static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
@@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
};
const upb_MiniTable google__protobuf__FileOptions_msg_init = {
- &google_protobuf_FileOptions_submsgs[0],
+ &google_protobuf_FileOptions__submsgs[0],
&google_protobuf_FileOptions__fields[0],
UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
};
const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
- &google_protobuf_MessageOptions_submsgs[0],
+ &google_protobuf_MessageOptions__submsgs[0],
&google_protobuf_MessageOptions__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
@@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
};
const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
- &google_protobuf_FieldOptions_submsgs[0],
+ &google_protobuf_FieldOptions__submsgs[0],
&google_protobuf_FieldOptions__fields[0],
UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
@@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie
};
const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
- &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+ &google_protobuf_FieldOptions_EditionDefault__submsgs[0],
&google_protobuf_FieldOptions_EditionDefault__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = {
@@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie
};
const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
- &google_protobuf_FieldOptions_FeatureSupport_submsgs[0],
+ &google_protobuf_FieldOptions_FeatureSupport__submsgs[0],
&google_protobuf_FieldOptions_FeatureSupport__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
};
const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
- &google_protobuf_OneofOptions_submsgs[0],
+ &google_protobuf_OneofOptions__submsgs[0],
&google_protobuf_OneofOptions__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
- &google_protobuf_EnumOptions_submsgs[0],
+ &google_protobuf_EnumOptions__submsgs[0],
&google_protobuf_EnumOptions__fields[0],
UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
@@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
- &google_protobuf_EnumValueOptions_submsgs[0],
+ &google_protobuf_EnumValueOptions__submsgs[0],
&google_protobuf_EnumValueOptions__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
};
const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
- &google_protobuf_ServiceOptions_submsgs[0],
+ &google_protobuf_ServiceOptions__submsgs[0],
&google_protobuf_ServiceOptions__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init},
};
static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
@@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
};
const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
- &google_protobuf_MethodOptions_submsgs[0],
+ &google_protobuf_MethodOptions__submsgs[0],
&google_protobuf_MethodOptions__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr},
};
@@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] =
};
const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = {
- &google_protobuf_UninterpretedOption_submsgs[0],
+ &google_protobuf_UninterpretedOption__submsgs[0],
&google_protobuf_UninterpretedOption__fields[0],
UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = {
};
const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
@@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
};
const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
- &google_protobuf_FeatureSet_submsgs[0],
+ &google_protobuf_FeatureSet__submsgs[0],
&google_protobuf_FeatureSet__fields[0],
40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = {
@@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] =
};
const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
- &google_protobuf_FeatureSetDefaults_submsgs[0],
+ &google_protobuf_FeatureSetDefaults__submsgs[0],
&google_protobuf_FeatureSetDefaults__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = {
@@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi
};
const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = {
- &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+ &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0],
&google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr},
};
@@ -1079,9 +1079,9 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = {
- &google_protobuf_SourceCodeInfo_submsgs[0],
+ &google_protobuf_SourceCodeInfo__submsgs[0],
&google_protobuf_SourceCodeInfo__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.SourceCodeInfo",
#endif
@@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = {
};
const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr},
};
@@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
- &google_protobuf_GeneratedCodeInfo_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo__submsgs[0],
&google_protobuf_GeneratedCodeInfo__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init},
};
static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
@@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
- &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0],
&google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
-const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
64,
9,
{
@@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = {
64,
0,
{
@@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = {
64,
0,
{
@@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = {
64,
0,
{
@@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = {
64,
0,
{
@@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = {
64,
0,
{
@@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = {
64,
0,
{
@@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = {
64,
0,
{
@@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = {
64,
0,
{
@@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = {
64,
0,
{
@@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = {
64,
0,
{
@@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = {
64,
0,
{
@@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = {
64,
0,
{
@@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init =
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = {
64,
0,
{
@@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init
},
};
-const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = {
64,
0,
{
@@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = {
64,
0,
{
@@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en
},
};
-const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = {
64,
0,
{
@@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = {
};
static const upb_MiniTableEnum *enums_layout[17] = {
- &google_protobuf_Edition_enum_init,
- &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
- &google_protobuf_FeatureSet_EnumType_enum_init,
- &google_protobuf_FeatureSet_FieldPresence_enum_init,
- &google_protobuf_FeatureSet_JsonFormat_enum_init,
- &google_protobuf_FeatureSet_MessageEncoding_enum_init,
- &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
- &google_protobuf_FeatureSet_Utf8Validation_enum_init,
- &google_protobuf_FieldDescriptorProto_Label_enum_init,
- &google_protobuf_FieldDescriptorProto_Type_enum_init,
- &google_protobuf_FieldOptions_CType_enum_init,
- &google_protobuf_FieldOptions_JSType_enum_init,
- &google_protobuf_FieldOptions_OptionRetention_enum_init,
- &google_protobuf_FieldOptions_OptionTargetType_enum_init,
- &google_protobuf_FileOptions_OptimizeMode_enum_init,
- &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
- &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+ &google__protobuf__Edition_enum_init,
+ &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init,
+ &google__protobuf__FeatureSet__EnumType_enum_init,
+ &google__protobuf__FeatureSet__FieldPresence_enum_init,
+ &google__protobuf__FeatureSet__JsonFormat_enum_init,
+ &google__protobuf__FeatureSet__MessageEncoding_enum_init,
+ &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init,
+ &google__protobuf__FeatureSet__Utf8Validation_enum_init,
+ &google__protobuf__FieldDescriptorProto__Label_enum_init,
+ &google__protobuf__FieldDescriptorProto__Type_enum_init,
+ &google__protobuf__FieldOptions__CType_enum_init,
+ &google__protobuf__FieldOptions__JSType_enum_init,
+ &google__protobuf__FieldOptions__OptionRetention_enum_init,
+ &google__protobuf__FieldOptions__OptionTargetType_enum_init,
+ &google__protobuf__FileOptions__OptimizeMode_enum_init,
+ &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init,
+ &google__protobuf__MethodOptions__IdempotencyLevel_enum_init,
};
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
index 6cb83ecedcc06..1dea594faf25a 100644
--- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr;
extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr;
-extern const upb_MiniTableEnum google_protobuf_Edition_enum_init;
-extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
-extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
-extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
+extern const upb_MiniTableEnum google__protobuf__Edition_enum_init;
+extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init;
+extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init;
+extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init;
extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#ifdef __cplusplus
@@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb.h b/src/core/ext/upb-gen/google/protobuf/duration.upb.h
index 5e00870776104..833d1e43f8013 100644
--- a/src/core/ext/upb-gen/google/protobuf/duration.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/duration.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/duration.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Duration_set_nanos(google_protobuf_Duration *msg
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
index c42e329b8ca14..71b996916732f 100644
--- a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb.h b/src/core/ext/upb-gen/google/protobuf/empty.upb.h
index 04b07d5fbeca6..74a5742abe073 100644
--- a/src/core/ext/upb-gen/google/protobuf/empty.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/empty.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/empty.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -68,4 +69,4 @@ UPB_INLINE char* google_protobuf_Empty_serialize_ex(const google_protobuf_Empty*
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
index d8fbbf178b2f3..91c08190fd1ab 100644
--- a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb.h b/src/core/ext/upb-gen/google/protobuf/struct.upb.h
index 3db6323079c01..d489dd53e4869 100644
--- a/src/core/ext/upb-gen/google/protobuf/struct.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/struct.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -459,4 +460,4 @@ UPB_INLINE struct google_protobuf_Value* google_protobuf_ListValue_add_values(go
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
index 73f4fcb849c44..27b277cd2a64e 100644
--- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_protobuf_Struct_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_Struct__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct__FieldsEntry_msg_init_ptr},
};
@@ -23,7 +23,7 @@ static const upb_MiniTableField google_protobuf_Struct__fields[1] = {
};
const upb_MiniTable google__protobuf__Struct_msg_init = {
- &google_protobuf_Struct_submsgs[0],
+ &google_protobuf_Struct__submsgs[0],
&google_protobuf_Struct__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -32,7 +32,7 @@ const upb_MiniTable google__protobuf__Struct_msg_init = {
};
const upb_MiniTable* google__protobuf__Struct_msg_init_ptr = &google__protobuf__Struct_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_Struct_FieldsEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_Struct_FieldsEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr},
};
@@ -42,7 +42,7 @@ static const upb_MiniTableField google_protobuf_Struct_FieldsEntry__fields[2] =
};
const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = {
- &google_protobuf_Struct_FieldsEntry_submsgs[0],
+ &google_protobuf_Struct_FieldsEntry__submsgs[0],
&google_protobuf_Struct_FieldsEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -55,7 +55,7 @@ const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = {
};
const upb_MiniTable* google__protobuf__Struct__FieldsEntry_msg_init_ptr = &google__protobuf__Struct__FieldsEntry_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_Value_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_Value__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ListValue_msg_init_ptr},
};
@@ -70,7 +70,7 @@ static const upb_MiniTableField google_protobuf_Value__fields[6] = {
};
const upb_MiniTable google__protobuf__Value_msg_init = {
- &google_protobuf_Value_submsgs[0],
+ &google_protobuf_Value__submsgs[0],
&google_protobuf_Value__fields[0],
UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -89,7 +89,7 @@ const upb_MiniTable google__protobuf__Value_msg_init = {
};
const upb_MiniTable* google__protobuf__Value_msg_init_ptr = &google__protobuf__Value_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ListValue_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_ListValue__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr},
};
@@ -98,7 +98,7 @@ static const upb_MiniTableField google_protobuf_ListValue__fields[1] = {
};
const upb_MiniTable google__protobuf__ListValue_msg_init = {
- &google_protobuf_ListValue_submsgs[0],
+ &google_protobuf_ListValue__submsgs[0],
&google_protobuf_ListValue__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
index 36250455eb6d9..d2daacbb21a0c 100644
--- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
index 9a60829884a34..0be35d0f10520 100644
--- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/timestamp.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Timestamp_set_nanos(google_protobuf_Timestamp *m
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
index cf8d215353455..d3dbafc2186ee 100644
--- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
index 3c2e586c39f70..202196ca49597 100644
--- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
+++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/wrappers.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -524,4 +525,4 @@ UPB_INLINE void google_protobuf_BytesValue_set_value(google_protobuf_BytesValue
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
index ec2393e765fb2..50dfd9c1d18b4 100644
--- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -45,4 +45,4 @@ extern const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb.h b/src/core/ext/upb-gen/google/rpc/status.upb.h
index c2dcbbb9143ed..6eaed09fbf27f 100644
--- a/src/core/ext/upb-gen/google/rpc/status.upb.h
+++ b/src/core/ext/upb-gen/google/rpc/status.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_
-#define GOOGLE_RPC_STATUS_PROTO_UPB_H_
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_
+#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -170,4 +170,4 @@ UPB_INLINE struct google_protobuf_Any* google_rpc_Status_add_details(google_rpc_
#include "upb/port/undef.inc"
-#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H_ */
+#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
index 120c6efd79aa6..97569391a089e 100644
--- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
+++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_rpc_Status_submsgs[1] = {
+static const upb_MiniTableSubInternal google_rpc_Status__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField google_rpc_Status__fields[3] = {
};
const upb_MiniTable google__rpc__Status_msg_init = {
- &google_rpc_Status_submsgs[0],
+ &google_rpc_Status__submsgs[0],
&google_rpc_Status__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
index c9ef7fabab0ce..94a67935c152e 100644
--- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
+++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_rpc_status_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
index 3c91e2f51007d..2893dfcc32d42 100644
--- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_
-#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_
+#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_
+#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "opencensus/proto/trace/v1/trace_config.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -404,4 +405,4 @@ UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_set_qps(opencensus
#include "upb/port/undef.inc"
-#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ */
+#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
index 3b3d303cea005..83b8c03e84094 100644
--- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal opencensus_proto_trace_v1_TraceConfig_submsgs[3] = {
+static const upb_MiniTableSubInternal opencensus_proto_trace_v1_TraceConfig__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ConstantSampler_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init_ptr},
@@ -31,7 +31,7 @@ static const upb_MiniTableField opencensus_proto_trace_v1_TraceConfig__fields[7]
};
const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = {
- &opencensus_proto_trace_v1_TraceConfig_submsgs[0],
+ &opencensus_proto_trace_v1_TraceConfig__submsgs[0],
&opencensus_proto_trace_v1_TraceConfig__fields[0],
UPB_SIZE(48, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
index 8e60a1cdbe5b8..69ffca599af62 100644
--- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_
-#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_
#include "upb/port/undef.inc"
-#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
index 0ada618921fd2..9ce9704e0cea8 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -259,4 +259,4 @@ UPB_INLINE void grpc_gcp_AltsContext_PeerAttributesEntry_set_value(grpc_gcp_Alts
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
index 16e44fdd395cf..9fdd5fc1f73fb 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal grpc_gcp_AltsContext_submsgs[2] = {
+static const upb_MiniTableSubInternal grpc_gcp_AltsContext__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init_ptr},
};
@@ -31,7 +31,7 @@ static const upb_MiniTableField grpc_gcp_AltsContext__fields[7] = {
};
const upb_MiniTable grpc__gcp__AltsContext_msg_init = {
- &grpc_gcp_AltsContext_submsgs[0],
+ &grpc_gcp_AltsContext__submsgs[0],
&grpc_gcp_AltsContext__fields[0],
UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
index 67da05b424c5e..5284f20fa876a 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_lay
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
index 43d5aef231932..9d3e7836f786c 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1773,4 +1773,4 @@ UPB_INLINE struct grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_mutable_sta
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
index 634ea9bbf63a8..86dd0fc1be4fe 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
@@ -37,7 +37,7 @@ const upb_MiniTable grpc__gcp__Endpoint_msg_init = {
};
const upb_MiniTable* grpc__gcp__Endpoint_msg_init_ptr = &grpc__gcp__Endpoint_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_Identity_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_gcp_Identity__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity__AttributesEntry_msg_init_ptr},
};
@@ -48,7 +48,7 @@ static const upb_MiniTableField grpc_gcp_Identity__fields[3] = {
};
const upb_MiniTable grpc__gcp__Identity_msg_init = {
- &grpc_gcp_Identity_submsgs[0],
+ &grpc_gcp_Identity__submsgs[0],
&grpc_gcp_Identity__fields[0],
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -84,7 +84,7 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = {
};
const upb_MiniTable* grpc__gcp__Identity__AttributesEntry_msg_init_ptr = &grpc__gcp__Identity__AttributesEntry_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq_submsgs[5] = {
+static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
@@ -106,7 +106,7 @@ static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = {
};
const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = {
- &grpc_gcp_StartClientHandshakeReq_submsgs[0],
+ &grpc_gcp_StartClientHandshakeReq__submsgs[0],
&grpc_gcp_StartClientHandshakeReq__fields[0],
UPB_SIZE(56, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -133,7 +133,7 @@ const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = {
};
const upb_MiniTable* grpc__gcp__StartClientHandshakeReq_msg_init_ptr = &grpc__gcp__StartClientHandshakeReq_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_ServerHandshakeParameters_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_gcp_ServerHandshakeParameters__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
};
@@ -143,7 +143,7 @@ static const upb_MiniTableField grpc_gcp_ServerHandshakeParameters__fields[2] =
};
const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = {
- &grpc_gcp_ServerHandshakeParameters_submsgs[0],
+ &grpc_gcp_ServerHandshakeParameters__submsgs[0],
&grpc_gcp_ServerHandshakeParameters__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -158,7 +158,7 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = {
};
const upb_MiniTable* grpc__gcp__ServerHandshakeParameters_msg_init_ptr = &grpc__gcp__ServerHandshakeParameters_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_submsgs[4] = {
+static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr},
@@ -176,7 +176,7 @@ static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = {
};
const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = {
- &grpc_gcp_StartServerHandshakeReq_submsgs[0],
+ &grpc_gcp_StartServerHandshakeReq__submsgs[0],
&grpc_gcp_StartServerHandshakeReq__fields[0],
UPB_SIZE(48, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -195,7 +195,7 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = {
};
const upb_MiniTable* grpc__gcp__StartServerHandshakeReq_msg_init_ptr = &grpc__gcp__StartServerHandshakeReq_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__ServerHandshakeParameters_msg_init_ptr},
};
@@ -205,7 +205,7 @@ static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq_HandshakeParame
};
const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init = {
- &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0],
+ &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__submsgs[0],
&grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -236,7 +236,7 @@ const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = {
};
const upb_MiniTable* grpc__gcp__NextHandshakeMessageReq_msg_init_ptr = &grpc__gcp__NextHandshakeMessageReq_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_HandshakerReq_submsgs[3] = {
+static const upb_MiniTableSubInternal grpc_gcp_HandshakerReq__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__StartClientHandshakeReq_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__NextHandshakeMessageReq_msg_init_ptr},
@@ -249,7 +249,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerReq__fields[3] = {
};
const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = {
- &grpc_gcp_HandshakerReq_submsgs[0],
+ &grpc_gcp_HandshakerReq__submsgs[0],
&grpc_gcp_HandshakerReq__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -264,7 +264,7 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = {
};
const upb_MiniTable* grpc__gcp__HandshakerReq_msg_init_ptr = &grpc__gcp__HandshakerReq_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult_submsgs[3] = {
+static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr},
@@ -282,7 +282,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = {
};
const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = {
- &grpc_gcp_HandshakerResult_submsgs[0],
+ &grpc_gcp_HandshakerResult__submsgs[0],
&grpc_gcp_HandshakerResult__fields[0],
UPB_SIZE(56, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -330,7 +330,7 @@ const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = {
};
const upb_MiniTable* grpc__gcp__HandshakerStatus_msg_init_ptr = &grpc__gcp__HandshakerStatus_msg_init;
-static const upb_MiniTableSubInternal grpc_gcp_HandshakerResp_submsgs[2] = {
+static const upb_MiniTableSubInternal grpc_gcp_HandshakerResp__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerResult_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerStatus_msg_init_ptr},
};
@@ -343,7 +343,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerResp__fields[4] = {
};
const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = {
- &grpc_gcp_HandshakerResp_submsgs[0],
+ &grpc_gcp_HandshakerResp__submsgs[0],
&grpc_gcp_HandshakerResp__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
index 6e566cef6a695..7545440b1b53b 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -51,4 +51,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
index c99c6facfc96a..be7a0dd01b383 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -205,4 +206,4 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProto
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
index a4a93054fc464..1b7f4c34e8671 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal grpc_gcp_RpcProtocolVersions_submsgs[2] = {
+static const upb_MiniTableSubInternal grpc_gcp_RpcProtocolVersions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr},
};
@@ -25,7 +25,7 @@ static const upb_MiniTableField grpc_gcp_RpcProtocolVersions__fields[2] = {
};
const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = {
- &grpc_gcp_RpcProtocolVersions_submsgs[0],
+ &grpc_gcp_RpcProtocolVersions__submsgs[0],
&grpc_gcp_RpcProtocolVersions__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
index 8526731aa02d2..ed3d40e2be24f 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_prot
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
index 3b6c12f8fa20b..8079c0b9e1f83 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "src/proto/grpc/health/v1/health.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -146,4 +147,4 @@ UPB_INLINE void grpc_health_v1_HealthCheckResponse_set_status(grpc_health_v1_Hea
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
index ee52253c825bf..f359134f756bf 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
index 6940e32cf76ce..3c6bb41911460 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -926,4 +926,4 @@ UPB_INLINE void grpc_lb_v1_Server_set_drop(grpc_lb_v1_Server *msg, bool value) {
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
index e24186525dd12..0a7008a9cf1a1 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c
@@ -16,7 +16,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceRequest_submsgs[2] = {
+static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceRequest__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStats_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField grpc_lb_v1_LoadBalanceRequest__fields[2] = {
};
const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = {
- &grpc_lb_v1_LoadBalanceRequest_submsgs[0],
+ &grpc_lb_v1_LoadBalanceRequest__submsgs[0],
&grpc_lb_v1_LoadBalanceRequest__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -81,7 +81,7 @@ const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = {
};
const upb_MiniTable* grpc__lb__v1__ClientStatsPerToken_msg_init_ptr = &grpc__lb__v1__ClientStatsPerToken_msg_init;
-static const upb_MiniTableSubInternal grpc_lb_v1_ClientStats_submsgs[2] = {
+static const upb_MiniTableSubInternal grpc_lb_v1_ClientStats__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStatsPerToken_msg_init_ptr},
};
@@ -96,7 +96,7 @@ static const upb_MiniTableField grpc_lb_v1_ClientStats__fields[6] = {
};
const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = {
- &grpc_lb_v1_ClientStats_submsgs[0],
+ &grpc_lb_v1_ClientStats__submsgs[0],
&grpc_lb_v1_ClientStats__fields[0],
UPB_SIZE(56, 64), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -123,7 +123,7 @@ const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = {
};
const upb_MiniTable* grpc__lb__v1__ClientStats_msg_init_ptr = &grpc__lb__v1__ClientStats_msg_init;
-static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceResponse_submsgs[3] = {
+static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceResponse__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__ServerList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__FallbackResponse_msg_init_ptr},
@@ -136,7 +136,7 @@ static const upb_MiniTableField grpc_lb_v1_LoadBalanceResponse__fields[3] = {
};
const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = {
- &grpc_lb_v1_LoadBalanceResponse_submsgs[0],
+ &grpc_lb_v1_LoadBalanceResponse__submsgs[0],
&grpc_lb_v1_LoadBalanceResponse__fields[0],
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -161,7 +161,7 @@ const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = {
};
const upb_MiniTable* grpc__lb__v1__FallbackResponse_msg_init_ptr = &grpc__lb__v1__FallbackResponse_msg_init;
-static const upb_MiniTableSubInternal grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_lb_v1_InitialLoadBalanceResponse__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -170,7 +170,7 @@ static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceResponse__fields[1]
};
const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = {
- &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0],
+ &grpc_lb_v1_InitialLoadBalanceResponse__submsgs[0],
&grpc_lb_v1_InitialLoadBalanceResponse__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -179,7 +179,7 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = {
};
const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init;
-static const upb_MiniTableSubInternal grpc_lb_v1_ServerList_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_lb_v1_ServerList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__lb__v1__Server_msg_init_ptr},
};
@@ -188,7 +188,7 @@ static const upb_MiniTableField grpc_lb_v1_ServerList__fields[1] = {
};
const upb_MiniTable grpc__lb__v1__ServerList_msg_init = {
- &grpc_lb_v1_ServerList_submsgs[0],
+ &grpc_lb_v1_ServerList__submsgs[0],
&grpc_lb_v1_ServerList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
index 34a1b9accc87a..774c19f24527a 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -45,4 +45,4 @@ extern const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
index 860d6d9ea3157..494dd21344ce8 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "src/proto/grpc/lookup/v1/rls.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -315,4 +316,4 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupResponse_add_targets(grpc_lookup_v1_Ro
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
index 5cf5c7798f05e..2cdc822f4e363 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupRequest_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupRequest__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest__fields[4] = {
};
const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = {
- &grpc_lookup_v1_RouteLookupRequest_submsgs[0],
+ &grpc_lookup_v1_RouteLookupRequest__submsgs[0],
&grpc_lookup_v1_RouteLookupRequest__fields[0],
UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
index c2377276ef596..64b4566375d48 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
index b038b81d988d8..50c71ac24df78 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_
-#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1413,4 +1413,4 @@ UPB_INLINE struct grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupCl
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ */
+#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
index fc297d25dc434..f0905a3f99db0 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c
@@ -37,7 +37,7 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = {
};
const upb_MiniTable* grpc__lookup__v1__NameMatcher_msg_init_ptr = &grpc__lookup__v1__NameMatcher_msg_init;
-static const upb_MiniTableSubInternal grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = {
+static const upb_MiniTableSubInternal grpc_lookup_v1_GrpcKeyBuilder__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init_ptr},
@@ -52,7 +52,7 @@ static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder__fields[4] = {
};
const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = {
- &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0],
+ &grpc_lookup_v1_GrpcKeyBuilder__submsgs[0],
&grpc_lookup_v1_GrpcKeyBuilder__fields[0],
UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -131,7 +131,7 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init
};
const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init;
-static const upb_MiniTableSubInternal grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = {
+static const upb_MiniTableSubInternal grpc_lookup_v1_HttpKeyBuilder__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr},
@@ -146,7 +146,7 @@ static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder__fields[5] = {
};
const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = {
- &grpc_lookup_v1_HttpKeyBuilder_submsgs[0],
+ &grpc_lookup_v1_HttpKeyBuilder__submsgs[0],
&grpc_lookup_v1_HttpKeyBuilder__fields[0],
UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -186,7 +186,7 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init
};
const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init;
-static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupConfig_submsgs[5] = {
+static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupConfig__submsgs[5] = {
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -207,7 +207,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupConfig__fields[9] = {
};
const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = {
- &grpc_lookup_v1_RouteLookupConfig_submsgs[0],
+ &grpc_lookup_v1_RouteLookupConfig__submsgs[0],
&grpc_lookup_v1_RouteLookupConfig__fields[0],
UPB_SIZE(64, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -234,7 +234,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = {
};
const upb_MiniTable* grpc__lookup__v1__RouteLookupConfig_msg_init_ptr = &grpc__lookup__v1__RouteLookupConfig_msg_init;
-static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = {
+static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupClusterSpecifier__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupConfig_msg_init_ptr},
};
@@ -243,7 +243,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupClusterSpecifier__fiel
};
const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = {
- &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0],
+ &grpc_lookup_v1_RouteLookupClusterSpecifier__submsgs[0],
&grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0],
UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
index e9c96e79e951b..e6f92d652eb05 100644
--- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_
-#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -45,4 +45,4 @@ extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_fil
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ */
+#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
index cbacca9367e60..626022d31d981 100644
--- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -221,7 +221,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_message_mi
const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_MigrateAnnotation* default_val = NULL;
const udpa_annotations_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -231,7 +231,7 @@ UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_Mess
const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -254,7 +254,7 @@ UPB_INLINE const udpa_annotations_FieldMigrateAnnotation* udpa_annotations_field
const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_FieldMigrateAnnotation* default_val = NULL;
const udpa_annotations_FieldMigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -264,7 +264,7 @@ UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldO
const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -287,7 +287,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_migra
const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_MigrateAnnotation* default_val = NULL;
const udpa_annotations_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -297,7 +297,7 @@ UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOpt
const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -320,7 +320,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_value
const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_MigrateAnnotation* default_val = NULL;
const udpa_annotations_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -330,7 +330,7 @@ UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_E
const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -353,7 +353,7 @@ UPB_INLINE const udpa_annotations_FileMigrateAnnotation* udpa_annotations_file_m
const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_FileMigrateAnnotation* default_val = NULL;
const udpa_annotations_FileMigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -363,7 +363,7 @@ UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOpt
const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -382,4 +382,4 @@ UPB_INLINE struct udpa_annotations_FileMigrateAnnotation* udpa_annotations_mutab
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ */
+#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
index 7031450a92a69..0a58179cb7a9c 100644
--- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c
@@ -76,35 +76,35 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = {
const upb_MiniTable* udpa__annotations__FileMigrateAnnotation_msg_init_ptr = &udpa__annotations__FileMigrateAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_message_migrate_ext = {
- {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MessageOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_field_migrate_ext = {
- {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__FieldMigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = {
- {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__EnumOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = {
- {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__EnumValueOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_file_migrate_ext = {
- {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FileOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__FileMigrateAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
index d5e29c205cdf1..798611dd8fa7a 100644
--- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
+++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -38,4 +38,4 @@ extern const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ */
+#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb.h b/src/core/ext/upb-gen/udpa/annotations/security.upb.h
index dc3e0cfda3f80..7183b34c9b2cb 100644
--- a/src/core/ext/upb-gen/udpa/annotations/security.upb.h
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -108,7 +108,7 @@ UPB_INLINE const udpa_annotations_FieldSecurityAnnotation* udpa_annotations_secu
const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_FieldSecurityAnnotation* default_val = NULL;
const udpa_annotations_FieldSecurityAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -118,7 +118,7 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption
const upb_MiniTableExtension* ext = &udpa_annotations_security_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -137,4 +137,4 @@ UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mut
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ */
+#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
index b68773d1dd1e5..a531845ce2799 100644
--- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c
@@ -39,7 +39,7 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = {
const upb_MiniTable* udpa__annotations__FieldSecurityAnnotation_msg_init_ptr = &udpa__annotations__FieldSecurityAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_security_ext = {
- {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__FieldSecurityAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
index d138b82184261..14e4a6c78cd92 100644
--- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
+++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ */
+#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
index 47ced77bc69ef..7f3176dc053fa 100644
--- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
+++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -55,4 +55,4 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ */
+#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
index e170b43b4ba82..688784e347251 100644
--- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
+++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -28,4 +28,4 @@ extern const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ */
+#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb.h b/src/core/ext/upb-gen/udpa/annotations/status.upb.h
index 7ee7316dd0e42..b2dfa63f79e63 100644
--- a/src/core/ext/upb-gen/udpa/annotations/status.upb.h
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -114,7 +114,7 @@ UPB_INLINE const udpa_annotations_StatusAnnotation* udpa_annotations_file_status
const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_StatusAnnotation* default_val = NULL;
const udpa_annotations_StatusAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -124,7 +124,7 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti
const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -143,4 +143,4 @@ UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_fi
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ */
+#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
index d77e7fc73afba..599b84c7d24e8 100644
--- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c
@@ -38,7 +38,7 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = {
const upb_MiniTable* udpa__annotations__StatusAnnotation_msg_init_ptr = &udpa__annotations__StatusAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_file_status_ext = {
- {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FileOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__StatusAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
index 04aa1e84a8ab6..bfd12229905a4 100644
--- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
+++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ */
+#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
index 57e780b6745fd..564bbd5e71a47 100644
--- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -91,7 +91,7 @@ UPB_INLINE const udpa_annotations_VersioningAnnotation* udpa_annotations_version
const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const udpa_annotations_VersioningAnnotation* default_val = NULL;
const udpa_annotations_VersioningAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -101,7 +101,7 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp
const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -120,4 +120,4 @@ UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutabl
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ */
+#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
index d847c18aa57fb..59dc585da0b79 100644
--- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c
@@ -35,7 +35,7 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = {
const upb_MiniTable* udpa__annotations__VersioningAnnotation_msg_init_ptr = &udpa__annotations__VersioningAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension udpa_annotations_versioning_ext = {
- {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MessageOptions_msg_init,
{.UPB_PRIVATE(submsg) = &udpa__annotations__VersioningAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
index e1055ffb9150e..c395cf9628f03 100644
--- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
+++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ */
+#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/validate/validate.upb.h b/src/core/ext/upb-gen/validate/validate.upb.h
index ee9ced7076a54..555b6725d908b 100644
--- a/src/core/ext/upb-gen/validate/validate.upb.h
+++ b/src/core/ext/upb-gen/validate/validate.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef VALIDATE_VALIDATE_PROTO_UPB_H_
-#define VALIDATE_VALIDATE_PROTO_UPB_H_
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_
+#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -6729,7 +6729,7 @@ UPB_INLINE const validate_FieldRules* validate_rules(const struct google_protobu
const upb_MiniTableExtension* ext = &validate_rules_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const validate_FieldRules* default_val = NULL;
const validate_FieldRules* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -6739,7 +6739,7 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con
const upb_MiniTableExtension* ext = &validate_rules_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -6758,4 +6758,4 @@ UPB_INLINE struct validate_FieldRules* validate_mutable_rules(struct google_prot
#include "upb/port/undef.inc"
-#endif /* VALIDATE_VALIDATE_PROTO_UPB_H_ */
+#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.c b/src/core/ext/upb-gen/validate/validate.upb_minitable.c
index 57d4fd7709292..0f85e99a043a1 100644
--- a/src/core/ext/upb-gen/validate/validate.upb_minitable.c
+++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal validate_FieldRules_submsgs[22] = {
+static const upb_MiniTableSubInternal validate_FieldRules__submsgs[22] = {
{.UPB_PRIVATE(submsg) = &validate__FloatRules_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &validate__DoubleRules_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &validate__Int32Rules_msg_init_ptr},
@@ -68,7 +68,7 @@ static const upb_MiniTableField validate_FieldRules__fields[22] = {
};
const upb_MiniTable validate__FieldRules_msg_init = {
- &validate_FieldRules_submsgs[0],
+ &validate_FieldRules__submsgs[0],
&validate_FieldRules__fields[0],
UPB_SIZE(24, 32), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -497,8 +497,8 @@ const upb_MiniTable validate__BoolRules_msg_init = {
};
const upb_MiniTable* validate__BoolRules_msg_init_ptr = &validate__BoolRules_msg_init;
-static const upb_MiniTableSubInternal validate_StringRules_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &validate_KnownRegex_enum_init},
+static const upb_MiniTableSubInternal validate_StringRules__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &validate__KnownRegex_enum_init},
};
static const upb_MiniTableField validate_StringRules__fields[26] = {
@@ -531,7 +531,7 @@ static const upb_MiniTableField validate_StringRules__fields[26] = {
};
const upb_MiniTable validate__StringRules_msg_init = {
- &validate_StringRules_submsgs[0],
+ &validate_StringRules__submsgs[0],
&validate_StringRules__fields[0],
UPB_SIZE(128, 184), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -661,7 +661,7 @@ const upb_MiniTable validate__MessageRules_msg_init = {
};
const upb_MiniTable* validate__MessageRules_msg_init_ptr = &validate__MessageRules_msg_init;
-static const upb_MiniTableSubInternal validate_RepeatedRules_submsgs[1] = {
+static const upb_MiniTableSubInternal validate_RepeatedRules__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
};
@@ -674,7 +674,7 @@ static const upb_MiniTableField validate_RepeatedRules__fields[5] = {
};
const upb_MiniTable validate__RepeatedRules_msg_init = {
- &validate_RepeatedRules_submsgs[0],
+ &validate_RepeatedRules__submsgs[0],
&validate_RepeatedRules__fields[0],
40, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -683,7 +683,7 @@ const upb_MiniTable validate__RepeatedRules_msg_init = {
};
const upb_MiniTable* validate__RepeatedRules_msg_init_ptr = &validate__RepeatedRules_msg_init;
-static const upb_MiniTableSubInternal validate_MapRules_submsgs[2] = {
+static const upb_MiniTableSubInternal validate_MapRules__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr},
};
@@ -698,7 +698,7 @@ static const upb_MiniTableField validate_MapRules__fields[6] = {
};
const upb_MiniTable validate__MapRules_msg_init = {
- &validate_MapRules_submsgs[0],
+ &validate_MapRules__submsgs[0],
&validate_MapRules__fields[0],
UPB_SIZE(40, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -729,7 +729,7 @@ const upb_MiniTable validate__AnyRules_msg_init = {
};
const upb_MiniTable* validate__AnyRules_msg_init_ptr = &validate__AnyRules_msg_init;
-static const upb_MiniTableSubInternal validate_DurationRules_submsgs[7] = {
+static const upb_MiniTableSubInternal validate_DurationRules__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
@@ -751,7 +751,7 @@ static const upb_MiniTableField validate_DurationRules__fields[8] = {
};
const upb_MiniTable validate__DurationRules_msg_init = {
- &validate_DurationRules_submsgs[0],
+ &validate_DurationRules__submsgs[0],
&validate_DurationRules__fields[0],
UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -778,7 +778,7 @@ const upb_MiniTable validate__DurationRules_msg_init = {
};
const upb_MiniTable* validate__DurationRules_msg_init_ptr = &validate__DurationRules_msg_init;
-static const upb_MiniTableSubInternal validate_TimestampRules_submsgs[6] = {
+static const upb_MiniTableSubInternal validate_TimestampRules__submsgs[6] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr},
@@ -800,7 +800,7 @@ static const upb_MiniTableField validate_TimestampRules__fields[9] = {
};
const upb_MiniTable validate__TimestampRules_msg_init = {
- &validate_TimestampRules_submsgs[0],
+ &validate_TimestampRules__submsgs[0],
&validate_TimestampRules__fields[0],
UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -809,7 +809,7 @@ const upb_MiniTable validate__TimestampRules_msg_init = {
};
const upb_MiniTable* validate__TimestampRules_msg_init_ptr = &validate__TimestampRules_msg_init;
-const upb_MiniTableEnum validate_KnownRegex_enum_init = {
+const upb_MiniTableEnum validate__KnownRegex_enum_init = {
64,
0,
{
@@ -841,7 +841,7 @@ const upb_MiniTableExtension validate_required_ext = {
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension validate_rules_ext = {
- {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init},
@@ -873,7 +873,7 @@ static const upb_MiniTable *messages_layout[23] = {
};
static const upb_MiniTableEnum *enums_layout[1] = {
- &validate_KnownRegex_enum_init,
+ &validate__KnownRegex_enum_init,
};
diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.h b/src/core/ext/upb-gen/validate/validate.upb_minitable.h
index 7ce848fb0f152..6372b24ac81b1 100644
--- a/src/core/ext/upb-gen/validate/validate.upb_minitable.h
+++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_
-#define VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -69,7 +69,7 @@ extern const upb_MiniTableExtension validate_ignored_ext;
extern const upb_MiniTableExtension validate_required_ext;
extern const upb_MiniTableExtension validate_rules_ext;
-extern const upb_MiniTableEnum validate_KnownRegex_enum_init;
+extern const upb_MiniTableEnum validate__KnownRegex_enum_init;
extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
#ifdef __cplusplus
@@ -78,4 +78,4 @@ extern const upb_MiniTableFile validate_validate_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ */
+#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
index 9110870cb9938..37da4270e7954 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -221,7 +221,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_messag
const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
const xds_annotations_v3_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -231,7 +231,7 @@ UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_Me
const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -254,7 +254,7 @@ UPB_INLINE const xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_f
const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_FieldMigrateAnnotation* default_val = NULL;
const xds_annotations_v3_FieldMigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -264,7 +264,7 @@ UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_Fiel
const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -287,7 +287,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_m
const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
const xds_annotations_v3_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -297,7 +297,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumO
const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -320,7 +320,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_v
const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_MigrateAnnotation* default_val = NULL;
const xds_annotations_v3_MigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -330,7 +330,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf
const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -353,7 +353,7 @@ UPB_INLINE const xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_fi
const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_FileMigrateAnnotation* default_val = NULL;
const xds_annotations_v3_FileMigrateAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -363,7 +363,7 @@ UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileO
const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -382,4 +382,4 @@ UPB_INLINE struct xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_m
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ */
+#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
index b594c78ab65a6..f6dd6fa313693 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c
@@ -76,35 +76,35 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = {
const upb_MiniTable* xds__annotations__v3__FileMigrateAnnotation_msg_init_ptr = &xds__annotations__v3__FileMigrateAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = {
- {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MessageOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = {
- {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldMigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = {
- {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__EnumOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = {
- {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__EnumValueOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = {
- {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FileOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileMigrateAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
index 864d9d2ce78e7..c162d5926fe45 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -38,4 +38,4 @@ extern const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
index 4844f703df63d..253ea4c7ab36f 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -108,7 +108,7 @@ UPB_INLINE const xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_
const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_FieldSecurityAnnotation* default_val = NULL;
const xds_annotations_v3_FieldSecurityAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -118,7 +118,7 @@ UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOpti
const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -137,4 +137,4 @@ UPB_INLINE struct xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
index 8e0f8b90804f8..482981f26c474 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c
@@ -39,7 +39,7 @@ const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = {
const upb_MiniTable* xds__annotations__v3__FieldSecurityAnnotation_msg_init_ptr = &xds__annotations__v3__FieldSecurityAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_security_ext = {
- {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldSecurityAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
index 790d139d81893..1bcd036edbbc0 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
index 06293d2c022c3..2203655a2cd88 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -55,4 +55,4 @@ UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOpt
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
index 633fca8d2326b..b6118daa03612 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -28,4 +28,4 @@ extern const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
index dbcd9ea25bc80..de7b940dcb78c 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -281,7 +281,7 @@ UPB_INLINE const xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_fil
const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_FileStatusAnnotation* default_val = NULL;
const xds_annotations_v3_FileStatusAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -291,7 +291,7 @@ UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOp
const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -314,7 +314,7 @@ UPB_INLINE const xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_
const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_MessageStatusAnnotation* default_val = NULL;
const xds_annotations_v3_MessageStatusAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -324,7 +324,7 @@ UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_Mes
const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -347,7 +347,7 @@ UPB_INLINE const xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_fi
const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_FieldStatusAnnotation* default_val = NULL;
const xds_annotations_v3_FieldStatusAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -357,7 +357,7 @@ UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_Field
const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -376,4 +376,4 @@ UPB_INLINE struct xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_m
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ */
+#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
index e0da39655d999..8a6ff44abd150 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c
@@ -92,21 +92,21 @@ const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = {
const upb_MiniTable* xds__annotations__v3__StatusAnnotation_msg_init_ptr = &xds__annotations__v3__StatusAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_file_status_ext = {
- {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FileOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileStatusAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_message_status_ext = {
- {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MessageOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__MessageStatusAnnotation_msg_init},
};
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_field_status_ext = {
- {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__FieldOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldStatusAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
index 779ed39fa4819..76356ad65a580 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -38,4 +38,4 @@ extern const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
index 5d79b12ad8cf5..58f80185430d4 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
-#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -91,7 +91,7 @@ UPB_INLINE const xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_ver
const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
const xds_annotations_v3_VersioningAnnotation* default_val = NULL;
const xds_annotations_v3_VersioningAnnotation* ret;
_upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret);
@@ -101,7 +101,7 @@ UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_Message
const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext;
UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field)));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(
- &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte);
+ &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte));
bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena);
UPB_ASSERT(ok);
}
@@ -120,4 +120,4 @@ UPB_INLINE struct xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_mu
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ */
+#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
index 04018770859e3..aeb57b30fea58 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c
@@ -35,7 +35,7 @@ const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = {
const upb_MiniTable* xds__annotations__v3__VersioningAnnotation_msg_init_ptr = &xds__annotations__v3__VersioningAnnotation_msg_init;
UPB_LINKARR_APPEND(upb_AllExts)
const upb_MiniTableExtension xds_annotations_v3_versioning_ext = {
- {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
+ {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
&google__protobuf__MessageOptions_msg_init,
{.UPB_PRIVATE(submsg) = &xds__annotations__v3__VersioningAnnotation_msg_init},
diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
index 38026937395f5..e0fcc290de230 100644
--- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_
-#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -30,4 +30,4 @@ extern const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layo
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h
index bd4e7ae3b8eb2..db7e0d3788568 100644
--- a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_
-#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -87,4 +87,4 @@ UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_S
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
index 5c591ab4177da..fedb1d1c18301 100644
--- a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
index 6d6f2376caaef..a7ca184455bd7 100644
--- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H_
-#define XDS_CORE_V3_CIDR_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -119,4 +119,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_mutable_pre
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
index e2c6437a56713..52994a4f27a62 100644
--- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_CidrRange_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_CidrRange__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField xds_core_v3_CidrRange__fields[2] = {
};
const upb_MiniTable xds__core__v3__CidrRange_msg_init = {
- &xds_core_v3_CidrRange_submsgs[0],
+ &xds_core_v3_CidrRange__submsgs[0],
&xds_core_v3_CidrRange__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
index 9939d28f77e64..263126dab867b 100644
--- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
index 628ebd9d48f55..4a7b0ce25ea46 100644
--- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_
-#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -246,4 +246,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_m
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
index 212ef1653a1ab..ca22ab420b752 100644
--- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry__InlineEntry_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_CollectionEntry__fields[2] = {
};
const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = {
- &xds_core_v3_CollectionEntry_submsgs[0],
+ &xds_core_v3_CollectionEntry__submsgs[0],
&xds_core_v3_CollectionEntry__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -44,7 +44,7 @@ const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = {
};
const upb_MiniTable* xds__core__v3__CollectionEntry_msg_init_ptr = &xds__core__v3__CollectionEntry_msg_init;
-static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_InlineEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -55,7 +55,7 @@ static const upb_MiniTableField xds_core_v3_CollectionEntry_InlineEntry__fields[
};
const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = {
- &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0],
+ &xds_core_v3_CollectionEntry_InlineEntry__submsgs[0],
&xds_core_v3_CollectionEntry_InlineEntry__fields[0],
UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
index 41190f6fb2dbb..1914598799575 100644
--- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
index d3321320ebfa0..dd27087ffb87d 100644
--- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_
-#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -148,4 +148,4 @@ UPB_INLINE void xds_core_v3_ContextParams_ParamsEntry_set_value(xds_core_v3_Cont
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
index 2456df79ab19a..67677719c2ee9 100644
--- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_ContextParams_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_ContextParams__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams__ParamsEntry_msg_init_ptr},
};
@@ -24,7 +24,7 @@ static const upb_MiniTableField xds_core_v3_ContextParams__fields[1] = {
};
const upb_MiniTable xds__core__v3__ContextParams_msg_init = {
- &xds_core_v3_ContextParams_submsgs[0],
+ &xds_core_v3_ContextParams__submsgs[0],
&xds_core_v3_ContextParams__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
index 6d9fdd2b1a531..213ee86860fd4 100644
--- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h
index f562a9c001739..e6b67a0f06dea 100644
--- a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
-#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -118,4 +118,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
index 951a460abaaf4..a61b4802163aa 100644
--- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c
@@ -16,7 +16,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_TypedExtensionConfig_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_TypedExtensionConfig__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_core_v3_TypedExtensionConfig__fields[2] = {
};
const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = {
- &xds_core_v3_TypedExtensionConfig_submsgs[0],
+ &xds_core_v3_TypedExtensionConfig__submsgs[0],
&xds_core_v3_TypedExtensionConfig__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
index c8b3bcfab9975..4e1f351237cbf 100644
--- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h
index 68dcff3e663f1..7f480b87ffc96 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
-#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -150,4 +150,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
index fba9de959518e..2c6efb82860b6 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_Resource_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_core_v3_Resource__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceName_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_Resource__fields[3] = {
};
const upb_MiniTable xds__core__v3__Resource_msg_init = {
- &xds_core_v3_Resource_submsgs[0],
+ &xds_core_v3_Resource__submsgs[0],
&xds_core_v3_Resource__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
index d74344dd54ba1..a0c5c7719d07c 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
index 2af90d2eedf62..3a58954cfef44 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_
-#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -348,4 +348,4 @@ UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_Reso
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
index 4bc637032e542..a0c5dee7892d7 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator__Directive_msg_init_ptr},
};
@@ -32,7 +32,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = {
};
const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = {
- &xds_core_v3_ResourceLocator_submsgs[0],
+ &xds_core_v3_ResourceLocator__submsgs[0],
&xds_core_v3_ResourceLocator__fields[0],
UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -51,7 +51,7 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = {
};
const upb_MiniTable* xds__core__v3__ResourceLocator_msg_init_ptr = &xds__core__v3__ResourceLocator_msg_init;
-static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr},
};
@@ -61,7 +61,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2]
};
const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = {
- &xds_core_v3_ResourceLocator_Directive_submsgs[0],
+ &xds_core_v3_ResourceLocator_Directive__submsgs[0],
&xds_core_v3_ResourceLocator_Directive__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
index 7917c25ebf72c..9cb499138b33a 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layou
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
index 32f2372f9a2b9..8c3bfa55556fa 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
-#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_
+#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -151,4 +151,4 @@ UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_co
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
index 990b69f355ded..b6e5bee5599a6 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_core_v3_ResourceName_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_core_v3_ResourceName__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr},
};
@@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = {
};
const upb_MiniTable xds__core__v3__ResourceName_msg_init = {
- &xds_core_v3_ResourceName_submsgs[0],
+ &xds_core_v3_ResourceName__submsgs[0],
&xds_core_v3_ResourceName__fields[0],
UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
index f8267e3bb8adb..9a031f751aae5 100644
--- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_
-#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
index 5387489436602..080d91922ffb2 100644
--- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_
-#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_
+#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_
+#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -400,4 +400,4 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_set_value(xds_
#include "upb/port/undef.inc"
-#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ */
+#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
index ce2cd2c5df938..76bf9a2c302b7 100644
--- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr},
@@ -34,7 +34,7 @@ static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = {
};
const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = {
- &xds_data_orca_v3_OrcaLoadReport_submsgs[0],
+ &xds_data_orca_v3_OrcaLoadReport__submsgs[0],
&xds_data_orca_v3_OrcaLoadReport__fields[0],
UPB_SIZE(72, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
index 26c4f1a2255ee..588a0d8cd8d21 100644
--- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
-#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -35,4 +35,4 @@ extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_
#include "upb/port/undef.inc"
-#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
index d97de133d7594..96e1fc0441e63 100644
--- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_
-#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_
+#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_
+#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -162,4 +162,4 @@ UPB_INLINE bool xds_service_orca_v3_OrcaLoadReportRequest_add_request_cost_names
#include "upb/port/undef.inc"
-#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ */
+#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
index bc29b177b9792..38cb6e6e75c3e 100644
--- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
@@ -16,7 +16,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__field
};
const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = {
- &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0],
+ &xds_service_orca_v3_OrcaLoadReportRequest__submsgs[0],
&xds_service_orca_v3_OrcaLoadReportRequest__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
index 84a455812125e..9b6c6d81634d0 100644
--- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_
-#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
index f7f399d8e2099..9e696a7f42133 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -119,4 +119,4 @@ UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_description(xds_type_matcher_
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
index ec3d622662c15..acf434c82a03b 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[2] = {
};
const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = {
- &xds_type_matcher_v3_CelMatcher_submsgs[0],
+ &xds_type_matcher_v3_CelMatcher__submsgs[0],
&xds_type_matcher_v3_CelMatcher__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
index 069f621b00513..6453b80eb7c43 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
index 401a2a2f54a08..e502eb6fb7db0 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -269,4 +269,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Serve
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
index 8aca8eb56ff6e..542d8efa716d9 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1]
};
const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = {
- &xds_type_matcher_v3_ServerNameMatcher_submsgs[0],
+ &xds_type_matcher_v3_ServerNameMatcher__submsgs[0],
&xds_type_matcher_v3_ServerNameMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher_msg_init_ptr = &xds__type__matcher__v3__ServerNameMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -49,7 +49,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatc
};
const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init = {
- &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0],
+ &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__submsgs[0],
&xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
index 8b5ed52ee4701..1aac5049dc8da 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
index 3ddb1eb037507..261e81a0ba41a 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -70,4 +70,4 @@ UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize_ex(co
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
index bf0e0a5883e5e..4f9999c853223 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_la
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
index c4e910435b17a..ee565a53abf6d 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -294,4 +294,4 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_t
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
index 1a060de54dc99..a5c8e4ed99f3b 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr},
};
@@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = {
};
const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = {
- &xds_type_matcher_v3_IPMatcher_submsgs[0],
+ &xds_type_matcher_v3_IPMatcher__submsgs[0],
&xds_type_matcher_v3_IPMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -40,7 +40,7 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__IPMatcher_msg_init_ptr = &xds__type__matcher__v3__IPMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -52,7 +52,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fi
};
const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = {
- &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__submsgs[0],
&xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
index 520d811a1f626..c80fb5453670d 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
index 106faabaafdc4..adfffe016d292 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -1202,4 +1202,4 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_va
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
index d2d39d6dbd228..8925f1c48c919 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c
@@ -18,7 +18,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
@@ -31,7 +31,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = {
};
const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = {
- &xds_type_matcher_v3_Matcher_submsgs[0],
+ &xds_type_matcher_v3_Matcher__submsgs[0],
&xds_type_matcher_v3_Matcher__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -46,7 +46,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Matcher_msg_init_ptr = &xds__type__matcher__v3__Matcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
};
@@ -57,7 +57,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] =
};
const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = {
- &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0],
+ &xds_type_matcher_v3_Matcher_OnMatch__submsgs[0],
&xds_type_matcher_v3_Matcher_OnMatch__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -72,7 +72,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr = &xds__type__matcher__v3__Matcher__OnMatch_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr},
};
@@ -81,7 +81,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherList__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -94,7 +94,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr},
@@ -109,7 +109,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherList_Predicate__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -128,7 +128,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
@@ -141,7 +141,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -156,7 +156,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
};
@@ -165,7 +165,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -178,7 +178,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -189,7 +189,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMat
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -198,7 +198,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr},
@@ -213,7 +213,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherTree__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherTree__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -232,7 +232,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr},
};
@@ -241,7 +241,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -250,7 +250,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i
};
const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -260,7 +260,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap
};
const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
- &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
+ &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[0],
&xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
index a4ec6a0eaa043..6a67d6fd1a9b6 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -47,4 +47,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
index 8c097770544ee..a00197340345c 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -763,4 +763,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Doubl
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
index 22480cce486ab..396748bc15a98 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c
@@ -17,7 +17,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr},
};
@@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1]
};
const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = {
- &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_Int64RangeMatcher__submsgs[0],
&xds_type_matcher_v3_Int64RangeMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__v3__Int64Range_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -50,7 +50,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatch
};
const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init = {
- &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__submsgs[0],
&xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -63,7 +63,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_
};
const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr},
};
@@ -72,7 +72,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1]
};
const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = {
- &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_Int32RangeMatcher__submsgs[0],
&xds_type_matcher_v3_Int32RangeMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -85,7 +85,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__v3__Int32Range_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -96,7 +96,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatch
};
const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init = {
- &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__submsgs[0],
&xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -109,7 +109,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_
};
const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr},
};
@@ -118,7 +118,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1
};
const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = {
- &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_DoubleRangeMatcher__submsgs[0],
&xds_type_matcher_v3_DoubleRangeMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -131,7 +131,7 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher_msg_init_ptr = &xds__type__matcher__v3__DoubleRangeMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__v3__DoubleRange_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr},
};
@@ -142,7 +142,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatc
};
const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init = {
- &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0],
+ &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__submsgs[0],
&xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
index 04bc4f230b98f..8933062cee130 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -39,4 +39,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
index 7d0f74c290ad1..78287aa12dfd7 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -164,4 +164,4 @@ UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const x
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
index cd151d6bdc798..18cece098b7bc 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr},
};
@@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = {
};
const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = {
- &xds_type_matcher_v3_RegexMatcher_submsgs[0],
+ &xds_type_matcher_v3_RegexMatcher__submsgs[0],
&xds_type_matcher_v3_RegexMatcher__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
index dd933ba2fb87f..8b738b4090119 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
index 7e2f1abec1eec..3ae9b081a8313 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -317,4 +317,4 @@ UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStr
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
index 5d2adb5f53d6e..f51ab159c6f1b 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c
@@ -16,7 +16,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = {
};
const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = {
- &xds_type_matcher_v3_StringMatcher_submsgs[0],
+ &xds_type_matcher_v3_StringMatcher__submsgs[0],
&xds_type_matcher_v3_StringMatcher__fields[0],
UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -49,7 +49,7 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = {
};
const upb_MiniTable* xds__type__matcher__v3__StringMatcher_msg_init_ptr = &xds__type__matcher__v3__StringMatcher_msg_init;
-static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr},
};
@@ -58,7 +58,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1]
};
const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = {
- &xds_type_matcher_v3_ListStringMatcher_submsgs[0],
+ &xds_type_matcher_v3_ListStringMatcher__submsgs[0],
&xds_type_matcher_v3_ListStringMatcher__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
index 06b77ab34ab35..c721756b2b46f 100644
--- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h
index 95678924109c2..409f2ccc6d5d6 100644
--- a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -246,4 +246,4 @@ UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_muta
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
index d3b5d22c5a666..ce3944ad1aafc 100644
--- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c
@@ -19,7 +19,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_v3_CelExpression_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_v3_CelExpression__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr},
};
@@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = {
};
const upb_MiniTable xds__type__v3__CelExpression_msg_init = {
- &xds_type_v3_CelExpression_submsgs[0],
+ &xds_type_v3_CelExpression__submsgs[0],
&xds_type_v3_CelExpression__fields[0],
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -45,7 +45,7 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = {
};
const upb_MiniTable* xds__type__v3__CelExpression_msg_init_ptr = &xds__type__v3__CelExpression_msg_init;
-static const upb_MiniTableSubInternal xds_type_v3_CelExtractString_submsgs[2] = {
+static const upb_MiniTableSubInternal xds_type_v3_CelExtractString__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__StringValue_msg_init_ptr},
};
@@ -56,7 +56,7 @@ static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = {
};
const upb_MiniTable xds__type__v3__CelExtractString_msg_init = {
- &xds_type_v3_CelExtractString_submsgs[0],
+ &xds_type_v3_CelExtractString__submsgs[0],
&xds_type_v3_CelExtractString__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
index a297965182b43..2f12b4a074eeb 100644
--- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/v3/range.upb.h
index 26bfecce2688d..66261aab980d0 100644
--- a/src/core/ext/upb-gen/xds/type/v3/range.upb.h
+++ b/src/core/ext/upb-gen/xds/type/v3/range.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "xds/type/v3/range.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -242,4 +243,4 @@ UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, do
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
index 6def17ae88dc7..e4034aa6a99f3 100644
--- a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -33,4 +33,4 @@ extern const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
index e5853a59493eb..3e8e8749beb4a 100644
--- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_
-#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -117,4 +117,4 @@ UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value(
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ */
+#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_ */
diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
index 59b6c6bef81f6..d6e37b89936a4 100644
--- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c
@@ -15,7 +15,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal xds_type_v3_TypedStruct_submsgs[1] = {
+static const upb_MiniTableSubInternal xds_type_v3_TypedStruct__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr},
};
@@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = {
};
const upb_MiniTable xds__type__v3__TypedStruct_msg_init = {
- &xds_type_v3_TypedStruct_submsgs[0],
+ &xds_type_v3_TypedStruct__submsgs[0],
&xds_type_v3_TypedStruct__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
index 810baf16a8b77..c3d3bef118813 100644
--- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
+++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_
-#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ */
+#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
index 0dc25530d46c6..18f4d0ff547ee 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SubjectAlternateName_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
index d20a738a25ba4..17caac6faf73c 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_HostHealthStatus_getmsgdef(upb_D
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
index e3e17cf610357..805ad2bee1fee 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SecretsConfigDump_StaticSecret_g
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
index 39f42f9417287..ea680b5b21f44 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -120,4 +120,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
index 41edace56d938..ae90b34645ab3 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_UnreadyTargetsDumps_UnreadyTarge
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
index 8b84c569f78fb..9d2094e709dc2 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_ListenerStatus_getmsgdef(upb_Def
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
index 4bc9bb674cbad..685876f45bfcc 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_Memory_getmsgdef(upb_DefPool *s)
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
index e5b2ad86d4e46..cece2965c46ce 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SimpleMetric_getmsgdef(upb_DefPo
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
index d9baa7af0ddbe..10ca8d59b6df5 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_MutexStats_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
index 9540a6ed1bf05..5cee7dacdd8b3 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_CommandLineOptions_getmsgdef(upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
index c112e6d9a6b6d..98a30d2089019 100644
--- a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_
-#define ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_TapRequest_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
index d8563570873e6..e0bd93e5b0ae9 100644
--- a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_
-#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
index 5dd135ccae732..74dbb7795761e 100644
--- a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
-#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_annotations_ResourceAnnotation_getmsgdef(
#include "upb/port/undef.inc"
-#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
index 510a16364f2c3..74789cb5b1ac1 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ExtensionFilter_getms
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
index ac8f021d9ad03..f84fe1b3bdb3a 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -140,4 +140,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_MemoryAllocatorManage
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
index 019956e73607c..1458f37148a3d 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_CircuitBreakers_Thresho
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
index 17dc4bc74b99d..a55e408b211c2 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -150,4 +150,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getms
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
index e3ce99adae713..e61bfddbf21ba 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Filter_getmsgdef(upb_De
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
index 679f51e2dcfe8..c852757d93239 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_OutlierDetection_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
index 0ce406c241e7b..a833c29a2bee1 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -100,4 +100,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyM
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
index 3a1568bb448f4..349cbd1a2f286 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_CidrRange_getmsgdef(upb_De
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
index b4542e33f0f1b..4c293523da8e6 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_BackoffStrategy_getmsgdef(
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
index e3fea17f1f87f..4661fd43598b1 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -170,4 +170,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ControlPlane_getmsgdef(upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
index e293a2c7c6a55..8ab7eadb5f468 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ExtensionConfigSource_getm
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
index f4aa65ec9d6fe..e6ccd74e2791a 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_EventServiceConfig_getmsgd
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
index 842d01c009bd1..aa5c05449f2a8 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_TypedExtensionConfig_getms
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
index b0554f4ae2756..1edb55167bc10 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_GrpcMethodList_Service_get
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
index fa980d3682335..89d492aa37c48 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -95,4 +95,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_GrpcService_GoogleGrpc_Cha
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
index 7898993f4af7b..5884c02a67e3f 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HealthCheck_TlsOptions_get
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h
index 114fda0a20876..2cc8489c9298e 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HttpService_getmsgdef(upb_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
index 9d70352d97fbe..bc15e923d5f57 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HttpUri_getmsgdef(upb_DefP
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
index dc12ad47b94a8..1d7c5da838e37 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SchemeHeaderTransformation
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
index 2d843bf102fb7..9b899cc27b1df 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ProxyProtocolConfig_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
index 284b06105c857..2d557070a8d39 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_DnsResolutionConfig_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
index 073e069885914..7c69fc1dc8291 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SocketOptionsOverride_getm
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
index 9fdf2a878b234..f40503ba3ad40 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SubstitutionFormatString_g
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
index d58de476c71b2..53669e73e5d8a 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_UdpSocketConfig_getmsgdef(
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
index 93f1ede9d7af9..c6243b29ba8de 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterLoadAssignment_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
index 5c6ce45fec04e..50a598fef6664 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_LocalityLbEndpoints_Lb
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
index 828c654229bbb..60839fe5c1a0b 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -55,4 +55,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterStats_DroppedRe
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
index 5f95139409189..9d97fdbce8568 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ApiListener_getmsgdef(
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
index 45290231106fc..c842ac26640e2 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ApiListenerManager_get
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
index aeee7425c9b35..7e4d04e850f64 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ListenerFilter_getmsgd
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
index abf4abd2cc7c5..9ebdd236b9987 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_QuicProtocolOptions_ge
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
index 38f8407615447..e94ff22230a93 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ActiveRawUdpListenerCo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
index b44ee3545102e..ce61514667b15 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_metrics_v3_MetricsServiceConfig_ge
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
index 2c6e83443c318..bb5750d32f193 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_metrics_v3_HystrixSink_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
index 22eba2a893c72..134f95387dca6 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_overload_v3_OverloadManager_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
index 96801bf79e8bc..2a7ab7ec46bc4 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -80,4 +80,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Action_getmsgdef(upb_DefPo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
index 18f738b2d8069..fcd71eb804df5 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_Vhds_getmsgdef(upb_DefPoo
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
index 6348c5fbb8414..a472e61399f70 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -315,4 +315,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_FilterConfig_getmsgdef(up
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
index acc666b3a0219..2657f3cb22205 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_ScopedRouteConfiguration_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
index 49fae22588e6c..121ab876ac387 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -85,4 +85,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingGrpcSink_getmsgdef
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
index e49b1af53f901..6fbc8e8db4c85 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogConfig_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
index 3073196c8e544..fd843bb65e45f 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DynamicOtConfig_getmsgdef
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
index 5b61d6418c9f3..89bf42fd38595 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_Tracing_Http_getmsgdef(up
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
index a315c9b6eef8d..185a564cfc88f 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_LightstepConfig_getmsgdef
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
index 4a09a1c624bd9..0189f7768b5a9 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_OpenCensusConfig_getmsgde
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
index 560d0b9097dff..c61e6e042da96 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_OpenTelemetryConfig_getms
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
index 22aed73c9b527..5c76a63594c13 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_TraceServiceConfig_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
index af1307c53f266..149bb51877424 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_ClientConfig_getmsgdef(up
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
index 0644987fe5d66..9c3bba8895424 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_config_trace_v3_trace_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
index 91412241755e2..33b2e3a3cddb2 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_XRayConfig_SegmentFields_
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
index f323ca4be7a9c..e5be3b8e8d604 100644
--- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_
-#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_
+#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_ZipkinConfig_getmsgdef(up
#include "upb/port/undef.inc"
-#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
index 7fe7b4ef49681..00d5c41faba1a 100644
--- a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
-#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_
#include "upb/port/undef.inc"
-#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
index ffdbba5602045..bbe83db884870 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_clusters_aggregate_v3_ClusterC
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
index 51ed4fc400e76..138385ac3898d 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultR
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
index 8f0eea1ba804f..1e6cd7af02e28 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_HTTPFaul
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h
index 9fb2997625c18..6c258e303214d 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_Toke
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
index 6bb640ef2d0bd..ef568185a4681 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBACPerRo
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
index 420ae5b5f6c88..548be8ea6e15e 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_router_v3_Router_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
index 9cd7a7b851b96..c92a427db53cf 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_stateful_session_
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
index 3cc2dcb9bf4fa..6f7f93746bdd9 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -130,4 +130,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_network_http_connectio
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
index c5703f3ca4abd..7fcfcc1f1f476 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_http_stateful_session_cookie_v
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
index f439037c509dc..3c1cd2ac9fb5d 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_http_11_prox
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
index 634f858589bf5..780d4f3e95b4f 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_cert_proto_up
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
index ef90ade193c59..a216ab2b1881c 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Certi
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
index 4ebda2bf46edb..6e4beed177944 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Secre
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
index 14da9a82c7bb4..12914bf3fb639 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Commo
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
index f8a6167936ce5..1433f5673c25d 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_SPIFF
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h
index b7d2ff3bb3ce0..768925b4e519b 100644
--- a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_
-#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_upstreams_http_v3_HttpProtocol
#include "upb/port/undef.inc"
-#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
index 730b46139c2c5..527aa93bbcf50 100644
--- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_discovery_v3_AdsDummy_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
index 649abd28873e1..7441379d71714 100644
--- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_
-#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -95,4 +95,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_discovery_v3_Resource_CacheContro
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
index f2ee7fad417fa..143f2805ef665 100644
--- a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_
-#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_load_stats_v3_LoadStatsResponse_g
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
index 4e77cf039b250..f661a0ff4814d 100644
--- a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_
-#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_status_v3_ClientStatusResponse_ge
#include "upb/port/undef.inc"
-#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
index 28494f58c6df3..056e5bb985520 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_http_v3_Cookie_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
index 13260845d56fe..56075fa940903 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_http_v3_PathTransformation_Operation
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
index ecd8b20929df7..48c4b106e9af2 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_FilterStateMatcher_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
index 62ed58f66b23c..53e3249df723c 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestQueryParamMatc
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
index c2831b1b5a897..e6dc5337d1c2e 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_PathSegme
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
index 8c18041a1b09a..cf560b36c49be 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_NodeMatcher_getmsgdef(upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
index 7e8a4278473a6..d2daa0ddd44d2 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_DoubleMatcher_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
index f4d647ee542c4..2f06e59fa2c98 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_PathMatcher_getmsgdef(upb
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
index 94b570b58a2f2..c73630367b83c 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatchAndSubstitute_g
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
index cb2836d783e4f..b05939d3e8f0b 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseStatusCodeCla
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
index d090589f2752c..7c983e6a6c8c0 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_ListStringMatcher_getmsgd
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
index ddfb4de79c249..100ce3c152da0 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_PathSegment
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
index 12087eebc472a..592875d220895 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_OrMatcher_getmsgdef(upb_D
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
index 8360c54106e10..4b64e5a564f69 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Host_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
index 28aefb3e92d03..69ebb0f2a7129 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_tracing_v3_CustomTag_Metadata_getmsg
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
index e290910b28793..6e03c0b164374 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_HashPolicy_FilterState_getmsgdef(
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
index 449007fde84c7..62b6e460517cc 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
index d6e625abd31c9..3387450d27f1f 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_HttpStatus_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
index 02dc9e0e9ac8c..0bce51053b3ed 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_FractionalPercent_getmsgdef(upb_D
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
index c62b7ab0510bc..47c5d2440e76f 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_DoubleRange_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
index b0d74d3939eb9..891fa451778c6 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_RateLimitStrategy_RequestsPerTime
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
index 5bf089761614b..e2c335da67aad 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_type_v3_ratelimit_unit_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
index ff79caa0d42bb..e9660836d02a8 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_SemanticVersion_getmsgdef(upb_Def
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
index e80d50e4b9e93..dc7f4524d3e68 100644
--- a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_
-#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_
+#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_
+#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_TokenBucket_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ */
+#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
index 7939a4f327bbc..b717df0519fd7 100644
--- a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_
-#define GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init google_api_annotations_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
index dd9f8a068bed5..34f23dd5cb1b9 100644
--- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -90,4 +90,4 @@ UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_Reference_getmsgdef(up
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
index 01c1211561faf..a3e7c1520bf87 100644
--- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_
-#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourcePosition_getmsgd
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
index 6af505cfeed49..b3b35d13436f1 100644
--- a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
-#define GOOGLE_API_HTTP_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *google_api_CustomHttpPattern_getmsgdef(upb_DefP
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
index 21221387ee945..61f67418c8e3c 100644
--- a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_
-#define GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_api_HttpBody_getmsgdef(upb_DefPool *s) {
#include "upb/port/undef.inc"
-#endif /* GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
index ec2efbc59ca0a..95fd3669bf460 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Any_getmsgdef(upb_DefPool *s) {
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
index 9b835ab4cc29c..545f4d90079b5 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
+++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c
@@ -10,497 +10,498 @@
#include "google/protobuf/descriptor.upbdefs.h"
#include "google/protobuf/descriptor.upb_minitable.h"
-static const char descriptor[12268] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p',
+static const char descriptor[12296] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p',
't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
-'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n',
+'f', '\"', '[', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n',
'\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R',
-'\004', 'f', 'i', 'l', 'e', '\"', '\230', '\005', '\n', '\023', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P',
-'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022',
-'\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e',
-'\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p',
-'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', 'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e',
-'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', 'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n',
-'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003',
-'(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's',
-'s', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R',
-'\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e',
-'\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
-'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm',
-'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g',
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's',
-'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t',
-'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P',
-'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n',
-'s', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f',
-'.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020',
-'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.',
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd',
-'e', 'I', 'n', 'f', 'o', 'R', '\016', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006',
-'s', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '2', '\n', '\007', 'e',
-'d', 'i', 't', 'i', 'o', 'n', '\030', '\016', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
-'t', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\"', '\271', '\006',
-'\n', '\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e',
-'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003',
-'(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l',
-'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C',
-'\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o',
-'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't',
-'e', 'd', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
-'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\n', 'n',
-'e', 's', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ',
-'\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u',
-'m', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p',
-'e', '\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(',
-'\013', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r',
-'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e',
-'R', '\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f',
-'_', 'd', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
-'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o',
-'R', '\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ',
-'\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's',
-'s', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r',
-'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r',
-'o', 't', 'o', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v',
-'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030',
-'\n', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x',
-'t', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001',
-'(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e',
-'n', 'd', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n',
-'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's',
-'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005',
-'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd',
-'\"', '\314', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n',
-'s', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n',
-'\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f',
-'.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i',
-'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a',
-'r', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
-'t', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o',
-'n', 's', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l',
-'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013',
-'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r',
-'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'm', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c',
-'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
-'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n',
-'s', '.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E',
-'R', 'I', 'F', 'I', 'E', 'D', 'B', '\003', '\210', '\001', '\002', 'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n',
-'\032', '\224', '\001', '\n', '\013', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e',
-'r', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n',
-'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y',
-'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e',
-'d', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e',
-'a', 't', 'e', 'd', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020',
-'\005', '\"', '4', '\n', '\021', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n',
-'\013', 'D', 'E', 'C', 'L', 'A', 'R', 'A', 'T', 'I', 'O', 'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F',
-'I', 'E', 'D', '\020', '\001', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l',
-'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030',
-'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001',
-'(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', 'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016',
-'2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D',
-'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b',
-'e', 'l', '\022', '>', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e',
+'\004', 'f', 'i', 'l', 'e', '*', '\014', '\010', '\200', '\354', '\312', '\377', '\001', '\020', '\201', '\354', '\312', '\377', '\001', '\"', '\230', '\005', '\n', '\023', 'F',
+'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm',
+'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030',
+'\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e',
+'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021',
+'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020',
+'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_',
+'d', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', '(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p',
+'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004',
+' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e',
+'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p',
+'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o',
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p',
+'t', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r',
+'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o',
+'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't',
+'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007',
+' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i',
+'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n',
+'s', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g',
+'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n',
+'s', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e',
+'_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
+'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', 'R', '\016', 's', 'o', 'u', 'r',
+'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(',
+'\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\016', ' ', '\001', '(',
+'\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i',
+'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\"', '\271', '\006', '\n', '\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o',
+'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm',
+'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e',
'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
-'P', 'r', 'o', 't', 'o', '.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_',
-'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e',
-'x', 't', 'e', 'n', 'd', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#',
-'\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e',
-'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x',
-'\030', '\t', ' ', '\001', '(', '\005', 'R', '\n', 'o', 'n', 'e', 'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o',
-'n', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n',
-'\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't',
-'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'p', 'r', 'o', 't', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021',
-' ', '\001', '(', '\010', 'R', '\016', 'p', 'r', 'o', 't', 'o', '3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004',
-'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n',
-'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6',
-'4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T',
-'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D',
-'6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n',
-'\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I',
-'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T',
-'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T',
-'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t',
-'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E',
-'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022',
-'\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_',
-'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 'C', '\n', '\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E',
-'L', '_', 'O', 'P', 'T', 'I', 'O', 'N', 'A', 'L', '\020', '\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P',
-'E', 'A', 'T', 'E', 'D', '\020', '\003', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D',
-'\020', '\002', '\"', 'c', '\n', '\024', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't',
-'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007',
-'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
-'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i',
-'o', 'n', 's', '\"', '\343', '\002', '\n', '\023', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o',
-'t', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n',
-'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
-'t', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
-'P', 'r', 'o', 't', 'o', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003',
-' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n',
-'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's',
-'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l',
+'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n',
+'\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't',
+'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', 'e', 'd', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003',
+'(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c',
+'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\n', 'n', 'e', 's', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A',
+'\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l',
'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
-'P', 'r', 'o', 't', 'o', '.', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r',
-'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd',
-'_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e',
-'\032', ';', '\n', '\021', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005',
-'s', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd',
-'\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e',
-'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001',
-' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(',
-'\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', ';', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(',
-'\013', '2', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V',
-'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026',
-'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n',
-'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h',
-'o', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
-'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006',
-'m', 'e', 't', 'h', 'o', 'd', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037',
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O',
-'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o',
-'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030',
-'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e',
-'\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'i', 'n', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p',
-'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e',
-'\022', '8', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R',
-'\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '0', '\n', '\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm',
-'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S',
-'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm',
-'i', 'n', 'g', '\030', '\006', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S',
-'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\255', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022',
-'!', '\n', '\014', 'j', 'a', 'v', 'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a',
-'v', 'a', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c',
-'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r',
-'C', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l',
-'e', '_', 'f', 'i', 'l', 'e', 's', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v',
-'a', 'M', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'F', 'i', 'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e',
-'n', 'e', 'r', 'a', 't', 'e', '_', 'e', 'q', 'u', 'a', 'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ',
-'\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\031', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a',
-'l', 's', 'A', 'n', 'd', 'H', 'a', 's', 'h', '\022', ':', '\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_',
-'c', 'h', 'e', 'c', 'k', '_', 'u', 't', 'f', '8', '\030', '\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023',
-'j', 'a', 'v', 'a', 'S', 't', 'r', 'i', 'n', 'g', 'C', 'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p',
-'t', 'i', 'm', 'i', 'z', 'e', '_', 'f', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e',
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't',
-'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', ':', '\005', 'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z',
-'e', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'g', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R',
-'\t', 'g', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_',
-'s', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c',
-'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g',
-'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a',
-'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022',
-'5', '\n', '\023', 'p', 'y', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ',
-'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v',
-'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', ':',
-'\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', '_',
-'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n', 'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 'e',
-'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A', 'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', '_',
-'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 'C',
-'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', ')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 'e',
-'s', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t', 'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 'p',
-'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', '\t',
-'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 's',
-'s', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ', '\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 'P',
-'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', ' ',
-'\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', '_',
-'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 'R',
-'\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014',
-'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 'P',
-'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', '2',
-'\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e',
-'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p',
-'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e',
-'d', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't',
-'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'P',
-'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', '\014', 'L',
-'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J',
-'\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'', 'R', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_',
-'s', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o',
-'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o',
-'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g',
-'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n',
-'d', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030',
-'\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D',
-'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r',
-'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r',
-'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010',
-'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_',
-'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c',
-'t', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L',
-'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7',
-'\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e',
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a',
-'t', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p',
-'t', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
-'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R',
-'\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007',
-'\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J',
-'\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\235', '\r', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i',
-'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g',
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.',
-'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p',
-'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's',
-'t', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o',
-'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t',
-'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y',
-'\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n',
-'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's',
-'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r',
-'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r',
-'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l',
-'s', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030',
-'\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't',
-'\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's',
-'.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i',
-'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's',
-'.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't',
-'s', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003',
-'(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l',
-'d', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017',
-'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r',
-'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
-'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'U', '\n',
-'\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', '\030', '\026', ' ', '\001', '(', '\013', '2', ',', '.',
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i',
-'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u',
-'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e',
-'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't',
-'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032',
-'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't',
-'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b',
-'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a',
-'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\032', '\226', '\002', '\n', '\016', 'F', 'e', 'a', 't',
-'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'i', 'n', 't',
-'r', 'o', 'd', 'u', 'c', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
-'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'I', 'n',
-'t', 'r', 'o', 'd', 'u', 'c', 'e', 'd', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'p', 'r', 'e',
-'c', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
-'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'p', 'r',
-'e', 'c', 'a', 't', 'e', 'd', '\022', '/', '\n', '\023', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '_', 'w', 'a', 'r',
-'n', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\022', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', 'W', 'a',
-'r', 'n', 'i', 'n', 'g', '\022', 'A', '\n', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '\030',
-'\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E',
-'d', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'R', 'e', 'm', 'o', 'v', 'e', 'd', '\"', '/', '\n',
-'\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R',
-'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006',
-'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t',
-'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020',
-'\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R',
-'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T',
-'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N',
-'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T',
-'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_',
-'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_',
-'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T',
-'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_',
-'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_',
-'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y',
-'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E',
-'_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N',
-'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E',
-'_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E',
-'_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020',
-'\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022',
-'7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e',
-'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o',
-'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
-'t', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n',
-'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350',
-'\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037',
-'\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o',
-'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(',
-'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd',
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e',
-'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd',
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C',
-'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(',
-'\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u',
-'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e',
+'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's',
+'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.',
+'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'R', '\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n',
+'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', '_', 'd', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013',
+'2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D',
+'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l',
+'\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l',
+'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's',
+'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n',
+'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e',
+'d', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r',
+'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e',
+'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g',
+'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020',
+'\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o',
+'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007',
+'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022',
+'\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003',
+'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '\314', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's',
+'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e',
'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g',
'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e',
't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O',
-'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\330', '\002',
-'\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p',
-'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p',
-'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013',
-'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r',
-'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r',
-'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g',
-'R', 'e', 'd', 'a', 'c', 't', '\022', 'U', '\n', '\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't',
-'\030', '\004', ' ', '\001', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
-'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o',
-'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i',
-'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2',
-'$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r',
-'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't',
-'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S',
-'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's',
-'\030', '\"', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
-'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd',
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd',
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e',
-'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't',
-'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*',
-'\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i',
-'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005',
-'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm',
-'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o',
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n',
-'s', '.', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P',
-'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n',
-'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013',
-'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r',
-'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r',
-'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o',
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't',
-'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p',
-'t', 'i', 'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022',
-'\027', '\n', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022',
-'\023', '\n', '\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I',
-'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003',
-'\n', '\023', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004',
-'n', 'a', 'm', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o',
-'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N',
-'a', 'm', 'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i',
-'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e',
-'r', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a',
-'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l',
-'u', 'e', '\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030',
-'\005', ' ', '\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!',
-'\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u',
-'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030',
-'\007', ' ', '\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g',
-'r', 'e', 'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e',
-'g', 'a', 't', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t',
-'n', 'a', 'm', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't',
-'\022', '!', '\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i',
-'s', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\247', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't',
-'\022', '\221', '\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016',
-'2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r',
-'e', 'S', 'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '?', '\210', '\001', '\001', '\230', '\001',
-'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\204', '\007', '\242', '\001', '\r', '\022', '\010',
-'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030',
-'\350', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'l',
-'\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u',
-'m', 'T', 'y', 'p', 'e', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S',
-'E', 'D', '\030', '\204', '\007', '\242', '\001', '\t', '\022', '\004', 'O', 'P', 'E', 'N', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\010',
-'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\230', '\001', '\n', '\027', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e',
-'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p',
-'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '-', '\210', '\001', '\001', '\230', '\001',
-'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\030', '\204', '\007', '\242', '\001', '\013', '\022', '\006',
-'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd',
-'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '~', '\n', '\017', 'u', 't', 'f', '8', '_', 'v', 'a', 'l',
-'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
-'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', 'f', '8', 'V', 'a', 'l',
-'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\t', '\022', '\004', 'N', 'O',
-'N', 'E', '\030', '\204', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007',
-'R', '\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '~', '\n', '\020', 'm', 'e', 's', 's', 'a',
-'g', 'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's',
-'s', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '&', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001',
-'\024', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\204', '\007', '\262', '\001', '\003', '\010',
-'\350', '\007', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\202', '\001', '\n', '\013', 'j',
-'s', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e',
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n',
-'F', 'o', 'r', 'm', 'a', 't', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022',
-'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\204', '\007', '\242', '\001', '\n', '\022',
-'\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm',
-'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I',
-'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n',
-'\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002',
-'\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010',
-'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', 'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K',
-'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E',
-'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd',
-'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C',
-'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D',
-'\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\020', '\002', '\"', 'I', '\n', '\016', 'U', 't', 'f', '8', 'V',
-'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T',
-'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002',
-'\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"', '\004', '\010', '\001', '\020', '\001', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 'a',
-'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 'C',
-'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 'H',
-'_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', '\020',
-'\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'F',
-'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020',
-'\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', '\002',
-'*', '\006', '\010', '\350', '\007', '\020', '\213', 'N', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J',
-'\006', '\010', '\347', '\007', '\020', '\350', '\007', '\"', '\357', '\003', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f',
-'a', 'u', 'l', 't', 's', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<',
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S',
-'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't',
-'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm',
-'i', 'n', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o',
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i',
-'n', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e',
-'d', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
-'t', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i',
-'t', 'i', 'o', 'n', '\032', '\370', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o',
-'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016',
+'p', 't', 'i', 'o', 'n', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(',
+'\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n',
+'s', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't',
+'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010',
+'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u',
+'r', 'e', 's', '\022', 'm', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016',
+'2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's',
+'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't',
+'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', 'B', '\003', '\210', '\001', '\002',
+'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\224', '\001', '\n', '\013', 'D', 'e', 'c', 'l', 'a', 'r',
+'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u',
+'m', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010',
+'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 't',
+'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e',
+'s', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '\030', '\006', ' ', '\001', '(', '\010', 'R',
+'\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020', '\005', '\"', '4', '\n', '\021', 'V', 'e', 'r', 'i', 'f', 'i',
+'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n', '\013', 'D', 'E', 'C', 'L', 'A', 'R', 'A', 'T', 'I', 'O',
+'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', '\020', '\001', '*', '\t', '\010', '\350', '\007', '\020',
+'\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
+'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e',
+'\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022',
+'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r',
+'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', 'e', 'l', '\022', '>', '\n', '\004', 't', 'y', 'p', 'e', '\030',
+'\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F',
+'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'T', 'y', 'p', 'e', 'R',
+'\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R',
+'\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\030', '\002', ' ', '\001',
+'(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v',
+'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022',
+'\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', '\030', '\t', ' ', '\001', '(', '\005', 'R', '\n', 'o', 'n', 'e',
+'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(',
+'\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ',
+'\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e',
+'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'p', 'r', 'o',
+'t', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\016', 'p', 'r', 'o', 't', 'o',
+'3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'T', 'Y', 'P',
+'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020',
+'\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E',
+'_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005',
+'\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P',
+'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020',
+'\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P',
+'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E',
+'\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P',
+'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016',
+'\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y',
+'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N',
+'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 'C', '\n',
+'\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'O', 'P', 'T', 'I', 'O', 'N', 'A', 'L', '\020',
+'\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '\020', '\003', '\022', '\022', '\n', '\016',
+'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\002', '\"', 'c', '\n', '\024', 'O', 'n', 'e', 'o', 'f',
+'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001',
+' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001',
+'(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o',
+'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\343', '\002', '\n', '\023', 'E', 'n', 'u',
+'m', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030',
+'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(',
+'\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V',
+'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'v', 'a', 'l', 'u',
+'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g',
+'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007',
+'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e',
+'\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'n', 'u', 'm', 'R',
+'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n',
+'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\003', '(', '\t',
+'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', ';', '\n', '\021', 'E', 'n', 'u', 'm', 'R', 'e', 's',
+'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005',
+'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd',
+'\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P',
+'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022',
+'\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', ';',
+'\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's',
+'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c',
+'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t',
+'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '&', '.',
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's',
+'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\022', '9', '\n', '\007', 'o',
+'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
+'t', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't',
+'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
+'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e',
+'\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'i', 'n', 'p',
+'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001',
+'(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '8', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's',
+'\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '0', '\n',
+'\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005',
+'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\022', '0', '\n',
+'\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', ' ', '\001', '(', '\010', ':', '\005',
+'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\255', '\t',
+'\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 'v', 'a', '_', 'p', 'a', 'c',
+'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '0',
+'\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\030', '\010', ' ',
+'\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', 'C', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\022', '5',
+'\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', '_', 'f', 'i', 'l', 'e', 's', '\030', '\n', ' ', '\001',
+'(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', 'a', 'M', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'F', 'i',
+'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', '_', 'e', 'q', 'u', 'a',
+'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\031', 'j', 'a',
+'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', 'l', 's', 'A', 'n', 'd', 'H', 'a', 's', 'h', '\022', ':',
+'\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'c', 'h', 'e', 'c', 'k', '_', 'u', 't', 'f', '8', '\030',
+'\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'S', 't', 'r', 'i', 'n', 'g', 'C',
+'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', '_', 'f', 'o', 'r', '\030',
+'\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F',
+'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', ':', '\005',
+'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'g', 'o', '_',
+'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\t', 'g', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022',
+'5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\020', ' ',
+'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v',
+'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v',
+'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'G', 'e',
+'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '5', '\n', '\023', 'p', 'y', '_', 'g', 'e', 'n', 'e', 'r',
+'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R',
+'\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p',
+'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p',
+'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', '_', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n',
+'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 'e', 'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A',
+'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i',
+'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022',
+')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t',
+'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f',
+'t', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', '\t', 'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f',
+'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ',
+'\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h',
+'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', ' ', '\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm',
+'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a',
+'m', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 'R', '\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't',
+'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g',
+'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f',
+'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
+'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r',
+'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o',
+'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n',
+'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i',
+'m', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O',
+'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', '\014', 'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E',
+'\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'',
+'R', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\"', '\364', '\003',
+'\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a',
+'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':',
+'\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g', 'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r',
+'m', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i',
+'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's',
+'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c',
+'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(',
+'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm',
+'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022',
+'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n',
+'_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030',
+'\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i',
+'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030',
+'\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F',
+'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n',
+'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013',
+'2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e',
+'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e',
+'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020',
+'\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n',
+'\"', '\235', '\r', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p',
+'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f',
+'.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I',
+'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010',
+'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', 't', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2',
+'$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p',
+'t', 'i', 'o', 'n', 's', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006',
+'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l',
+'s', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a',
+'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i',
+'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(',
+'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w',
+'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n',
+'\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's',
+'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i',
+'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e',
+'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e',
+'t', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g',
+'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o',
+'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e',
+'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'E', 'd',
+'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a',
+'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.',
+'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e',
+'t', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'U', '\n', '\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u',
+'p', 'p', 'o', 'r', 't', '\030', '\026', ' ', '\001', '(', '\013', '2', ',', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't',
+'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e',
+'S', 'u', 'p', 'p', 'o', 'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X',
+'\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007',
+' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n',
+'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e',
+'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', 'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D',
+'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030',
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R',
+'\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005',
+'v', 'a', 'l', 'u', 'e', '\032', '\226', '\002', '\n', '\016', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022',
+'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'i', 'n', 't', 'r', 'o', 'd', 'u', 'c', 'e', 'd', '\030', '\001', ' ', '\001',
+'(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't',
+'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'I', 'n', 't', 'r', 'o', 'd', 'u', 'c', 'e', 'd', '\022', 'G', '\n',
+'\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\016',
'2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o',
-'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'N', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'a', 'b', 'l', 'e',
-'_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\023', 'o', 'v', 'e', 'r',
-'r', 'i', 'd', 'a', 'b', 'l', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'B', '\n', '\016', 'f', 'i', 'x', 'e', 'd', '_',
-'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\r', 'f', 'i', 'x', 'e', 'd',
-'F', 'e', 'a', 't', 'u', 'r', 'e', 's', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\010', 'f', 'e', 'a',
-'t', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022',
-'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l',
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o',
-'.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L',
-'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001',
-'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R',
-'\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's',
-'\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+',
-'\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t',
-'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a',
-'d', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ',
-'\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e',
-'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o',
-'\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o',
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o',
-'d', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a',
-'t', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a',
-'t', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u',
-'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l',
-'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020',
-'\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', 'R', '\n', '\010', 's', 'e', 'm', 'a', 'n',
-'t', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b',
-'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o',
-'t', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c',
-'\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n',
-'\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\247', '\002', '\n', '\007', 'E', 'd', 'i',
-'t', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000',
-'\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', '\020', '\204', '\007', '\022', '\023', '\n', '\016',
-'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T',
-'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_',
-'2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351',
-'\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020',
-'\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020',
-'\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O',
-'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_',
-'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_',
-'9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D',
-'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o',
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r',
-'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o',
-'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p',
-'t', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P',
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n',
+'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '/', '\n', '\023', 'd',
+'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '_', 'w', 'a', 'r', 'n', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'R',
+'\022', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', 'W', 'a', 'r', 'n', 'i', 'n', 'g', '\022', 'A', '\n', '\017', 'e', 'd',
+'i', 't', 'i', 'o', 'n', '_', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o',
+'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'e', 'd', 'i',
+'t', 'i', 'o', 'n', 'R', 'e', 'm', 'o', 'v', 'e', 'd', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S',
+'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I',
+'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J',
+'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001',
+'\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', '\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n',
+'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N',
+'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T',
+'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E',
+'\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027',
+'\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024',
+'\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T',
+'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T', 'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G',
+'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G',
+'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020',
+'\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022',
+'\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026',
+'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022',
+'\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022',
+'\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t',
+'\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n',
+'\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's',
+'\030', '\001', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u',
+'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(',
+'\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't',
+'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r',
+'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n',
+'\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i',
+'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd',
+'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd',
+'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l',
+'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't',
+'s', '\030', '\006', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e',
+'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n',
+'\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.',
+'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't',
+'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't',
+'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o',
+'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023',
+'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020',
+'\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\330', '\002', '\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e',
+'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001',
+'(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010',
+'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u',
+'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010',
+':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'U', '\n', '\017', 'f',
+'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', ',', '.', 'g', 'o',
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n',
+'s', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', 'r', 'e',
+'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_',
+'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r',
+'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o',
+'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010',
+'\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o',
+'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\"', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o',
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R',
+'\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!',
+' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X',
+'\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007',
+' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n',
+'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e',
+'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"',
+'\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r',
+'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r',
+'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v',
+'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u',
+'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n',
+'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N',
+'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010',
+'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u',
+'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i',
+'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b',
+'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u',
+'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e',
+'m', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E',
+'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_',
+'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002',
+'*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r',
+'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2',
+'-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r',
+'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a',
+'m', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ',
+'\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p',
+'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020',
+'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't',
+'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a',
+'t', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a',
+'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n',
+'\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i',
+'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u',
+'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J',
+'\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', 'm', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001',
+' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', '\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e',
+'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"',
+'\247', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '\022', '\221', '\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_',
+'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P',
+'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '?', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X',
+'P', 'L', 'I', 'C', 'I', 'T', '\030', '\204', '\007', '\242', '\001', '\r', '\022', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007',
+'\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\350', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\r', 'f',
+'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'l', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e',
+'\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 'B', ')', '\210', '\001', '\001', '\230',
+'\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\030', '\204', '\007', '\242', '\001', '\t', '\022', '\004', 'O',
+'P', 'E', 'N', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\230', '\001',
+'\n', '\027', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', 'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g',
+'\030', '\003', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E',
+'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '-', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X',
+'P', 'A', 'N', 'D', 'E', 'D', '\030', '\204', '\007', '\242', '\001', '\013', '\022', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', '\262', '\001',
+'\003', '\010', '\350', '\007', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i',
+'n', 'g', '\022', '~', '\n', '\017', 'u', 't', 'f', '8', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001',
+'(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't',
+'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', ')', '\210', '\001',
+'\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\t', '\022', '\004', 'N', 'O', 'N', 'E', '\030', '\204', '\007', '\242', '\001', '\013', '\022', '\006', 'V',
+'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd',
+'a', 't', 'i', 'o', 'n', '\022', '~', '\n', '\020', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g',
+'\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n',
+'g', 'B', '&', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\024', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P',
+'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\204', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e',
+'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\202', '\001', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030',
+'\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F',
+'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'B', '9', '\210', '\001', '\001',
+'\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T',
+'_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\204', '\007', '\242', '\001', '\n', '\022', '\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', '\007', '\262', '\001',
+'\003', '\010', '\350', '\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd',
+'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', 'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C',
+'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001',
+'\022', '\014', '\n', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', '\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_',
+'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n',
+'\021', 'E', 'N', 'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O',
+'P', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e',
+'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E',
+'A', 'T', 'E', 'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O',
+'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N',
+'D', 'E', 'D', '\020', '\002', '\"', 'I', '\n', '\016', 'U', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033',
+'\n', '\027', 'U', 'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N',
+'\020', '\000', '\022', '\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"',
+'\004', '\010', '\001', '\020', '\001', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022',
+'\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O',
+'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001',
+'\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', '\020', '\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o',
+'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'F', 'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O',
+'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y',
+'_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', '\002', '*', '\006', '\010', '\350', '\007', '\020', '\213', 'N', '*', '\006', '\010',
+'\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J', '\006', '\010', '\347', '\007', '\020', '\350', '\007', '\"', '\357', '\003', '\n',
+'\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'X', '\n', '\010', 'd', 'e',
+'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
+'t', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '.',
+'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R',
+'\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't',
+'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b',
+'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o',
+'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(',
+'\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i',
+'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\032', '\370', '\001', '\n', '\030', 'F', 'e',
+'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n',
+'\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p',
+'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022',
+'N', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'a', 'b', 'l', 'e', '_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\004',
+' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e',
+'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\023', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'a', 'b', 'l', 'e', 'F', 'e', 'a', 't',
+'u', 'r', 'e', 's', '\022', 'B', '\n', '\016', 'f', 'i', 'x', 'e', 'd', '_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\005', ' ',
+'\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a',
+'t', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\r', 'f', 'i', 'x', 'e', 'd', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', 'J', '\004', '\010',
+'\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\"', '\265', '\002', '\n', '\016', 'S',
+'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n',
+'\030', '\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.',
+'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010',
+'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004',
+'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's',
+'p', 'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e',
+'a', 'd', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a',
+'d', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_',
+'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C',
+'o', 'm', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h',
+'e', 'd', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n',
+'g', 'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '*', '\014', '\010', '\200', '\354', '\312', '\377', '\001',
+'\020', '\201', '\354', '\312', '\377', '\001', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I',
+'n', 'f', 'o', '\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-',
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e',
+'d', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n',
+'o', 't', 'a', 't', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n',
+'\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013',
+'s', 'o', 'u', 'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e',
+'F', 'i', 'l', 'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i',
+'n', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', 'R', '\n', '\010', 's', 'e',
+'m', 'a', 'n', 't', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o',
+'t', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A',
+'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n',
+'t', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000',
+'\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\247', '\002', '\n', '\007',
+'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W',
+'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', '\020', '\204', '\007', '\022',
+'\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E',
+'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I',
+'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2',
+'4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N',
+'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N',
+'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S',
+'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9',
+'9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I',
+'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n',
+'\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm',
+'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p',
+'t', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n',
+'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c',
+'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l',
+'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n',
};
static _upb_DefPool_Init *deps[1] = {
@@ -511,5 +512,5 @@ _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = {
deps,
&google_protobuf_descriptor_proto_upb_file_layout,
"google/protobuf/descriptor.proto",
- UPB_STRINGVIEW_INIT(descriptor, 12268)
+ UPB_STRINGVIEW_INIT(descriptor, 12296)
};
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
index 4636f5b64951c..02414587a3422 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -190,4 +190,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_GeneratedCodeInfo_Annotation_ge
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
index 5e3cba41f955f..6743e8a046441 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Duration_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
index 69eccefe874f6..6b54cbce971e2 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Empty_getmsgdef(upb_DefPool *s)
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
index 887da56be7353..b8a6518e70d24 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_ListValue_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
index ba9e2920ad11b..3acd215c91fc2 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Timestamp_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
index 310247c946c01..03b213600de04 100644
--- a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_BytesValue_getmsgdef(upb_DefPoo
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
index 2dd25f9d20d41..346a14134818e 100644
--- a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
-#define GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_
+#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_
+#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_rpc_Status_getmsgdef(upb_DefPool *s) {
#include "upb/port/undef.inc"
-#endif /* GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ */
+#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
index 18f71d42eef12..b3dde7ab1454d 100644
--- a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_
-#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_
+#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *opencensus_proto_trace_v1_RateLimitingSampler_g
#include "upb/port/undef.inc"
-#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
index f3121fc5162c5..16458a64df03b 100644
--- a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_
-#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_
+#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_
+#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *grpc_lookup_v1_RouteLookupClusterSpecifier_getm
#include "upb/port/undef.inc"
-#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ */
+#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
index bc7e16bf234a7..a91f76f1442db 100644
--- a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_
+#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_
+#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_FileMigrateAnnotation_getmsgde
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ */
+#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
index f9e5c9580d51d..089b5e96e046a 100644
--- a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_
+#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_
+#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_FieldSecurityAnnotation_getmsg
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ */
+#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
index 27f1dc4538e25..f35f083f75968 100644
--- a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_
+#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_
+#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ */
+#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
index fdea4a7c4034b..163627d711a15 100644
--- a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_
+#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_
+#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_StatusAnnotation_getmsgdef(upb
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ */
+#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
index 36f9b90dbeab9..47b26cfa1a300 100644
--- a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
-#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_
+#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_
+#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_VersioningAnnotation_getmsgdef
#include "upb/port/undef.inc"
-#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ */
+#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
index 5028ab2071eff..afe2383041406 100644
--- a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef VALIDATE_VALIDATE_PROTO_UPBDEFS_H_
-#define VALIDATE_VALIDATE_PROTO_UPBDEFS_H_
+#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_
+#define VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -140,4 +140,4 @@ UPB_INLINE const upb_MessageDef *validate_TimestampRules_getmsgdef(upb_DefPool *
#include "upb/port/undef.inc"
-#endif /* VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ */
+#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
index 2295609edef79..2f6053f702b10 100644
--- a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_
+#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileMigrateAnnotation_getmsg
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ */
+#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
index 3722cc195379c..0e63a877d3b0f 100644
--- a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_
+#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldSecurityAnnotation_getm
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
index 68f4870a61330..eaa10bf683bd6 100644
--- a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_
+#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -25,4 +25,4 @@ extern _upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit;
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ */
+#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
index 098db82705db3..e545a685650fa 100644
--- a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_
+#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_StatusAnnotation_getmsgdef(u
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ */
+#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
index 63f26c1d348ec..1253c730d6858 100644
--- a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
-#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_
+#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_VersioningAnnotation_getmsgd
#include "upb/port/undef.inc"
-#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ */
+#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
index 55100cb16c66e..76c1e3060aedc 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_Authority_getmsgdef(upb_DefPool *s)
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
index 592c10c618c53..97c527270a598 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_CidrRange_getmsgdef(upb_DefPool *s)
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
index 10db1bfacaee5..4f3607b54c4ab 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_CollectionEntry_InlineEntry_getmsgd
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
index 8390a911ee24d..833e084349825 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ContextParams_ParamsEntry_getmsgdef
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
index eeda9b711e455..1ce988907c541 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_TypedExtensionConfig_getmsgdef(upb_
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
index 4beca8e3ed77e..cdd7bc5cbe29c 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_Resource_getmsgdef(upb_DefPool *s)
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
index 1f45931d9c54e..dc43f9878195a 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ResourceLocator_Directive_getmsgdef
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
index 28bebb0e5fcda..019b946ccbb93 100644
--- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_
-#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_
+#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ResourceName_getmsgdef(upb_DefPool
#include "upb/port/undef.inc"
-#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ */
+#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
index 8c19401d8e94f..9fd606f5c1c6f 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_CelMatcher_getmsgdef(upb_De
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
index 682614796a7a3..390cd0ec891cf 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ServerNameMatcher_DomainMat
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
index 8bbd630a05efc..aa89b4517b832 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_HttpAttributesCelMatchInput
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
index 80dfb5fcb2a1c..4772d3247a1ff 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ge
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
index 9e0f78a9eb502..389cebb5f6a10 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMa
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
index 56615f248b4f8..bc3a84c93a2dd 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -55,4 +55,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_RangeMat
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
index 54c68cc08ff05..d9a5740e72995 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_GoogleRE2_getm
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
index aba5339ea31b6..2652fd734976f 100644
--- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
-#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ListStringMatcher_getmsgdef
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
index 725e8510cb589..0726c4461c0b0 100644
--- a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefP
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
index 7cde07bea6aa5..cc589ef8d874c 100644
--- a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
index 68948ea951144..b1f48d5eb72ba 100644
--- a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
+++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
-#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_
#include "upb/reflection/def.h"
#include "upb/reflection/internal/def_pool.h"
@@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool *
#include "upb/port/undef.inc"
-#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */
+#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 1c848e159eb97..28605ea687404 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -202,7 +202,7 @@
- name: time_caching_in_party
description: Disable time caching in exec_ctx, and enable it only in a single party execution.
owner: ctiller@google.com
- expiry: 2024/12/12
+ expiry: 2025/01/17
test_tags: []
- name: trace_record_callops
description: Enables tracing of call batch initiation and completion.
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h
index b31d9126459ac..aa4c8dc5ca5e4 100644
--- a/src/core/lib/promise/detail/promise_like.h
+++ b/src/core/lib/promise/detail/promise_like.h
@@ -101,6 +101,29 @@ class PromiseLike::Type;
};
+template
+class PromiseLike= 201703L) || \
+ (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+ std::invoke_result_t
+#else
+ typename std::result_of::type
+#endif
+ >::value>> {
+ private:
+ GPR_NO_UNIQUE_ADDRESS RemoveCVRef f_;
+
+ public:
+ // NOLINTNEXTLINE - internal detail that drastically simplifies calling code.
+ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PromiseLike(F&& f)
+ : f_(std::forward(f)) {}
+ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() {
+ f_();
+ return Empty{};
+ }
+ using Result = Empty;
+};
+
} // namespace promise_detail
} // namespace grpc_core
diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h
index aa9e1ac581bc2..7c49dfbdf6ac7 100644
--- a/src/core/lib/promise/map.h
+++ b/src/core/lib/promise/map.h
@@ -31,8 +31,20 @@ namespace promise_detail {
// Implementation of mapping combinator - use this via the free function below!
// Promise is the type of promise to poll on, Fn is a function that takes the
// result of Promise and maps it to some new type.
+template
+class Map;
+
template
-class Map {
+class Map= 201703L) || \
+ (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+ std::invoke_result_t::Result>
+#else
+ typename std::result_of::Result)>::type
+#endif
+ >::value>> {
public:
GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Map(Promise promise, Fn fn)
: promise_(std::move(promise)), fn_(std::move(fn)) {}
@@ -61,6 +73,45 @@ class Map {
Fn fn_;
};
+template
+class Map= 201703L) || \
+ (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+ std::invoke_result_t::Result>
+#else
+ typename std::result_of::Result)>::type
+#endif
+ >::value>> {
+ public:
+ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Map(Promise promise, Fn fn)
+ : promise_(std::move(promise)), fn_(std::move(fn)) {}
+
+ Map(const Map&) = delete;
+ Map& operator=(const Map&) = delete;
+ // NOLINTNEXTLINE(performance-noexcept-move-constructor): clang6 bug
+ Map(Map&& other) = default;
+ // NOLINTNEXTLINE(performance-noexcept-move-constructor): clang6 bug
+ Map& operator=(Map&& other) = default;
+
+ using PromiseResult = typename PromiseLike::Result;
+ using Result = Empty;
+
+ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() {
+ Poll r = promise_();
+ if (auto* p = r.value_if_ready()) {
+ fn_(std::move(*p));
+ return Empty{};
+ }
+ return Pending();
+ }
+
+ private:
+ PromiseLike promise_;
+ Fn fn_;
+};
+
} // namespace promise_detail
// Mapping combinator.
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index ac233e2d43598..b7c38baaf671d 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -359,50 +359,6 @@ void Party::RunPartyAndUnref(uint64_t prev_state) {
}
}
-void Party::AddParticipants(Participant** participants, size_t count) {
- GRPC_LATENT_SEE_INNER_SCOPE("Party::AddParticipants");
- uint64_t state = state_.load(std::memory_order_acquire);
- uint64_t allocated;
-
- size_t slots[party_detail::kMaxParticipants];
-
- // Find slots for each new participant, ordering them from lowest available
- // slot upwards to ensure the same poll ordering as presentation ordering to
- // this function.
- WakeupMask wakeup_mask;
- uint64_t new_state;
- do {
- wakeup_mask = 0;
- allocated = (state & kAllocatedMask) >> kAllocatedShift;
- for (size_t i = 0; i < count; i++) {
- auto new_mask = LowestOneBit(~allocated);
- if (GPR_UNLIKELY((new_mask & kWakeupMask) == 0)) {
- DelayAddParticipants(participants, count);
- return;
- }
- wakeup_mask |= new_mask;
- allocated |= new_mask;
- slots[i] = absl::countr_zero(new_mask);
- }
- // Try to allocate this slot and take a ref (atomically).
- // Ref needs to be taken because once we store the participant it could be
- // spuriously woken up and unref the party.
- new_state = (state | (allocated << kAllocatedShift)) + kOneRef;
- } while (!state_.compare_exchange_weak(
- state, new_state, std::memory_order_acq_rel, std::memory_order_acquire));
- LogStateChange("AddParticipantsAndRef", state, new_state);
-
- for (size_t i = 0; i < count; i++) {
- GRPC_TRACE_LOG(party_state, INFO)
- << "Party " << this << " AddParticipant: " << slots[i]
- << " " << participants[i];
- participants_[slots[i]].store(participants[i], std::memory_order_release);
- }
-
- // Now we need to wake up the party.
- WakeupFromState(new_state, wakeup_mask);
-}
-
void Party::AddParticipant(Participant* participant) {
GRPC_LATENT_SEE_INNER_SCOPE("Party::AddParticipant");
uint64_t state = state_.load(std::memory_order_acquire);
@@ -418,7 +374,7 @@ void Party::AddParticipant(Participant* participant) {
allocated = (state & kAllocatedMask) >> kAllocatedShift;
wakeup_mask = LowestOneBit(~allocated);
if (GPR_UNLIKELY((wakeup_mask & kWakeupMask) == 0)) {
- DelayAddParticipants(&participant, 1);
+ DelayAddParticipant(participant);
return;
}
DCHECK_NE(wakeup_mask & kWakeupMask, 0u)
@@ -441,20 +397,16 @@ void Party::AddParticipant(Participant* participant) {
WakeupFromState(new_state, wakeup_mask);
}
-void Party::DelayAddParticipants(Participant** participants, size_t count) {
+void Party::DelayAddParticipant(Participant* participant) {
// We need to delay the addition of participants.
IncrementRefCount();
- VLOG_EVERY_N_SEC(2, 10) << "Delaying addition of " << count
- << " participants to party " << this
- << " because it is full.";
- std::vector delayed_participants{participants,
- participants + count};
+ VLOG_EVERY_N_SEC(2, 10) << "Delaying addition of participant to party "
+ << this << " because it is full.";
arena_->GetContext()->Run(
- [this, delayed_participants = std::move(delayed_participants)]() mutable {
+ [this, participant]() mutable {
ApplicationCallbackExecCtx app_exec_ctx;
ExecCtx exec_ctx;
- AddParticipants(delayed_participants.data(),
- delayed_participants.size());
+ AddParticipant(participant);
Unref();
});
}
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index 437fe8edbdfa2..b12019085a461 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -82,6 +82,52 @@ class Party : public Activity, private Wakeable {
Party(const Party&) = delete;
Party& operator=(const Party&) = delete;
+ // When calling into a Party from outside the promises system we often would
+ // like to perform more than one action.
+ // This class tries to acquire the party lock just once - if it succeeds then
+ // it runs the party in its destructor, effectively holding all wakeups of the
+ // party until it goes out of scope.
+ // If it fails, presumably some other thread holds the lock - and in this case
+ // we don't attempt to do any buffering.
+ class WakeupHold {
+ public:
+ WakeupHold() = default;
+ explicit WakeupHold(Party* party)
+ : prev_state_(party->state_.load(std::memory_order_relaxed)) {
+ // Try to lock
+ if ((prev_state_ & kLocked) == 0 &&
+ party->state_.compare_exchange_weak(prev_state_,
+ (prev_state_ | kLocked) + kOneRef,
+ std::memory_order_relaxed)) {
+ DCHECK_EQ(prev_state_ & ~(kRefMask | kAllocatedMask), 0u)
+ << "Party should have contained no wakeups on lock";
+ // If we win, record that fact for the destructor
+ party->LogStateChange("WakeupHold", prev_state_,
+ (prev_state_ | kLocked) + kOneRef);
+ party_ = party;
+ }
+ }
+ WakeupHold(const WakeupHold&) = delete;
+ WakeupHold& operator=(const WakeupHold&) = delete;
+ WakeupHold(WakeupHold&& other) noexcept
+ : party_(std::exchange(other.party_, nullptr)),
+ prev_state_(other.prev_state_) {}
+ WakeupHold& operator=(WakeupHold&& other) noexcept {
+ std::swap(party_, other.party_);
+ std::swap(prev_state_, other.prev_state_);
+ return *this;
+ }
+
+ ~WakeupHold() {
+ if (party_ == nullptr) return;
+ party_->RunLockedAndUnref(party_, prev_state_);
+ }
+
+ private:
+ Party* party_ = nullptr;
+ uint64_t prev_state_;
+ };
+
static RefCountedPtr Make(RefCountedPtr arena) {
auto* arena_ptr = arena.get();
return RefCountedPtr(arena_ptr->New(std::move(arena)));
@@ -135,23 +181,6 @@ class Party : public Activity, private Wakeable {
Arena* arena() { return arena_.get(); }
- class BulkSpawner {
- public:
- explicit BulkSpawner(Party* party) : party_(party) {}
- ~BulkSpawner() {
- party_->AddParticipants(participants_, num_participants_);
- }
-
- template
- void Spawn(absl::string_view name, Factory promise_factory,
- OnComplete on_complete);
-
- private:
- Party* const party_;
- size_t num_participants_ = 0;
- Participant* participants_[party_detail::kMaxParticipants];
- };
-
protected:
friend class Arena;
@@ -386,9 +415,8 @@ class Party : public Activity, private Wakeable {
void Drop(WakeupMask wakeup_mask) final;
// Add a participant (backs Spawn, after type erasure to ParticipantFactory).
- void AddParticipants(Participant** participant, size_t count);
void AddParticipant(Participant* participant);
- void DelayAddParticipants(Participant** participant, size_t count);
+ void DelayAddParticipant(Participant* participant);
GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void LogStateChange(
const char* op, uint64_t prev_state, uint64_t new_state,
@@ -417,16 +445,6 @@ struct ContextSubclass {
using Base = Activity;
};
-template
-void Party::BulkSpawner::Spawn(absl::string_view name, Factory promise_factory,
- OnComplete on_complete) {
- GRPC_TRACE_LOG(promise_primitives, INFO)
- << party_->DebugTag() << "[bulk_spawn] On " << this << " queue " << name
- << " (" << sizeof(ParticipantImpl) << " bytes)";
- participants_[num_participants_++] = new ParticipantImpl(
- name, std::move(promise_factory), std::move(on_complete));
-}
-
template
void Party::Spawn(absl::string_view name, Factory promise_factory,
OnComplete on_complete) {
diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
index a343477c5a4af..f499a6ae8ece0 100644
--- a/src/core/lib/resource_quota/memory_quota.cc
+++ b/src/core/lib/resource_quota/memory_quota.cc
@@ -130,8 +130,18 @@ class SliceRefCount : public grpc_slice_refcount {
size_t size_;
};
+std::atomic container_memory_pressure{0.0};
+
} // namespace
+void SetContainerMemoryPressure(double pressure) {
+ container_memory_pressure.store(pressure, std::memory_order_relaxed);
+}
+
+double ContainerMemoryPressure() {
+ return container_memory_pressure.load(std::memory_order_relaxed);
+}
+
//
// Reclaimer
//
@@ -646,7 +656,8 @@ BasicMemoryQuota::PressureInfo BasicMemoryQuota::GetPressureInfo() {
double size = quota_size;
if (size < 1) return PressureInfo{1, 1, 1};
PressureInfo pressure_info;
- pressure_info.instantaneous_pressure = std::max(0.0, (size - free) / size);
+ pressure_info.instantaneous_pressure =
+ std::max({0.0, (size - free) / size, ContainerMemoryPressure()});
pressure_info.pressure_control_value =
pressure_tracker_.AddSampleAndGetControlValue(
pressure_info.instantaneous_pressure);
diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h
index 5d70549b33da1..f1f21701b2cb4 100644
--- a/src/core/lib/resource_quota/memory_quota.h
+++ b/src/core/lib/resource_quota/memory_quota.h
@@ -588,6 +588,10 @@ inline MemoryQuotaRefPtr MakeMemoryQuota(std::string name) {
std::vector> AllMemoryQuotas();
+void SetContainerMemoryPressure(double pressure);
+
+double ContainerMemoryPressure();
+
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc
index c5a8eb1279e22..dc0fd502fe7f0 100644
--- a/src/core/lib/surface/client_call.cc
+++ b/src/core/lib/surface/client_call.cc
@@ -162,7 +162,6 @@ void ClientCall::CancelWithError(grpc_error_handle error) {
"CancelWithError", [self = WeakRefAsSubclass(),
error = std::move(error)]() mutable {
self->started_call_initiator_.Cancel(std::move(error));
- return Empty{};
});
return;
default:
@@ -225,7 +224,8 @@ void ClientCall::ScheduleCommittedBatch(Batch batch) {
}
}
-void ClientCall::StartCall(const grpc_op& send_initial_metadata_op) {
+Party::WakeupHold ClientCall::StartCall(
+ const grpc_op& send_initial_metadata_op) {
GRPC_LATENT_SEE_INNER_SCOPE("ClientCall::StartCall");
auto cur_state = call_state_.load(std::memory_order_acquire);
CToMetadata(send_initial_metadata_op.data.send_initial_metadata.metadata,
@@ -235,38 +235,44 @@ void ClientCall::StartCall(const grpc_op& send_initial_metadata_op) {
*send_initial_metadata_);
auto call = MakeCallPair(std::move(send_initial_metadata_), arena()->Ref());
started_call_initiator_ = std::move(call.initiator);
- while (true) {
- GRPC_TRACE_LOG(call, INFO)
- << DebugTag() << "StartCall " << GRPC_DUMP_ARGS(cur_state);
- switch (cur_state) {
- case kUnstarted:
- if (call_state_.compare_exchange_strong(cur_state, kStarted,
- std::memory_order_acq_rel,
- std::memory_order_acquire)) {
- call_destination_->StartCall(std::move(call.handler));
- return;
- }
- break;
- case kStarted:
- Crash("StartCall called twice"); // probably we crash earlier...
- case kCancelled:
- return;
- default: { // UnorderedStart
- if (call_state_.compare_exchange_strong(cur_state, kStarted,
- std::memory_order_acq_rel,
- std::memory_order_acquire)) {
- call_destination_->StartCall(std::move(call.handler));
- auto unordered_start = reinterpret_cast(cur_state);
- while (unordered_start->next != nullptr) {
- unordered_start->start_pending_batch();
- auto next = unordered_start->next;
- delete unordered_start;
- unordered_start = next;
- }
- return;
+ Party::WakeupHold wakeup_hold{started_call_initiator_.party()};
+ while (!StartCallMaybeUpdateState(cur_state, call.handler)) {
+ }
+ return wakeup_hold;
+}
+
+bool ClientCall::StartCallMaybeUpdateState(uintptr_t& cur_state,
+ UnstartedCallHandler& handler) {
+ GRPC_TRACE_LOG(call, INFO)
+ << DebugTag() << "StartCall " << GRPC_DUMP_ARGS(cur_state);
+ switch (cur_state) {
+ case kUnstarted:
+ if (call_state_.compare_exchange_strong(cur_state, kStarted,
+ std::memory_order_acq_rel,
+ std::memory_order_acquire)) {
+ call_destination_->StartCall(std::move(handler));
+ return true;
+ }
+ return false;
+ case kStarted:
+ Crash("StartCall called twice"); // probably we crash earlier...
+ case kCancelled:
+ return true;
+ default: { // UnorderedStart
+ if (call_state_.compare_exchange_strong(cur_state, kStarted,
+ std::memory_order_acq_rel,
+ std::memory_order_acquire)) {
+ call_destination_->StartCall(std::move(handler));
+ auto unordered_start = reinterpret_cast(cur_state);
+ while (unordered_start->next != nullptr) {
+ unordered_start->start_pending_batch();
+ auto next = unordered_start->next;
+ delete unordered_start;
+ unordered_start = next;
}
- break;
+ return true;
}
+ return false;
}
}
}
@@ -332,8 +338,9 @@ void ClientCall::CommitBatch(const grpc_op* ops, size_t nops, void* notify_tag,
auto primary_ops = AllOk(
TrySeq(std::move(send_message), std::move(send_close_from_client)),
TrySeq(std::move(recv_initial_metadata), std::move(recv_message)));
+ Party::WakeupHold wakeup_hold;
if (const grpc_op* op = op_index.op(GRPC_OP_SEND_INITIAL_METADATA)) {
- StartCall(*op);
+ wakeup_hold = StartCall(*op);
}
if (const grpc_op* op = op_index.op(GRPC_OP_RECV_STATUS_ON_CLIENT)) {
auto out_status = op->data.recv_status_on_client.status;
diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h
index d2f86e93d9d4e..d9a0402c6aab3 100644
--- a/src/core/lib/surface/client_call.h
+++ b/src/core/lib/surface/client_call.h
@@ -128,7 +128,15 @@ class ClientCall final
bool is_notify_tag_closure);
template
void ScheduleCommittedBatch(Batch batch);
- void StartCall(const grpc_op& send_initial_metadata_op);
+ Party::WakeupHold StartCall(const grpc_op& send_initial_metadata_op);
+ // Attempt to start the call and send handler down the stack; returns true if
+ // state was updated, false otherwise (with cur_state updated to the new
+ // current state).
+ // If this function returns false, it's guaranteed that handler is not
+ // touched.
+ // Should be called repeatedly until it returns true.
+ bool StartCallMaybeUpdateState(uintptr_t& cur_state,
+ UnstartedCallHandler& handler);
std::string DebugTag() { return absl::StrFormat("CLIENT_CALL[%p]: ", this); }
diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h
index a69673adc550a..d07f3716d15a3 100644
--- a/src/core/lib/surface/server_call.h
+++ b/src/core/lib/surface/server_call.h
@@ -80,7 +80,6 @@ class ServerCall final : public Call, public DualRefCounted {
[self = WeakRefAsSubclass(), error = std::move(error)] {
self->call_handler_.PushServerTrailingMetadata(
CancelledServerMetadataFromStatus(error));
- return Empty{};
});
}
bool is_trailers_only() const override {
diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc
index 93831a87b980c..ad0153f96f8e3 100644
--- a/src/core/lib/transport/call_spine.cc
+++ b/src/core/lib/transport/call_spine.cc
@@ -45,10 +45,8 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
call_initiator.SpawnInfallible("finish-downstream-ok",
[call_initiator]() mutable {
call_initiator.FinishSends();
- return Empty{};
});
}
- return Empty{};
});
});
call_handler.SpawnInfallible(
@@ -111,9 +109,7 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
"recv_trailing",
[call_handler, md = std::move(md)]() mutable {
call_handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
- return Empty{};
});
});
}
diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
index 56b4d13ad38bc..cd77d84f12da1 100644
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@@ -2,6 +2,6 @@
2.69.0-dev
- 3.28.1
+ 3.29.0
diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
index 09170bdc12513..3c116992d7f1d 100644
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -100,7 +100,7 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
- s.dependency '!ProtoCompiler', '3.28.1'
+ s.dependency '!ProtoCompiler', '3.29.0'
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.14'
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
index 67a5213a16f5b..9b4db1ad6d501 100644
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -102,7 +102,7 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
- s.dependency '!ProtoCompiler', '3.28.1'
+ s.dependency '!ProtoCompiler', '3.29.0'
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.14'
diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec
index bf1756ab99a2f..7cbef699326bf 100644
--- a/src/objective-c/!ProtoCompiler.podspec
+++ b/src/objective-c/!ProtoCompiler.podspec
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler'
- v = '3.28.1'
+ v = '3.29.0'
s.version = v
s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
s.description = <<-DESC
diff --git a/templates/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_clang_19_x64/Dockerfile.template
similarity index 97%
rename from templates/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/cxx_clang_19_x64/Dockerfile.template
index 90ee8fb22f28c..5a4f58e844c9c 100644
--- a/templates/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_clang_19_x64/Dockerfile.template
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- FROM silkeh/clang:18-bookworm
+ FROM silkeh/clang:19-bookworm
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
<%include file="../../git_avoid_dubious_ownership_error.include"/>
diff --git a/test/core/call/bm_client_call.cc b/test/core/call/bm_client_call.cc
index d72e705e07329..58a0c3c4bb983 100644
--- a/test/core/call/bm_client_call.cc
+++ b/test/core/call/bm_client_call.cc
@@ -160,7 +160,6 @@ void BM_Unary(benchmark::State& state) {
Arena::MakePooledForOverwrite();
trailing_metadata->Set(GrpcStatusMetadata(), GRPC_STATUS_OK);
handler.PushServerTrailingMetadata(std::move(trailing_metadata));
- return Empty{};
});
});
auto ev = grpc_completion_queue_next(
diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc
index 2d09480acfe81..39db90f047ce6 100644
--- a/test/core/client_channel/client_channel_test.cc
+++ b/test/core/client_channel/client_channel_test.cc
@@ -274,11 +274,9 @@ CLIENT_CHANNEL_TEST(StartCall) {
QueueNameResolutionResult(
MakeSuccessfulResolutionResult("ipv4:127.0.0.1:1234"));
auto call_handler = TickUntilCallStarted();
- SpawnTestSeq(call.initiator, "cancel",
- [call_initiator = call.initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ SpawnTestSeq(
+ call.initiator, "cancel",
+ [call_initiator = call.initiator]() mutable { call_initiator.Cancel(); });
WaitForAllPendingWork();
}
@@ -361,13 +359,10 @@ CLIENT_CHANNEL_TEST(ConfigSelectorWithDynamicFilters) {
EXPECT_TRUE(value.has_value());
if (value.has_value()) EXPECT_EQ(*value, "bar");
}
- return Empty{};
});
- SpawnTestSeq(call.initiator, "cancel",
- [call_initiator = call.initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ SpawnTestSeq(
+ call.initiator, "cancel",
+ [call_initiator = call.initiator]() mutable { call_initiator.Cancel(); });
WaitForAllPendingWork();
}
diff --git a/test/core/client_channel/connected_subchannel_test.cc b/test/core/client_channel/connected_subchannel_test.cc
index 9e294a8114109..cb78ba6804d5e 100644
--- a/test/core/client_channel/connected_subchannel_test.cc
+++ b/test/core/client_channel/connected_subchannel_test.cc
@@ -165,7 +165,6 @@ CONNECTED_SUBCHANNEL_CHANNEL_TEST(StartCall) {
SpawnTestSeq(
call.handler, "start-call", [channel, handler = call.handler]() mutable {
channel->unstarted_call_destination()->StartCall(std::move(handler));
- return Empty{};
});
auto handler = TickUntilCallStarted();
WaitForAllPendingWork();
diff --git a/test/core/client_channel/load_balanced_call_destination_test.cc b/test/core/client_channel/load_balanced_call_destination_test.cc
index 268ea7825d413..8b51e7ab3e741 100644
--- a/test/core/client_channel/load_balanced_call_destination_test.cc
+++ b/test/core/client_channel/load_balanced_call_destination_test.cc
@@ -166,12 +166,8 @@ LOAD_BALANCED_CALL_DESTINATION_TEST(CreateCall) {
call.initiator, "initiator",
[this, handler = std::move(call.handler)]() {
destination_under_test().StartCall(handler);
- return Empty{};
},
- [call_initiator = call.initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ [call_initiator = call.initiator]() mutable { call_initiator.Cancel(); });
WaitForAllPendingWork();
}
@@ -180,7 +176,6 @@ LOAD_BALANCED_CALL_DESTINATION_TEST(StartCall) {
SpawnTestSeq(call.initiator, "initiator",
[this, handler = std::move(call.handler)]() {
destination_under_test().StartCall(handler);
- return Empty{};
});
auto mock_picker = MakeRefCounted>();
EXPECT_CALL(*mock_picker, Pick)
@@ -189,11 +184,9 @@ LOAD_BALANCED_CALL_DESTINATION_TEST(StartCall) {
});
picker().Set(mock_picker);
auto handler = TickUntilCallStarted();
- SpawnTestSeq(call.initiator, "cancel",
- [call_initiator = call.initiator]() mutable {
- call_initiator.Cancel();
- return Empty{};
- });
+ SpawnTestSeq(
+ call.initiator, "cancel",
+ [call_initiator = call.initiator]() mutable { call_initiator.Cancel(); });
WaitForAllPendingWork();
}
@@ -212,7 +205,6 @@ LOAD_BALANCED_CALL_DESTINATION_TEST(StartCallOnDestroyedChannel) {
[](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value_or(GRPC_STATUS_UNKNOWN),
GRPC_STATUS_UNAVAILABLE);
- return Empty{};
});
// Set a picker and wait for at least one pick attempt to prove the call has
// made it to the picker.
diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc
index 2b606807b417d..27e78f4e06607 100644
--- a/test/core/end2end/cq_verifier.cc
+++ b/test/core/end2end/cq_verifier.cc
@@ -347,7 +347,11 @@ grpc_event CqVerifier::Step(gpr_timespec deadline) {
if (r.type != GRPC_QUEUE_TIMEOUT) return r;
auto now = gpr_now(deadline.clock_type);
if (gpr_time_cmp(deadline, now) < 0) break;
- step_fn_(Timestamp::FromTimespecRoundDown(deadline) - Timestamp::Now());
+ // Add a millisecond to ensure we overshoot the cq timeout if nothing is
+ // happening. Not doing so can lead to infinite loops in some tests.
+ // TODO(ctiller): see if there's a cleaner way to resolve this.
+ step_fn_(Timestamp::FromTimespecRoundDown(deadline) +
+ Duration::Milliseconds(1) - Timestamp::Now());
}
return grpc_event{GRPC_QUEUE_TIMEOUT, 0, nullptr};
}
diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc
index eedc27878a015..31994d2f73818 100644
--- a/test/core/end2end/end2end_test_suites.cc
+++ b/test/core/end2end/end2end_test_suites.cc
@@ -1000,6 +1000,7 @@ std::vector DefaultConfigs() {
return std::make_unique();
}},
#endif
+#ifndef GPR_WINDOWS
CoreTestConfiguration{"ChaoticGoodFullStack",
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
FEATURE_MASK_DOES_NOT_SUPPORT_RETRY |
@@ -1009,7 +1010,9 @@ std::vector DefaultConfigs() {
[](const ChannelArgs& /*client_args*/,
const ChannelArgs& /*server_args*/) {
return std::make_unique();
- }}};
+ }},
+#endif
+ };
}
std::vector AllConfigs() {
diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc
index 9c644dbe69cea..27afb87c97be5 100644
--- a/test/core/end2end/tests/max_concurrent_streams.cc
+++ b/test/core/end2end/tests/max_concurrent_streams.cc
@@ -247,6 +247,53 @@ CORE_END2END_TEST(Http2SingleHopTest, MaxConcurrentStreamsTimeoutOnSecond) {
Expect(302, true);
Expect(102, true);
Step();
+ EXPECT_EQ(server_status2.status(), GRPC_STATUS_DEADLINE_EXCEEDED);
+}
+
+CORE_END2END_TEST(Http2SingleHopTest, MaxConcurrentStreamsRejectOnClient) {
+ SKIP_IF_MINSTACK();
+ InitServer(
+ ChannelArgs()
+ .Set(GRPC_ARG_MAX_CONCURRENT_STREAMS, 1)
+ .Set(GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION, false));
+ InitClient(ChannelArgs()
+ .Set(GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT, true)
+ .Set(GRPC_ARG_ENABLE_RETRIES, false));
+ // perform a ping-pong to ensure that settings have had a chance to round
+ // trip
+ SimpleRequestBody(*this);
+ auto c1 = NewClientCall("/alpha").Timeout(Duration::Seconds(1000)).Create();
+ auto c2 = NewClientCall("/beta").Timeout(Duration::Seconds(3)).Create();
+ auto s1 = RequestCall(101);
+ c1.NewBatch(301).SendInitialMetadata({}).SendCloseFromClient();
+ IncomingMetadata server_initial_metadata1;
+ IncomingStatusOnClient server_status1;
+ c1.NewBatch(302)
+ .RecvStatusOnClient(server_status1)
+ .RecvInitialMetadata(server_initial_metadata1);
+ Expect(101, true);
+ Expect(301, true);
+ Step();
+ c2.NewBatch(401).SendInitialMetadata({}).SendCloseFromClient();
+ IncomingMetadata server_initial_metadata2;
+ IncomingStatusOnClient server_status2;
+ c2.NewBatch(402)
+ .RecvStatusOnClient(server_status2)
+ .RecvInitialMetadata(server_initial_metadata2);
+ // the second request fails
+ Expect(401, false);
+ Expect(402, true);
+ Step();
+ // now reply the first call
+ IncomingCloseOnServer client_close1;
+ s1.NewBatch(102)
+ .SendInitialMetadata({})
+ .RecvCloseOnServer(client_close1)
+ .SendStatusFromServer(GRPC_STATUS_UNIMPLEMENTED, "xyz", {});
+ Expect(302, true);
+ Expect(102, true);
+ Step();
+ EXPECT_EQ(server_status2.status(), GRPC_STATUS_RESOURCE_EXHAUSTED);
}
} // namespace
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
index 7c24b1abfb8cc..09901957634a7 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
@@ -78,16 +78,6 @@ gpr_timespec (*g_orig_gpr_now_impl)(gpr_clock_type clock_type);
FuzzingEventEngine::FuzzingEventEngine(
Options options, const fuzzing_event_engine::Actions& actions)
: max_delay_{options.max_delay_write, options.max_delay_run_after} {
- tasks_by_id_.clear();
- tasks_by_time_.clear();
- next_task_id_ = 1;
- current_tick_ = 0;
- // Start at 5 seconds after the epoch.
- // This needs to be more than 1, and otherwise is kind of arbitrary.
- // The grpc_core::Timer code special cases the zero second time period after
- // epoch to allow for some fancy atomic stuff.
- now_ = Time() + std::chrono::seconds(5);
-
// Allow the fuzzer to assign ports.
// Once this list is exhausted, we fall back to a deterministic algorithm.
for (auto port : actions.assign_ports()) {
@@ -140,33 +130,18 @@ gpr_timespec FuzzingEventEngine::NowAsTimespec(gpr_clock_type clock_type) {
}
void FuzzingEventEngine::Tick(Duration max_time) {
- bool incremented_time = false;
- while (true) {
+ if (IsSaneTimerEnvironment()) {
std::vector> to_run;
+ Duration incr = max_time;
+ DCHECK_GT(incr.count(), Duration::zero().count());
{
grpc_core::MutexLock lock(&*mu_);
grpc_core::MutexLock now_lock(&*now_mu_);
- if (!incremented_time) {
- Duration incr = max_time;
- // TODO(ctiller): look at tasks_by_time_ and jump forward (once iomgr
- // timers are gone)
- if (!tasks_by_time_.empty()) {
- incr = std::min(incr, tasks_by_time_.begin()->first - now_);
- }
- if (incr < exponential_gate_time_increment_) {
- exponential_gate_time_increment_ = std::chrono::milliseconds(1);
- } else {
- incr = std::min(incr, exponential_gate_time_increment_);
- exponential_gate_time_increment_ +=
- exponential_gate_time_increment_ / 1000;
- }
- incr = std::max(incr, std::chrono::duration_cast(
- std::chrono::milliseconds(1)));
- now_ += incr;
- CHECK_GE(now_.time_since_epoch().count(), 0);
- ++current_tick_;
- incremented_time = true;
+ if (!tasks_by_time_.empty()) {
+ incr = std::min(incr, tasks_by_time_.begin()->first - now_);
}
+ now_ += incr;
+ CHECK_GE(now_.time_since_epoch().count(), 0);
// Find newly expired timers.
while (!tasks_by_time_.empty() && tasks_by_time_.begin()->first <= now_) {
auto& task = *tasks_by_time_.begin()->second;
@@ -177,10 +152,57 @@ void FuzzingEventEngine::Tick(Duration max_time) {
tasks_by_time_.erase(tasks_by_time_.begin());
}
}
+ OnClockIncremented(incr);
if (to_run.empty()) return;
for (auto& closure : to_run) {
closure();
}
+ } else {
+ bool incremented_time = false;
+ while (true) {
+ std::vector> to_run;
+ Duration incr = Duration::zero();
+ {
+ grpc_core::MutexLock lock(&*mu_);
+ grpc_core::MutexLock now_lock(&*now_mu_);
+ if (!incremented_time) {
+ incr = max_time;
+ // TODO(ctiller): look at tasks_by_time_ and jump forward (once iomgr
+ // timers are gone)
+ if (!tasks_by_time_.empty()) {
+ incr = std::min(incr, tasks_by_time_.begin()->first - now_);
+ }
+ if (incr < exponential_gate_time_increment_) {
+ exponential_gate_time_increment_ = std::chrono::milliseconds(1);
+ } else {
+ incr = std::min(incr, exponential_gate_time_increment_);
+ exponential_gate_time_increment_ +=
+ exponential_gate_time_increment_ / 1000;
+ }
+ incr = std::max(incr, std::chrono::duration_cast(
+ std::chrono::milliseconds(1)));
+ now_ += incr;
+ CHECK_GE(now_.time_since_epoch().count(), 0);
+ ++current_tick_;
+ incremented_time = true;
+ }
+ // Find newly expired timers.
+ while (!tasks_by_time_.empty() &&
+ tasks_by_time_.begin()->first <= now_) {
+ auto& task = *tasks_by_time_.begin()->second;
+ tasks_by_id_.erase(task.id);
+ if (task.closure != nullptr) {
+ to_run.push_back(std::move(task.closure));
+ }
+ tasks_by_time_.erase(tasks_by_time_.begin());
+ }
+ }
+ OnClockIncremented(incr);
+ if (to_run.empty()) return;
+ for (auto& closure : to_run) {
+ closure();
+ }
+ }
}
}
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
index 180943c882ce3..12b3b641f1958 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
@@ -40,6 +40,7 @@
#include "absl/status/statusor.h"
#include "absl/types/optional.h"
#include "src/core/lib/event_engine/time_util.h"
+#include "src/core/lib/experiments/experiments.h"
#include "src/core/util/no_destruct.h"
#include "src/core/util/sync.h"
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
@@ -299,6 +300,23 @@ class FuzzingEventEngine : public EventEngine {
bool IsIdleLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
+ // Called whenever the time is incremented, and used by
+ // ThreadedFuzzingEventEngine to insert a sleep so that real time passes at
+ // approximately the same rate as FuzzingEventEngine time.
+ // TODO(ctiller): This is very approximate and unsound and we should probably
+ // evaluate whether we want to continue supporting ThreadedFuzzingEventEngine
+ // at all.
+ virtual void OnClockIncremented(Duration) {}
+
+ // We need everything EventEngine to do reasonable timer steps -- without it
+ // we need to do a bunch of evil to make sure both timer systems are ticking
+ // each step.
+ static bool IsSaneTimerEnvironment() {
+ return grpc_core::IsEventEngineClientEnabled() &&
+ grpc_core::IsEventEngineListenerEnabled() &&
+ grpc_core::IsEventEngineDnsEnabled();
+ }
+
// For the next connection being built, query the list of fuzzer selected
// write size limits.
std::queue WriteSizesForConnection()
@@ -313,12 +331,13 @@ class FuzzingEventEngine : public EventEngine {
static grpc_core::NoDestruct now_mu_
ABSL_ACQUIRED_AFTER(mu_);
- Duration exponential_gate_time_increment_ ABSL_GUARDED_BY(mu_) =
- std::chrono::milliseconds(1);
const Duration max_delay_[2];
- intptr_t next_task_id_ ABSL_GUARDED_BY(mu_);
- intptr_t current_tick_ ABSL_GUARDED_BY(now_mu_);
- Time now_ ABSL_GUARDED_BY(now_mu_);
+ intptr_t next_task_id_ ABSL_GUARDED_BY(mu_) = 1;
+ // Start at 5 seconds after the epoch.
+ // This needs to be more than 1, and otherwise is kind of arbitrary.
+ // The grpc_core::Timer code special cases the zero second time period after
+ // epoch to allow for some fancy atomic stuff.
+ Time now_ ABSL_GUARDED_BY(now_mu_) = Time() + std::chrono::seconds(5);
std::queue task_delays_ ABSL_GUARDED_BY(mu_);
std::map> tasks_by_id_ ABSL_GUARDED_BY(mu_);
std::multimap> tasks_by_time_
@@ -338,6 +357,12 @@ class FuzzingEventEngine : public EventEngine {
std::atomic outstanding_writes_{0};
std::atomic outstanding_reads_{0};
+ // TODO(ctiller): these can be removed when IsSaneTimerEnvironment() is
+ // guaranteed to be true.
+ Duration exponential_gate_time_increment_ ABSL_GUARDED_BY(mu_) =
+ std::chrono::milliseconds(1);
+ intptr_t current_tick_ ABSL_GUARDED_BY(now_mu_) = 0;
+
grpc_core::Mutex run_after_duration_callback_mu_;
absl::AnyInvocable run_after_duration_callback_
ABSL_GUARDED_BY(run_after_duration_callback_mu_);
@@ -353,11 +378,7 @@ class ThreadedFuzzingEventEngine : public FuzzingEventEngine {
fuzzing_event_engine::Actions()),
main_([this, max_time]() {
while (!done_.load()) {
- if (max_time > Duration::zero()) {
- absl::SleepFor(absl::Milliseconds(
- grpc_event_engine::experimental::Milliseconds(max_time)));
- }
- Tick();
+ Tick(max_time);
}
}) {}
@@ -367,6 +388,11 @@ class ThreadedFuzzingEventEngine : public FuzzingEventEngine {
}
private:
+ void OnClockIncremented(Duration duration) override {
+ absl::SleepFor(absl::Milliseconds(
+ 1 + grpc_event_engine::experimental::Milliseconds(duration)));
+ }
+
std::atomic done_{false};
std::thread main_;
};
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index 540163333fa35..5c9971f73f236 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -99,13 +99,7 @@ TEST_F(PartyTest, CanSpawnWaitableAndRun) {
},
[&n](Empty) { n.Notify(); });
ASSERT_FALSE(n.HasBeenNotified());
- party1->Spawn(
- "party1_notify_latch",
- [&done]() {
- done.Set();
- return Empty{};
- },
- [](Empty) {});
+ party1->Spawn("party1_notify_latch", [&done]() { done.Set(); }, [](Empty) {});
n.WaitForNotification();
}
@@ -254,11 +248,27 @@ TEST_F(PartyTest, CanBulkSpawn) {
Notification n1;
Notification n2;
{
- Party::BulkSpawner spawner(party.get());
- spawner.Spawn(
- "spawn1", []() { return Empty{}; }, [&n1](Empty) { n1.Notify(); });
- spawner.Spawn(
- "spawn2", []() { return Empty{}; }, [&n2](Empty) { n2.Notify(); });
+ Party::WakeupHold hold(party.get());
+ party->Spawn("spawn1", []() {}, [&n1](Empty) { n1.Notify(); });
+ party->Spawn("spawn2", []() {}, [&n2](Empty) { n2.Notify(); });
+ for (int i = 0; i < 5000; i++) {
+ EXPECT_FALSE(n1.HasBeenNotified());
+ EXPECT_FALSE(n2.HasBeenNotified());
+ }
+ }
+ n1.WaitForNotification();
+ n2.WaitForNotification();
+}
+
+TEST_F(PartyTest, CanNestWakeupHold) {
+ auto party = MakeParty();
+ Notification n1;
+ Notification n2;
+ {
+ Party::WakeupHold hold1(party.get());
+ Party::WakeupHold hold2(party.get());
+ party->Spawn("spawn1", []() {}, [&n1](Empty) { n1.Notify(); });
+ party->Spawn("spawn2", []() {}, [&n2](Empty) { n2.Notify(); });
for (int i = 0; i < 5000; i++) {
EXPECT_FALSE(n1.HasBeenNotified());
EXPECT_FALSE(n2.HasBeenNotified());
@@ -539,7 +549,6 @@ TEST_F(PartyTest, NestedWakeup) {
started3.WaitForNotification();
EXPECT_EQ(whats_going_on, 3);
whats_going_on = 4;
- return Empty{};
},
[&](Empty) {
EXPECT_EQ(whats_going_on, 4);
@@ -554,7 +563,6 @@ TEST_F(PartyTest, NestedWakeup) {
done2.WaitForNotification();
EXPECT_EQ(whats_going_on, 5);
whats_going_on = 6;
- return Empty{};
},
[&](Empty) {
EXPECT_EQ(whats_going_on, 6);
@@ -563,7 +571,6 @@ TEST_F(PartyTest, NestedWakeup) {
});
EXPECT_EQ(whats_going_on, 1);
whats_going_on = 2;
- return Empty{};
},
[&](Empty) {
EXPECT_EQ(whats_going_on, 2);
diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc
index 8bbadd03925bb..e502c12a8aef1 100644
--- a/test/core/promise/promise_mutex_test.cc
+++ b/test/core/promise/promise_mutex_test.cc
@@ -33,24 +33,20 @@ TEST(PromiseMutexTest, Basic) {
bool done = false;
MakeActivity(
[&]() {
- return Seq(Join(Seq(mutex.Acquire(),
- [](PromiseMutex::Lock l) {
- EXPECT_EQ(*l, 1);
- *l = 2;
- return Empty{};
- }),
- Seq(mutex.Acquire(),
- [](PromiseMutex::Lock l) {
- EXPECT_EQ(*l, 2);
- *l = 3;
- return Empty{};
- }),
- Seq(mutex.Acquire(),
- [](PromiseMutex::Lock l) {
- EXPECT_EQ(*l, 3);
- return Empty{};
- })),
- []() { return absl::OkStatus(); });
+ return Seq(
+ Join(Seq(mutex.Acquire(),
+ [](PromiseMutex::Lock l) {
+ EXPECT_EQ(*l, 1);
+ *l = 2;
+ }),
+ Seq(mutex.Acquire(),
+ [](PromiseMutex::Lock l) {
+ EXPECT_EQ(*l, 2);
+ *l = 3;
+ }),
+ Seq(mutex.Acquire(),
+ [](PromiseMutex::Lock l) { EXPECT_EQ(*l, 3); })),
+ []() { return absl::OkStatus(); });
},
InlineWakeupScheduler(),
[&done](absl::Status status) {
diff --git a/test/core/promise/try_seq_test.cc b/test/core/promise/try_seq_test.cc
index 4d87e385f2626..092fe69dfb4e2 100644
--- a/test/core/promise/try_seq_test.cc
+++ b/test/core/promise/try_seq_test.cc
@@ -195,7 +195,6 @@ TEST(TrySeqContainer, Ok) {
[&expect](const std::unique_ptr& i, Empty) {
EXPECT_EQ(*i, expect);
++expect;
- return Empty{};
});
EXPECT_THAT(p(), IsReady());
EXPECT_EQ(expect, 4);
diff --git a/test/core/resource_quota/memory_quota_test.cc b/test/core/resource_quota/memory_quota_test.cc
index 3db1585eb81c9..f676ff5706287 100644
--- a/test/core/resource_quota/memory_quota_test.cc
+++ b/test/core/resource_quota/memory_quota_test.cc
@@ -187,6 +187,22 @@ TEST(MemoryQuotaTest, AllMemoryQuotas) {
EXPECT_EQ(gather(), std::set({"m2"}));
}
+TEST(MemoryQuotaTest, ContainerMemoryAccountedFor) {
+ MemoryQuota memory_quota("foo");
+ memory_quota.SetSize(1000000);
+ EXPECT_EQ(ContainerMemoryPressure(), 0.0);
+ auto owner = memory_quota.CreateMemoryOwner();
+ const double original_memory_pressure =
+ owner.GetPressureInfo().instantaneous_pressure;
+ EXPECT_LT(original_memory_pressure, 0.01);
+ SetContainerMemoryPressure(1.0);
+ EXPECT_EQ(owner.GetPressureInfo().instantaneous_pressure, 1.0);
+ SetContainerMemoryPressure(0.0);
+ EXPECT_EQ(owner.GetPressureInfo().instantaneous_pressure,
+ original_memory_pressure);
+ SetContainerMemoryPressure(0.0);
+}
+
} // namespace testing
namespace memory_quota_detail {
diff --git a/test/core/transport/bm_call_spine.cc b/test/core/transport/bm_call_spine.cc
index 749c2c9f5ae50..79e346b5c7667 100644
--- a/test/core/transport/bm_call_spine.cc
+++ b/test/core/transport/bm_call_spine.cc
@@ -73,14 +73,11 @@ class ForwardCallFixture {
[p1_handler, &p2](ValueOrFailure md) mutable {
CHECK(md.ok());
ForwardCall(std::move(p1_handler), std::move(p2.initiator));
- return Empty{};
});
});
absl::optional p2_handler;
- p2.handler.SpawnInfallible("start", [&]() {
- p2_handler = p2.handler.StartCall();
- return Empty{};
- });
+ p2.handler.SpawnInfallible("start",
+ [&]() { p2_handler = p2.handler.StartCall(); });
return {std::move(p1.initiator), std::move(*p2_handler)};
}
diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h
index c4bd19f7a44a2..47a43ee7ca259 100644
--- a/test/core/transport/call_spine_benchmarks.h
+++ b/test/core/transport/call_spine_benchmarks.h
@@ -62,7 +62,6 @@ void BM_UnaryWithSpawnPerEnd(benchmark::State& state) {
handler.PushServerTrailingMetadata(
fixture.MakeServerTrailingMetadata());
handler_done.Notify();
- return Empty{};
});
});
call.initiator.SpawnInfallible("initiator", [initiator = call.initiator,
@@ -83,7 +82,6 @@ void BM_UnaryWithSpawnPerEnd(benchmark::State& state) {
[&initiator_done](StatusFlag result) {
CHECK(result.ok());
initiator_done.Notify();
- return Empty{};
});
});
}
@@ -92,79 +90,6 @@ void BM_UnaryWithSpawnPerEnd(benchmark::State& state) {
}
}
-// Unary call with one promise spawned per operation on the spine.
-// It's a little unclear what the optimum should be between the above variant
-// and this: whilst a spawn per end minimizes the number of spawns we need to
-// do, a spawn per operation can conceivably (but not at the time of writing)
-// minimize the number of internal wakeups in the parties.
-// For now we track both.
-template
-void BM_UnaryWithSpawnPerOp(benchmark::State& state) {
- Fixture fixture;
- for (auto _ : state) {
- BenchmarkCall call = fixture.MakeCall();
- Notification handler_done;
- Notification initiator_done;
- {
- ExecCtx exec_ctx;
- Party::BulkSpawner handler_spawner(call.handler.party());
- Party::BulkSpawner initiator_spawner(call.initiator.party());
- handler_spawner.Spawn(
- "HANDLER:PushServerInitialMetadata",
- [&]() {
- call.handler.PushServerInitialMetadata(
- fixture.MakeServerInitialMetadata());
- return Empty{};
- },
- [](Empty) {});
- handler_spawner.Spawn(
- "HANDLER:PullClientInitialMetadata",
- [&]() { return call.handler.PullClientInitialMetadata(); },
- [](ValueOrFailure md) { CHECK(md.ok()); });
- handler_spawner.Spawn(
- "HANDLER:PullMessage", [&]() { return call.handler.PullMessage(); },
- [&](ClientToServerNextMessage msg) {
- CHECK(msg.ok());
- call.handler.SpawnInfallible(
- "HANDLER:PushServerTrailingMetadata", [&]() {
- call.handler.PushServerTrailingMetadata(
- fixture.MakeServerTrailingMetadata());
- handler_done.Notify();
- return Empty{};
- });
- });
- handler_spawner.Spawn(
- "HANDLER:PushMessage",
- [&]() { return call.handler.PushMessage(fixture.MakePayload()); },
- [](StatusFlag) {});
-
- initiator_spawner.Spawn(
- "INITIATOR:PushMessage",
- [&]() { return call.initiator.PushMessage(fixture.MakePayload()); },
- [](StatusFlag) {});
- initiator_spawner.Spawn(
- "INITIATOR:PullServerInitialMetadata",
- [&]() { return call.initiator.PullServerInitialMetadata(); },
- [](absl::optional md) {
- CHECK(md.has_value());
- });
- initiator_spawner.Spawn(
- "INITIATOR:PullMessage",
- [&]() { return call.initiator.PullMessage(); },
- [](ServerToClientNextMessage msg) { CHECK(msg.ok()); });
- initiator_spawner.Spawn(
- "INITIATOR:PullServerTrailingMetadata",
- [&]() { return call.initiator.PullServerTrailingMetadata(); },
- [&](ServerMetadataHandle md) {
- initiator_done.Notify();
- return Empty{};
- });
- }
- handler_done.WaitForNotification();
- initiator_done.WaitForNotification();
- }
-}
-
template
void BM_ClientToServerStreaming(benchmark::State& state) {
Fixture fixture;
@@ -178,7 +103,6 @@ void BM_ClientToServerStreaming(benchmark::State& state) {
call.handler.PushServerInitialMetadata(
fixture.MakeServerInitialMetadata());
handler_metadata_done.Notify();
- return Empty{};
});
});
call.initiator.SpawnInfallible("initiator-initial-metadata", [&]() {
@@ -186,7 +110,6 @@ void BM_ClientToServerStreaming(benchmark::State& state) {
[&](absl::optional md) {
CHECK(md.has_value());
initiator_metadata_done.Notify();
- return Empty{};
});
});
handler_metadata_done.WaitForNotification();
@@ -199,7 +122,6 @@ void BM_ClientToServerStreaming(benchmark::State& state) {
[&](ClientToServerNextMessage msg) {
CHECK(msg.ok());
handler_done.Notify();
- return Empty{};
});
});
call.initiator.SpawnInfallible("initiator", [&]() {
@@ -207,21 +129,16 @@ void BM_ClientToServerStreaming(benchmark::State& state) {
[&](StatusFlag result) {
CHECK(result.ok());
initiator_done.Notify();
- return Empty{};
});
});
handler_done.WaitForNotification();
initiator_done.WaitForNotification();
}
- call.initiator.SpawnInfallible("done",
- [initiator = call.initiator]() mutable {
- initiator.Cancel();
- return Empty{};
- });
+ call.initiator.SpawnInfallible(
+ "done", [initiator = call.initiator]() mutable { initiator.Cancel(); });
call.handler.SpawnInfallible("done", [handler = call.handler]() mutable {
handler.PushServerTrailingMetadata(
CancelledServerMetadataFromStatus(GRPC_STATUS_CANCELLED));
- return Empty{};
});
}
@@ -283,7 +200,6 @@ class UnstartedCallDestinationFixture {
MakeCallPair(traits_->MakeClientInitialMetadata(), std::move(arena));
p.handler.SpawnInfallible("initiator_setup", [&]() {
top_destination_->StartCall(std::move(p.handler));
- return Empty{};
});
auto handler = bottom_destination_->TakeHandler();
absl::optional started_handler;
@@ -291,7 +207,6 @@ class UnstartedCallDestinationFixture {
handler.SpawnInfallible("handler_setup", [&]() {
started_handler = handler.StartCall();
started.Notify();
- return Empty{};
});
started.WaitForNotification();
CHECK(started_handler.has_value());
@@ -387,7 +302,6 @@ class TransportFixture {
handler.SpawnInfallible("handler_setup", [&]() {
started_handler = handler.StartCall();
started.Notify();
- return Empty{};
});
started.WaitForNotification();
CHECK(started_handler.has_value());
@@ -447,7 +361,6 @@ class TransportFixture {
// Must be called within the grpc_core namespace
#define GRPC_CALL_SPINE_BENCHMARK(Fixture) \
BENCHMARK(BM_UnaryWithSpawnPerEnd); \
- BENCHMARK(BM_UnaryWithSpawnPerOp); \
BENCHMARK(BM_ClientToServerStreaming)
#endif // GRPC_TEST_CORE_TRANSPORT_CALL_SPINE_BENCHMARKS_H
diff --git a/test/core/transport/call_spine_test.cc b/test/core/transport/call_spine_test.cc
index bd52ccea21c25..357fa758d3f0c 100644
--- a/test/core/transport/call_spine_test.cc
+++ b/test/core/transport/call_spine_test.cc
@@ -105,7 +105,6 @@ void CallSpineTest::UnaryRequest(CallInitiator initiator, CallHandler handler) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
SpawnTestSeq(
handler, "handler",
@@ -139,7 +138,6 @@ void CallSpineTest::UnaryRequest(CallInitiator initiator, CallHandler handler) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
}
@@ -161,7 +159,6 @@ CALL_SPINE_TEST(UnaryRequestThroughForwardCall) {
auto call2 = MakeCall(std::move(md.value()));
ForwardCall(handler, call2.initiator);
UnaryRequest(initiator, call2.handler.StartCall());
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -180,7 +177,6 @@ CALL_SPINE_TEST(UnaryRequestThroughForwardCallWithServerTrailingMetadataHook) {
ForwardCall(handler, call2.initiator,
[&got_md](ServerMetadata&) { got_md = true; });
UnaryRequest(initiator, call2.handler.StartCall());
- return Empty{};
});
WaitForAllPendingWork();
EXPECT_TRUE(got_md);
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
index d8e987400af67..005c74c35f5d2 100644
--- a/test/core/transport/chaotic_good/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -202,14 +202,12 @@ TEST_F(ClientTransportTest, AddOneStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -248,14 +246,12 @@ TEST_F(ClientTransportTest, AddOneStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -310,14 +306,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done1](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done1.Call();
- return Empty{};
});
});
call2.initiator.SpawnInfallible(
@@ -326,14 +320,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done2](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done2.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -380,14 +372,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done1](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done1.Call();
- return Empty{};
});
});
call2.initiator.SpawnInfallible(
@@ -396,14 +386,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done2](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done2.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index 1c550fd3cc688..0fa6acb7cd169 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -151,20 +151,17 @@ TEST_F(TransportTest, AddOneStream) {
->get_pointer(GrpcMessageMetadata())
->as_string_view(),
"hello");
- return Empty{};
},
[initiator]() mutable { return initiator.PullMessage(); },
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), many_as);
- return Empty{};
},
[initiator]() mutable { return initiator.PullMessage(); },
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
[initiator]() mutable {
return initiator.PullServerTrailingMetadata();
@@ -172,7 +169,6 @@ TEST_F(TransportTest, AddOneStream) {
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -239,33 +235,28 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) {
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
EXPECT_TRUE(md.value().has_value());
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "12345678");
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "87654321");
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
diff --git a/test/core/transport/chaotic_good/data_endpoints_test.cc b/test/core/transport/chaotic_good/data_endpoints_test.cc
index 1f222e4cb151b..49c3b6df72c3c 100644
--- a/test/core/transport/chaotic_good/data_endpoints_test.cc
+++ b/test/core/transport/chaotic_good/data_endpoints_test.cc
@@ -55,10 +55,7 @@ DATA_ENDPOINTS_TEST(CanWrite) {
SpawnTestSeqWithoutContext(
"write",
data_endpoints.Write(SliceBuffer(Slice::FromCopiedString("hello"))),
- [](uint32_t id) {
- EXPECT_EQ(id, 0);
- return Empty{};
- });
+ [](uint32_t id) { EXPECT_EQ(id, 0); });
WaitForAllPendingWork();
}
@@ -79,15 +76,9 @@ DATA_ENDPOINTS_TEST(CanMultiWrite) {
SpawnTestSeqWithoutContext(
"write",
data_endpoints.Write(SliceBuffer(Slice::FromCopiedString("hello"))),
- [&write1_ep](uint32_t id) {
- write1_ep = id;
- return Empty{};
- },
+ [&write1_ep](uint32_t id) { write1_ep = id; },
data_endpoints.Write(SliceBuffer(Slice::FromCopiedString("world"))),
- [&write2_ep](uint32_t id) {
- write2_ep = id;
- return Empty{};
- });
+ [&write2_ep](uint32_t id) { write2_ep = id; });
WaitForAllPendingWork();
EXPECT_THAT(write1_ep, ::testing::AnyOf(0, 1));
EXPECT_THAT(write2_ep, ::testing::AnyOf(0, 1));
@@ -111,7 +102,6 @@ DATA_ENDPOINTS_TEST(CanRead) {
[](absl::StatusOr result) {
EXPECT_TRUE(result.ok());
EXPECT_EQ(result->JoinIntoString(), "hello");
- return Empty{};
});
WaitForAllPendingWork();
}
diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc
index f5348323240d1..58cc59cca1036 100644
--- a/test/core/transport/chaotic_good/server_transport_test.cc
+++ b/test/core/transport/chaotic_good/server_transport_test.cc
@@ -136,20 +136,17 @@ TEST_F(TransportTest, ReadAndWriteOneMessage) {
->get_pointer(HttpPathMetadata())
->as_string_view(),
"/demo.Service/Step");
- return Empty{};
},
[handler]() mutable { return handler.PullMessage(); },
[](ClientToServerNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "12345678");
- return Empty{};
},
[handler]() mutable { return handler.PullMessage(); },
[](ClientToServerNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
[handler]() mutable {
return handler.PushServerInitialMetadata(TestInitialMetadata());
@@ -161,7 +158,6 @@ TEST_F(TransportTest, ReadAndWriteOneMessage) {
[handler, &on_done]() mutable {
handler.PushServerTrailingMetadata(TestTrailingMetadata());
on_done.Call();
- return Empty{};
});
});
}));
diff --git a/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc b/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc
index e2bb24a7f1dfa..5ec6071c8e000 100644
--- a/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good_legacy/client_transport_error_test.cc
@@ -202,14 +202,12 @@ TEST_F(ClientTransportTest, AddOneStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -246,14 +244,12 @@ TEST_F(ClientTransportTest, AddOneStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -306,14 +302,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done1](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done1.Call();
- return Empty{};
});
});
call2.initiator.SpawnInfallible(
@@ -322,14 +316,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done2](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done2.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -374,14 +366,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done1](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done1.Call();
- return Empty{};
});
});
call2.initiator.SpawnInfallible(
@@ -390,14 +380,12 @@ TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
initiator.PullServerInitialMetadata(),
[](ValueOrFailure> md) {
EXPECT_TRUE(md.ok());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done2](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
GRPC_STATUS_UNAVAILABLE);
on_done2.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
diff --git a/test/core/transport/chaotic_good_legacy/client_transport_test.cc b/test/core/transport/chaotic_good_legacy/client_transport_test.cc
index 7a3b6e01a50c8..78043c36ad965 100644
--- a/test/core/transport/chaotic_good_legacy/client_transport_test.cc
+++ b/test/core/transport/chaotic_good_legacy/client_transport_test.cc
@@ -151,20 +151,17 @@ TEST_F(TransportTest, AddOneStream) {
->get_pointer(HttpPathMetadata())
->as_string_view(),
"/demo.Service/Step");
- return Empty{};
},
[initiator]() mutable { return initiator.PullMessage(); },
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "12345678");
- return Empty{};
},
[initiator]() mutable { return initiator.PullMessage(); },
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
[initiator]() mutable {
return initiator.PullServerTrailingMetadata();
@@ -172,7 +169,6 @@ TEST_F(TransportTest, AddOneStream) {
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
@@ -241,33 +237,28 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) {
->get_pointer(HttpPathMetadata())
->as_string_view(),
"/demo.Service/Step");
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "12345678");
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "87654321");
- return Empty{};
},
initiator.PullMessage(),
[](ServerToClientNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
initiator.PullServerTrailingMetadata(),
[&on_done](ServerMetadataHandle md) {
EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
on_done.Call();
- return Empty{};
});
});
// Wait until ClientTransport's internal activities to finish.
diff --git a/test/core/transport/chaotic_good_legacy/server_transport_test.cc b/test/core/transport/chaotic_good_legacy/server_transport_test.cc
index 55605f13fd3e0..d89de497eddca 100644
--- a/test/core/transport/chaotic_good_legacy/server_transport_test.cc
+++ b/test/core/transport/chaotic_good_legacy/server_transport_test.cc
@@ -134,20 +134,17 @@ TEST_F(TransportTest, ReadAndWriteOneMessage) {
->get_pointer(HttpPathMetadata())
->as_string_view(),
"/demo.Service/Step");
- return Empty{};
},
[handler]() mutable { return handler.PullMessage(); },
[](ClientToServerNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_TRUE(msg.has_value());
EXPECT_EQ(msg.value().payload()->JoinIntoString(), "12345678");
- return Empty{};
},
[handler]() mutable { return handler.PullMessage(); },
[](ClientToServerNextMessage msg) {
EXPECT_TRUE(msg.ok());
EXPECT_FALSE(msg.has_value());
- return Empty{};
},
[handler]() mutable {
return handler.PushServerInitialMetadata(TestInitialMetadata());
@@ -159,7 +156,6 @@ TEST_F(TransportTest, ReadAndWriteOneMessage) {
[handler, &on_done]() mutable {
handler.PushServerTrailingMetadata(TestTrailingMetadata());
on_done.Call();
- return Empty{};
});
});
}));
diff --git a/test/core/transport/interception_chain_test.cc b/test/core/transport/interception_chain_test.cc
index 8b5442a132b8c..1fe2c669202bc 100644
--- a/test/core/transport/interception_chain_test.cc
+++ b/test/core/transport/interception_chain_test.cc
@@ -219,7 +219,6 @@ class TestHijackingInterceptor final : public Interceptor {
ForwardCall(
hijacked_call.value().original_call_handler(),
hijacked_call.value().MakeCall());
- return Empty{};
});
});
}
@@ -262,7 +261,6 @@ class InterceptionChainTest : public ::testing::Test {
return Map(call.initiator.PullServerTrailingMetadata(),
[&trailing_md](ServerMetadataHandle md) {
trailing_md = std::move(md);
- return Empty{};
});
});
EXPECT_THAT(trailing_md, IsReady());
diff --git a/test/core/transport/test_suite/call_content.cc b/test/core/transport/test_suite/call_content.cc
index 82531bfa485dd..412be5a01bcc0 100644
--- a/test/core/transport/test_suite/call_content.cc
+++ b/test/core/transport/test_suite/call_content.cc
@@ -103,7 +103,6 @@ TRANSPORT_TEST(UnaryWithSomeContent) {
EXPECT_TRUE(md.ok());
EXPECT_THAT(LowerMetadata(**md),
UnorderedElementsAreArray(server_trailing_metadata));
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -137,7 +136,6 @@ TRANSPORT_TEST(UnaryWithSomeContent) {
auto md = Arena::MakePooledForOverwrite();
FillMetadata(server_trailing_metadata, *md);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
diff --git a/test/core/transport/test_suite/call_shapes.cc b/test/core/transport/test_suite/call_shapes.cc
index 7cfecf26af75b..c80e2030e428a 100644
--- a/test/core/transport/test_suite/call_shapes.cc
+++ b/test/core/transport/test_suite/call_shapes.cc
@@ -38,7 +38,6 @@ TRANSPORT_TEST(MetadataOnlyRequest) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -61,7 +60,6 @@ TRANSPORT_TEST(MetadataOnlyRequest) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -93,7 +91,6 @@ TRANSPORT_TEST(MetadataOnlyRequestServerAbortsAfterInitialMetadata) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -114,7 +111,6 @@ TRANSPORT_TEST(MetadataOnlyRequestServerAbortsAfterInitialMetadata) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -144,7 +140,6 @@ TRANSPORT_TEST(MetadataOnlyRequestServerAbortsImmediately) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -159,7 +154,6 @@ TRANSPORT_TEST(MetadataOnlyRequestServerAbortsImmediately) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -170,10 +164,7 @@ TRANSPORT_TEST(CanCreateCallThenAbandonIt) {
md->Set(HttpPathMetadata(), Slice::FromExternalString("/foo/bar"));
auto initiator = CreateCall(std::move(md));
auto handler = TickUntilServerCall();
- SpawnTestSeq(initiator, "end-call", [&]() {
- initiator.Cancel();
- return Empty{};
- });
+ SpawnTestSeq(initiator, "end-call", [&]() { initiator.Cancel(); });
WaitForAllPendingWork();
}
@@ -216,7 +207,6 @@ TRANSPORT_TEST(UnaryRequest) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -250,7 +240,6 @@ TRANSPORT_TEST(UnaryRequest) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -289,7 +278,6 @@ TRANSPORT_TEST(UnaryRequestOmitCheckEndOfStream) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -318,7 +306,6 @@ TRANSPORT_TEST(UnaryRequestOmitCheckEndOfStream) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -360,7 +347,6 @@ TRANSPORT_TEST(UnaryRequestWaitForServerInitialMetadataBeforeSendingPayload) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -395,7 +381,6 @@ TRANSPORT_TEST(UnaryRequestWaitForServerInitialMetadataBeforeSendingPayload) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -450,7 +435,6 @@ TRANSPORT_TEST(ClientStreamingRequest) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -504,7 +488,6 @@ TRANSPORT_TEST(ClientStreamingRequest) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
@@ -576,7 +559,6 @@ TRANSPORT_TEST(ServerStreamingRequest) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
auto handler = TickUntilServerCall();
SpawnTestSeq(
@@ -630,7 +612,6 @@ TRANSPORT_TEST(ServerStreamingRequest) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
WaitForAllPendingWork();
}
diff --git a/test/core/transport/test_suite/stress.cc b/test/core/transport/test_suite/stress.cc
index 548b06640cb89..24a35e0d61fb1 100644
--- a/test/core/transport/test_suite/stress.cc
+++ b/test/core/transport/test_suite/stress.cc
@@ -70,7 +70,6 @@ TRANSPORT_TEST(ManyUnaryRequests) {
EXPECT_TRUE(md.ok());
EXPECT_EQ(*md.value()->get_pointer(GrpcStatusMetadata()),
GRPC_STATUS_UNIMPLEMENTED);
- return Empty{};
});
}
for (int i = 0; i < kNumRequests; i++) {
@@ -115,7 +114,6 @@ TRANSPORT_TEST(ManyUnaryRequests) {
auto md = Arena::MakePooledForOverwrite();
md->Set(GrpcStatusMetadata(), GRPC_STATUS_UNIMPLEMENTED);
handler.PushServerTrailingMetadata(std::move(md));
- return Empty{};
});
}
WaitForAllPendingWork();
diff --git a/test/core/transport/test_suite/transport_test.cc b/test/core/transport/test_suite/transport_test.cc
index 348c44a52a6c3..4a7f1659e4d91 100644
--- a/test/core/transport/test_suite/transport_test.cc
+++ b/test/core/transport/test_suite/transport_test.cc
@@ -35,7 +35,6 @@ CallInitiator TransportTest::CreateCall(
"start-call", [this, handler = call.handler]() mutable {
transport_pair_.client->client_transport()->StartCall(
handler.StartCall());
- return Empty{};
});
return std::move(call.initiator);
}
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index a3ab4dc457662..f2e82afb87c07 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -288,25 +288,27 @@ class XdsClientTest : public ::testing::Test {
absl::optional WaitForNextResourceAndHandle(
SourceLocation location = SourceLocation()) {
while (true) {
- event_engine_->Tick();
- MutexLock lock(&mu_);
- if (queue_.empty()) {
+ {
+ MutexLock lock(&mu_);
+ if (!queue_.empty()) {
+ Event& event = queue_.front();
+ if (!absl::holds_alternative(event)) {
+ EXPECT_TRUE(false)
+ << "got unexpected event "
+ << (absl::holds_alternative(event)
+ ? "error"
+ : "does-not-exist")
+ << " at " << location.file() << ":" << location.line();
+ return absl::nullopt;
+ }
+ auto resource_and_handle =
+ std::move(absl::get(event));
+ queue_.pop_front();
+ return resource_and_handle;
+ }
if (event_engine_->IsIdle()) return absl::nullopt;
- continue;
- }
- Event& event = queue_.front();
- if (!absl::holds_alternative(event)) {
- EXPECT_TRUE(false)
- << "got unexpected event "
- << (absl::holds_alternative(event)
- ? "error"
- : "does-not-exist")
- << " at " << location.file() << ":" << location.line();
- return absl::nullopt;
}
- auto foo = std::move(absl::get(event));
- queue_.pop_front();
- return foo;
+ event_engine_->Tick();
}
}
@@ -322,47 +324,51 @@ class XdsClientTest : public ::testing::Test {
absl::optional WaitForNextError(
SourceLocation location = SourceLocation()) {
while (true) {
- event_engine_->Tick();
- MutexLock lock(&mu_);
- if (queue_.empty()) {
+ {
+ MutexLock lock(&mu_);
+ if (!queue_.empty()) {
+ Event& event = queue_.front();
+ if (!absl::holds_alternative(event)) {
+ EXPECT_TRUE(false)
+ << "got unexpected event "
+ << (absl::holds_alternative(
+ event)
+ ? "resource"
+ : "does-not-exist")
+ << " at " << location.file() << ":" << location.line();
+ return absl::nullopt;
+ }
+ absl::Status error = std::move(absl::get(event));
+ queue_.pop_front();
+ return std::move(error);
+ }
if (event_engine_->IsIdle()) return absl::nullopt;
- continue;
- }
- Event& event = queue_.front();
- if (!absl::holds_alternative(event)) {
- EXPECT_TRUE(false)
- << "got unexpected event "
- << (absl::holds_alternative(event)
- ? "resource"
- : "does-not-exist")
- << " at " << location.file() << ":" << location.line();
- return absl::nullopt;
}
- absl::Status error = std::move(absl::get(event));
- queue_.pop_front();
- return std::move(error);
+ event_engine_->Tick();
}
}
bool WaitForDoesNotExist(SourceLocation location = SourceLocation()) {
while (true) {
- event_engine_->Tick();
- MutexLock lock(&mu_);
- if (queue_.empty()) {
+ {
+ MutexLock lock(&mu_);
+ if (!queue_.empty()) {
+ Event& event = queue_.front();
+ if (!absl::holds_alternative(event)) {
+ EXPECT_TRUE(false)
+ << "got unexpected event "
+ << (absl::holds_alternative(event)
+ ? "error"
+ : "resource")
+ << " at " << location.file() << ":" << location.line();
+ return false;
+ }
+ queue_.pop_front();
+ return true;
+ }
if (event_engine_->IsIdle()) return false;
- continue;
}
- Event& event = queue_.front();
- if (!absl::holds_alternative(event)) {
- EXPECT_TRUE(false)
- << "got unexpected event "
- << (absl::holds_alternative(event) ? "error"
- : "resource")
- << " at " << location.file() << ":" << location.line();
- return false;
- }
- queue_.pop_front();
- return true;
+ event_engine_->Tick();
}
}
@@ -650,23 +656,27 @@ class XdsClientTest : public ::testing::Test {
::testing::Matcher server_failures_matcher,
SourceLocation location = SourceLocation()) {
while (true) {
- event_engine_->Tick();
- MutexLock lock(&mu_);
- if (::testing::Matches(resource_updates_valid_matcher)(
- resource_updates_valid_) &&
- ::testing::Matches(resource_updates_invalid_matcher)(
- resource_updates_invalid_) &&
- ::testing::Matches(server_failures_matcher)(server_failures_)) {
- return true;
+ {
+ MutexLock lock(&mu_);
+ if (::testing::Matches(resource_updates_valid_matcher)(
+ resource_updates_valid_) &&
+ ::testing::Matches(resource_updates_invalid_matcher)(
+ resource_updates_invalid_) &&
+ ::testing::Matches(server_failures_matcher)(server_failures_)) {
+ return true;
+ }
+ if (event_engine_->IsIdle()) {
+ EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher)
+ << location.file() << ":" << location.line();
+ EXPECT_THAT(resource_updates_invalid_,
+ resource_updates_invalid_matcher)
+ << location.file() << ":" << location.line();
+ EXPECT_THAT(server_failures_, server_failures_matcher)
+ << location.file() << ":" << location.line();
+ return false;
+ }
}
- if (!event_engine_->IsIdle()) continue;
- EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher)
- << location.file() << ":" << location.line();
- EXPECT_THAT(resource_updates_invalid_, resource_updates_invalid_matcher)
- << location.file() << ":" << location.line();
- EXPECT_THAT(server_failures_, server_failures_matcher)
- << location.file() << ":" << location.line();
- return false;
+ event_engine_->Tick();
}
}
diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc
index c56124c12edb2..3a49efbaa2d90 100644
--- a/test/core/xds/xds_transport_fake.cc
+++ b/test/core/xds/xds_transport_fake.cc
@@ -91,15 +91,16 @@ bool FakeXdsTransportFactory::FakeStreamingCall::HaveMessageFromClient() {
absl::optional
FakeXdsTransportFactory::FakeStreamingCall::WaitForMessageFromClient() {
while (true) {
- event_engine_->Tick();
- MutexLock lock(&mu_);
- if (from_client_messages_.empty()) {
+ {
+ MutexLock lock(&mu_);
+ if (!from_client_messages_.empty()) {
+ std::string payload = std::move(from_client_messages_.front());
+ from_client_messages_.pop_front();
+ return payload;
+ }
if (event_engine_->IsIdle()) return absl::nullopt;
- continue;
}
- std::string payload = std::move(from_client_messages_.front());
- from_client_messages_.pop_front();
- return payload;
+ event_engine_->Tick();
}
}
@@ -183,10 +184,12 @@ void FakeXdsTransportFactory::FakeStreamingCall::MaybeSendStatusToClient(
bool FakeXdsTransportFactory::FakeStreamingCall::WaitForReadsStarted(
size_t expected) {
while (true) {
+ {
+ MutexLock lock(&mu_);
+ if (reads_started_ == expected) return true;
+ if (event_engine_->IsIdle()) return false;
+ }
event_engine_->Tick();
- MutexLock lock(&mu_);
- if (reads_started_ == expected) return true;
- if (event_engine_->IsIdle()) return false;
}
}
@@ -236,11 +239,13 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() {
RefCountedPtr
FakeXdsTransportFactory::FakeXdsTransport::WaitForStream(const char* method) {
while (true) {
+ {
+ MutexLock lock(&mu_);
+ auto it = active_calls_.find(method);
+ if (it != active_calls_.end() && it->second != nullptr) return it->second;
+ if (event_engine_->IsIdle()) return nullptr;
+ }
event_engine_->Tick();
- MutexLock lock(&mu_);
- auto it = active_calls_.find(method);
- if (it != active_calls_.end() && it->second != nullptr) return it->second;
- if (event_engine_->IsIdle()) return nullptr;
}
}
diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
index 25474cfd24502..865d1647063fe 100644
--- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
@@ -462,6 +462,48 @@ TEST_P(OverrideHostTest, DrainingExcludedFromOverrideSet) {
ResetBackendCounters();
}
+TEST_P(OverrideHostTest, UnhealthyEndpoint) {
+ CreateAndStartBackends(3);
+ Cluster cluster = default_cluster_;
+ auto* lb_config = cluster.mutable_common_lb_config();
+ auto* override_health_status_set = lb_config->mutable_override_host_status();
+ override_health_status_set->add_statuses(HealthStatus::HEALTHY);
+ override_health_status_set->add_statuses(HealthStatus::DRAINING);
+ override_health_status_set->add_statuses(HealthStatus::DEGRADED);
+ override_health_status_set->add_statuses(HealthStatus::UNKNOWN);
+ balancer_->ads_service()->SetCdsResource(cluster);
+ SetListenerAndRouteConfiguration(balancer_.get(),
+ BuildListenerWithStatefulSessionFilter(),
+ default_route_config_);
+ balancer_->ads_service()->SetEdsResource(BuildEdsResource(
+ EdsResourceArgs({{"locality0",
+ {CreateEndpoint(0, HealthStatus::HEALTHY),
+ CreateEndpoint(1, HealthStatus::HEALTHY)}}})));
+ WaitForAllBackends(DEBUG_LOCATION, 0, 2);
+ CheckRpcSendOk(DEBUG_LOCATION, 4);
+ EXPECT_EQ(2, backends_[0]->backend_service()->request_count());
+ EXPECT_EQ(2, backends_[1]->backend_service()->request_count());
+ EXPECT_EQ(0, backends_[2]->backend_service()->request_count());
+ ResetBackendCounters();
+ // Get a cookie for backends_[0].
+ auto session_cookie = GetAffinityCookieHeaderForBackend(DEBUG_LOCATION, 0);
+ ASSERT_TRUE(session_cookie.has_value());
+ LOG(INFO) << session_cookie->first << " " << session_cookie->second;
+ balancer_->ads_service()->SetEdsResource(BuildEdsResource(
+ EdsResourceArgs({{"locality0",
+ {CreateEndpoint(0, HealthStatus::UNHEALTHY),
+ CreateEndpoint(1, HealthStatus::HEALTHY),
+ CreateEndpoint(2, HealthStatus::HEALTHY)}}})));
+ WaitForAllBackends(DEBUG_LOCATION, 2);
+ // Override for the draining host is not honored, RR is used instead.
+ CheckRpcSendOk(DEBUG_LOCATION, 2,
+ RpcOptions().set_metadata({*session_cookie}));
+ EXPECT_EQ(0, backends_[0]->backend_service()->request_count());
+ EXPECT_EQ(1, backends_[1]->backend_service()->request_count());
+ EXPECT_EQ(1, backends_[2]->backend_service()->request_count());
+ ResetBackendCounters();
+}
+
TEST_P(OverrideHostTest, OverrideWithWeightedClusters) {
CreateAndStartBackends(3);
const char* kNewCluster1Name = "new_cluster_1";
diff --git a/third_party/protobuf b/third_party/protobuf
index 10ef3f77683f7..2d4414f384dc4 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit 10ef3f77683f77fb3c059bf47725c27b3ff41e63
+Subproject commit 2d4414f384dc499af113b5991ce3eaa9df6dd931
diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch
index c4fe459124508..a4eb39f80ffb4 100644
--- a/third_party/protobuf.patch
+++ b/third_party/protobuf.patch
@@ -5,7 +5,7 @@ index 45a6c20c5..c28dd8852 100755
@@ -8,3 +8,9 @@
# Copyright 2007 Google Inc. All Rights Reserved.
- __version__ = '5.28.1'
+ __version__ = '5.29.0'
+
+if __name__ != '__main__':
+ try:
diff --git a/third_party/upb/upb/BUILD b/third_party/upb/upb/BUILD
index f66f9a2385106..b282b6eeb2d05 100644
--- a/third_party/upb/upb/BUILD
+++ b/third_party/upb/upb/BUILD
@@ -6,29 +6,15 @@
# https://developers.google.com/open-source/licenses/bsd
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+load("@rules_python//python:defs.bzl", "py_binary")
load("//bazel/private:upb_proto_library_internal/copts.bzl", "upb_proto_library_copts")
-load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-
-# begin:google_only
-# load("//tools/build_defs/kotlin/native:rules.bzl", "kt_native_interop_hint")
-# load("//tools/build_defs/license:license.bzl", "license")
-# end:google_only
-
-# begin:github_only
load(
"//upb/bazel:amalgamation.bzl",
"upb_amalgamation",
)
-# end:github_only
+load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-# begin:google_only
-# package(default_applicable_licenses = [":license"])
-#
-# license(
-# name = "license",
-# package_name = "upb",
-# )
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
licenses(["notice"])
@@ -122,24 +108,6 @@ alias(
visibility = ["//visibility:public"],
)
-alias(
- name = "descriptor_upb_proto",
- actual = "//upb/reflection:descriptor_upb_proto",
- visibility = ["//visibility:public"],
-)
-
-alias(
- name = "descriptor_upb_minitable_proto",
- actual = "//upb/reflection:descriptor_upb_minitable_proto",
- visibility = ["//visibility:public"],
-)
-
-alias(
- name = "descriptor_upb_proto_reflection",
- actual = "//upb/reflection:descriptor_upb_proto_reflection",
- visibility = ["//visibility:public"],
-)
-
alias(
name = "generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
actual = "//upb/reflection:generated_reflection_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
@@ -250,8 +218,6 @@ alias(
# Amalgamation #################################################################
-# begin:github_only
-
upb_amalgamation(
name = "gen_amalgamation",
outs = [
@@ -260,8 +226,6 @@ upb_amalgamation(
],
libs = [
":base",
- ":descriptor_upb_minitable_proto",
- ":descriptor_upb_proto",
":eps_copy_input_stream",
":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
":mem",
@@ -275,6 +239,8 @@ upb_amalgamation(
":reflection",
":wire",
":wire_reader",
+ "//src/google/protobuf:descriptor_upb_c_proto",
+ "//src/google/protobuf:descriptor_upb_minitable_proto",
"//upb/base:internal",
"//upb/hash:hash",
"//upb/lex:lex",
@@ -284,9 +250,13 @@ upb_amalgamation(
"//upb/message:types",
"//upb/mini_descriptor:internal",
"//upb/mini_table:internal",
+ "//upb/reflection:descriptor_upb_proto",
"//upb/reflection:internal",
+ "//upb/text:debug",
+ "//upb/text:internal",
],
strip_import_prefix = ["src"],
+ visibility = ["//rust:__pkg__"],
)
cc_library(
@@ -305,9 +275,6 @@ upb_amalgamation(
],
libs = [
":base",
- ":descriptor_upb_minitable_proto",
- ":descriptor_upb_proto_reflection",
- ":descriptor_upb_proto",
":eps_copy_input_stream",
":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
":json",
@@ -322,6 +289,9 @@ upb_amalgamation(
":reflection",
":wire",
":wire_reader",
+ "//src/google/protobuf:descriptor_upb_c_proto",
+ "//src/google/protobuf:descriptor_upb_minitable_proto",
+ "//src/google/protobuf:descriptor_upb_reflection_proto",
"//upb/base:internal",
"//upb/hash:hash",
"//upb/lex:lex",
@@ -331,6 +301,7 @@ upb_amalgamation(
"//upb/message:types",
"//upb/mini_descriptor:internal",
"//upb/mini_table:internal",
+ "//upb/reflection:descriptor_upb_proto",
"//upb/reflection:internal",
],
prefix = "php-",
@@ -354,8 +325,6 @@ upb_amalgamation(
],
libs = [
":base",
- ":descriptor_upb_minitable_proto",
- ":descriptor_upb_proto",
":eps_copy_input_stream",
":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
":json",
@@ -370,6 +339,8 @@ upb_amalgamation(
":reflection",
":wire",
":wire_reader",
+ "//src/google/protobuf:descriptor_upb_c_proto",
+ "//src/google/protobuf:descriptor_upb_minitable_proto",
"//upb/base:internal",
"//upb/hash:hash",
"//upb/lex:lex",
@@ -379,6 +350,7 @@ upb_amalgamation(
"//upb/message:types",
"//upb/mini_descriptor:internal",
"//upb/mini_table:internal",
+ "//upb/reflection:descriptor_upb_proto",
"//upb/reflection:internal",
],
prefix = "ruby-",
@@ -454,50 +426,3 @@ filegroup(
],
visibility = ["//pkg:__pkg__"],
)
-# end:github_only
-
-# begin:google_only
-#
-# py_binary(
-# name = "update_check_runs",
-# srcs = ["update_check_runs.py"],
-# main = "update_check_runs.py",
-# deps = [
-# "//third_party/py/absl:app",
-# "//third_party/py/absl/flags",
-# ],
-# )
-#
-# kt_native_interop_hint(
-# name = "upb_kotlin_native_hint",
-# compatible_with = ["//buildenv/target:non_prod"],
-# headers_to_exclude = glob([
-# "**/*.hpp",
-# ]),
-# kotlin_package = "upb",
-# no_string_conversion = [
-# "_upb_MiniTable_Build",
-# "upb_Decode",
-# "upb_StringView_FromDataAndSize",
-# ],
-# strict_enums = [
-# "upb_CType",
-# "upb_DecodeStatus",
-# "upb_EncodeStatus",
-# "upb_FieldType",
-# "upb_FindUnknown_Status",
-# "upb_GetExtension_Status",
-# "upb_GetExtensionAsBytes_Status",
-# "upb_Label",
-# "upb_MapInsertStatus",
-# "upb_UnknownToMessage_Status",
-# "upb_WireType",
-# ],
-# visibility = [
-# "//third_party/bazel_rules/rules_kotlin/kotlin/native:__subpackages__",
-# "//third_party/kotlin/protobuf:__subpackages__",
-# "//upb:__subpackages__",
-# ],
-# )
-#
-# end:google_only
diff --git a/third_party/upb/upb/base/BUILD b/third_party/upb/upb/base/BUILD
index 4c8802d0640cd..47b44a031d402 100644
--- a/third_party/upb/upb/base/BUILD
+++ b/third_party/upb/upb/base/BUILD
@@ -7,6 +7,8 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "base",
srcs = [
@@ -37,7 +39,6 @@ cc_library(
deps = ["//upb:port"],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -52,4 +53,3 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
diff --git a/third_party/upb/upb/bazel/BUILD b/third_party/upb/upb/bazel/BUILD
index 1e6e0a94065cf..f83de7b75ae58 100644
--- a/third_party/upb/upb/bazel/BUILD
+++ b/third_party/upb/upb/bazel/BUILD
@@ -5,24 +5,13 @@
# license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd
+load("@bazel_skylib//lib:selects.bzl", "selects")
load("@rules_python//python:defs.bzl", "py_binary")
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
licenses(["notice"])
-# begin:google_only
-# selects.config_setting_group(
-# name = "android_opt",
-# match_all = [
-# "//tools/cc_target_os:android",
-# "//tools/compilation_mode:opt",
-# ],
-# )
-# end:google_only
-
py_binary(
name = "amalgamate",
srcs = ["amalgamate.py"],
diff --git a/third_party/upb/upb/bazel/amalgamate.py b/third_party/upb/upb/bazel/amalgamate.py
index f4e83fc79a4b2..96f142c791ffa 100755
--- a/third_party/upb/upb/bazel/amalgamate.py
+++ b/third_party/upb/upb/bazel/amalgamate.py
@@ -106,6 +106,8 @@ def _process_include(self, line):
if include.endswith("hpp"):
# Skip, we don't support the amalgamation from C++.
return True
+ if re.search(r"stage\d/", include):
+ return True
elif include in self.included:
return True
else:
diff --git a/third_party/upb/upb/bazel/build_defs.bzl b/third_party/upb/upb/bazel/build_defs.bzl
index fddec3b3230a2..23ad43fe4d519 100644
--- a/third_party/upb/upb/bazel/build_defs.bzl
+++ b/third_party/upb/upb/bazel/build_defs.bzl
@@ -10,7 +10,6 @@
_DEFAULT_CPPOPTS = []
_DEFAULT_COPTS = []
-# begin:github_only
_DEFAULT_CPPOPTS.extend([
"-Wextra",
# "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang)
@@ -26,24 +25,15 @@ _DEFAULT_COPTS.extend([
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
#"-Wno-maybe-uninitialized",
])
-# end:github_only
UPB_DEFAULT_CPPOPTS = select({
"//upb:windows": [],
- # begin:google_only
- # # Override default -Oz for release builds on Android.
- # "//upb/bazel:android_opt": _DEFAULT_CPPOPTS + ["-O2"],
- # end:google_only
"//conditions:default": _DEFAULT_CPPOPTS,
})
UPB_DEFAULT_COPTS = select({
"//upb:windows": [],
"//upb:fasttable_enabled_setting": ["-std=gnu99", "-DUPB_ENABLE_FASTTABLE"],
- # begin:google_only
- # # Override default -Oz for release builds on Android.
- # "//upb/bazel:android_opt": _DEFAULT_COPTS + ["-O2"],
- # end:google_only
"//conditions:default": _DEFAULT_COPTS,
})
diff --git a/third_party/upb/upb/cmake/BUILD.bazel b/third_party/upb/upb/cmake/BUILD.bazel
index 5f86762611c20..81338ed3273f4 100644
--- a/third_party/upb/upb/cmake/BUILD.bazel
+++ b/third_party/upb/upb/cmake/BUILD.bazel
@@ -5,7 +5,7 @@
# license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd
-load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
load(
"//upb/bazel:build_defs.bzl",
"make_shell_script",
@@ -47,8 +47,8 @@ genrule(
genrule(
name = "copy_protos",
srcs = [
- "//upb:descriptor_upb_proto",
- "//upb:descriptor_upb_minitable_proto",
+ "//src/google/protobuf:descriptor_upb_c_proto",
+ "//src/google/protobuf:descriptor_upb_minitable_proto",
],
outs = [
"generated-in/google/protobuf/descriptor.upb.h",
@@ -107,3 +107,26 @@ sh_test(
}),
deps = ["@bazel_tools//tools/bash/runfiles"],
)
+
+pkg_files(
+ name = "upb_cmake_dist",
+ srcs = [
+ ":copy_protos",
+ ":gen_cmakelists",
+ "//third_party/utf8_range:utf8_range_srcs",
+ "//upb:source_files",
+ "//upb/base:source_files",
+ "//upb/hash:source_files",
+ "//upb/lex:source_files",
+ "//upb/mem:source_files",
+ "//upb/message:source_files",
+ "//upb/mini_descriptor:source_files",
+ "//upb/mini_table:source_files",
+ "//upb/port:source_files",
+ "//upb/reflection:source_files",
+ "//upb/text:source_files",
+ "//upb/wire:source_files",
+ ],
+ strip_prefix = strip_prefix.from_root(""),
+ visibility = ["//rust:__pkg__"],
+)
diff --git a/third_party/upb/upb/cmake/CMakeLists.txt b/third_party/upb/upb/cmake/CMakeLists.txt
index 513d34041f0fa..2649958d8b9a4 100644
--- a/third_party/upb/upb/cmake/CMakeLists.txt
+++ b/third_party/upb/upb/cmake/CMakeLists.txt
@@ -73,7 +73,7 @@ add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_p
target_include_directories(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
$
$
- $
+ $
)
target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
base
@@ -90,7 +90,7 @@ add_library(generated_cpp_support__only_for_generated_code_do_not_use__i_give_pe
target_include_directories(generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
$
$
- $
+ $
)
diff --git a/third_party/upb/upb/cmake/README.md b/third_party/upb/upb/cmake/README.md
index 211a054ab04bd..7204207fd5f9e 100644
--- a/third_party/upb/upb/cmake/README.md
+++ b/third_party/upb/upb/cmake/README.md
@@ -19,5 +19,5 @@ scripts in this directory. We want to avoid having two separate sources of
truth that both need to be updated when a file is added or removed.
This directory also contains some generated files that would be created
-on the fly during a Bazel build. These are automaticaly kept in sync by
+on the fly during a Bazel build. These are automatically kept in sync by
the Bazel test `//cmake:test_generated_files`.
diff --git a/third_party/upb/upb/cmake/build_defs.bzl b/third_party/upb/upb/cmake/build_defs.bzl
index 325189c7f11fa..09e5c15db9ac5 100644
--- a/third_party/upb/upb/cmake/build_defs.bzl
+++ b/third_party/upb/upb/cmake/build_defs.bzl
@@ -4,9 +4,10 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd
-
"""Bazel support functions related to CMake support."""
+load("@rules_python//python:py_test.bzl", "py_test")
+
def staleness_test(name, outs, generated_pattern, target_files = None, tags = [], **kwargs):
"""Tests that checked-in file(s) match the contents of generated file(s).
@@ -46,7 +47,7 @@ def staleness_test(name, outs, generated_pattern, target_files = None, tags = []
"sed -i.bak -e 's|INSERT_FILE_LIST_HERE|" + "\\\n ".join(file_list) + "|' $@",
)
- native.py_test(
+ py_test(
name = name,
srcs = [script_name],
data = existing_outs + [generated_pattern % file for file in outs],
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h
index af260e7acf760..736f42fe5a9d1 100644
--- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/descriptor.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -6893,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c
index 08fa451f750f4..f641f657d63f4 100644
--- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr},
};
@@ -23,9 +23,9 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
};
const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
- &google_protobuf_FileDescriptorSet_submsgs[0],
+ &google_protobuf_FileDescriptorSet__submsgs[0],
&google_protobuf_FileDescriptorSet__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.FileDescriptorSet",
#endif
@@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
@@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13]
};
const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
- &google_protobuf_FileDescriptorProto_submsgs[0],
+ &google_protobuf_FileDescriptorProto__submsgs[0],
&google_protobuf_FileDescriptorProto__fields[0],
UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
@@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
};
const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
- &google_protobuf_DescriptorProto_submsgs[0],
+ &google_protobuf_DescriptorProto__submsgs[0],
&google_protobuf_DescriptorProto__fields[0],
UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr},
};
@@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__
};
const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = {
- &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+ &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0],
&google_protobuf_DescriptorProto_ExtensionRange__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init =
};
const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init},
};
static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
@@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4]
};
const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = {
- &google_protobuf_ExtensionRangeOptions_submsgs[0],
+ &google_protobuf_ExtensionRangeOptions__submsgs[0],
&google_protobuf_ExtensionRangeOptions__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini
};
const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
@@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11]
};
const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
- &google_protobuf_FieldDescriptorProto_submsgs[0],
+ &google_protobuf_FieldDescriptorProto__submsgs[0],
&google_protobuf_FieldDescriptorProto__fields[0],
UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr},
};
@@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2]
};
const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
- &google_protobuf_OneofDescriptorProto_submsgs[0],
+ &google_protobuf_OneofDescriptorProto__submsgs[0],
&google_protobuf_OneofDescriptorProto__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr},
@@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] =
};
const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
- &google_protobuf_EnumDescriptorProto_submsgs[0],
+ &google_protobuf_EnumDescriptorProto__submsgs[0],
&google_protobuf_EnumDescriptorProto__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg
};
const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr},
};
@@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields
};
const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
- &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+ &google_protobuf_EnumValueDescriptorProto__submsgs[0],
&google_protobuf_EnumValueDescriptorProto__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr},
};
@@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3
};
const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
- &google_protobuf_ServiceDescriptorProto_submsgs[0],
+ &google_protobuf_ServiceDescriptorProto__submsgs[0],
&google_protobuf_ServiceDescriptorProto__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr},
};
@@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6]
};
const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
- &google_protobuf_MethodDescriptorProto_submsgs[0],
+ &google_protobuf_MethodDescriptorProto__submsgs[0],
&google_protobuf_MethodDescriptorProto__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init},
};
static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
@@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
};
const upb_MiniTable google__protobuf__FileOptions_msg_init = {
- &google_protobuf_FileOptions_submsgs[0],
+ &google_protobuf_FileOptions__submsgs[0],
&google_protobuf_FileOptions__fields[0],
UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
};
const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
- &google_protobuf_MessageOptions_submsgs[0],
+ &google_protobuf_MessageOptions__submsgs[0],
&google_protobuf_MessageOptions__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
@@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
};
const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
- &google_protobuf_FieldOptions_submsgs[0],
+ &google_protobuf_FieldOptions__submsgs[0],
&google_protobuf_FieldOptions__fields[0],
UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
@@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie
};
const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
- &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+ &google_protobuf_FieldOptions_EditionDefault__submsgs[0],
&google_protobuf_FieldOptions_EditionDefault__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = {
@@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie
};
const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
- &google_protobuf_FieldOptions_FeatureSupport_submsgs[0],
+ &google_protobuf_FieldOptions_FeatureSupport__submsgs[0],
&google_protobuf_FieldOptions_FeatureSupport__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
};
const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
- &google_protobuf_OneofOptions_submsgs[0],
+ &google_protobuf_OneofOptions__submsgs[0],
&google_protobuf_OneofOptions__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
- &google_protobuf_EnumOptions_submsgs[0],
+ &google_protobuf_EnumOptions__submsgs[0],
&google_protobuf_EnumOptions__fields[0],
UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
@@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
- &google_protobuf_EnumValueOptions_submsgs[0],
+ &google_protobuf_EnumValueOptions__submsgs[0],
&google_protobuf_EnumValueOptions__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
};
const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
- &google_protobuf_ServiceOptions_submsgs[0],
+ &google_protobuf_ServiceOptions__submsgs[0],
&google_protobuf_ServiceOptions__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init},
};
static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
@@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
};
const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
- &google_protobuf_MethodOptions_submsgs[0],
+ &google_protobuf_MethodOptions__submsgs[0],
&google_protobuf_MethodOptions__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr},
};
@@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] =
};
const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = {
- &google_protobuf_UninterpretedOption_submsgs[0],
+ &google_protobuf_UninterpretedOption__submsgs[0],
&google_protobuf_UninterpretedOption__fields[0],
UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = {
};
const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
@@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
};
const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
- &google_protobuf_FeatureSet_submsgs[0],
+ &google_protobuf_FeatureSet__submsgs[0],
&google_protobuf_FeatureSet__fields[0],
40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = {
@@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] =
};
const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
- &google_protobuf_FeatureSetDefaults_submsgs[0],
+ &google_protobuf_FeatureSetDefaults__submsgs[0],
&google_protobuf_FeatureSetDefaults__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = {
@@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi
};
const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = {
- &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+ &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0],
&google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr},
};
@@ -1079,9 +1079,9 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = {
- &google_protobuf_SourceCodeInfo_submsgs[0],
+ &google_protobuf_SourceCodeInfo__submsgs[0],
&google_protobuf_SourceCodeInfo__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.SourceCodeInfo",
#endif
@@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = {
};
const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr},
};
@@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
- &google_protobuf_GeneratedCodeInfo_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo__submsgs[0],
&google_protobuf_GeneratedCodeInfo__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init},
};
static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
@@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
- &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0],
&google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
-const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
64,
9,
{
@@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = {
64,
0,
{
@@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = {
64,
0,
{
@@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = {
64,
0,
{
@@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = {
64,
0,
{
@@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = {
64,
0,
{
@@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = {
64,
0,
{
@@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = {
64,
0,
{
@@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = {
64,
0,
{
@@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = {
64,
0,
{
@@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = {
64,
0,
{
@@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = {
64,
0,
{
@@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = {
64,
0,
{
@@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init =
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = {
64,
0,
{
@@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init
},
};
-const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = {
64,
0,
{
@@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = {
64,
0,
{
@@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en
},
};
-const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = {
64,
0,
{
@@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = {
};
static const upb_MiniTableEnum *enums_layout[17] = {
- &google_protobuf_Edition_enum_init,
- &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
- &google_protobuf_FeatureSet_EnumType_enum_init,
- &google_protobuf_FeatureSet_FieldPresence_enum_init,
- &google_protobuf_FeatureSet_JsonFormat_enum_init,
- &google_protobuf_FeatureSet_MessageEncoding_enum_init,
- &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
- &google_protobuf_FeatureSet_Utf8Validation_enum_init,
- &google_protobuf_FieldDescriptorProto_Label_enum_init,
- &google_protobuf_FieldDescriptorProto_Type_enum_init,
- &google_protobuf_FieldOptions_CType_enum_init,
- &google_protobuf_FieldOptions_JSType_enum_init,
- &google_protobuf_FieldOptions_OptionRetention_enum_init,
- &google_protobuf_FieldOptions_OptionTargetType_enum_init,
- &google_protobuf_FileOptions_OptimizeMode_enum_init,
- &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
- &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+ &google__protobuf__Edition_enum_init,
+ &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init,
+ &google__protobuf__FeatureSet__EnumType_enum_init,
+ &google__protobuf__FeatureSet__FieldPresence_enum_init,
+ &google__protobuf__FeatureSet__JsonFormat_enum_init,
+ &google__protobuf__FeatureSet__MessageEncoding_enum_init,
+ &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init,
+ &google__protobuf__FeatureSet__Utf8Validation_enum_init,
+ &google__protobuf__FieldDescriptorProto__Label_enum_init,
+ &google__protobuf__FieldDescriptorProto__Type_enum_init,
+ &google__protobuf__FieldOptions__CType_enum_init,
+ &google__protobuf__FieldOptions__JSType_enum_init,
+ &google__protobuf__FieldOptions__OptionRetention_enum_init,
+ &google__protobuf__FieldOptions__OptionTargetType_enum_init,
+ &google__protobuf__FileOptions__OptimizeMode_enum_init,
+ &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init,
+ &google__protobuf__MethodOptions__IdempotencyLevel_enum_init,
};
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
diff --git a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h
index 6cb83ecedcc06..1dea594faf25a 100644
--- a/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h
+++ b/third_party/upb/upb/cmake/google/protobuf/descriptor.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr;
extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr;
-extern const upb_MiniTableEnum google_protobuf_Edition_enum_init;
-extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
-extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
-extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
+extern const upb_MiniTableEnum google__protobuf__Edition_enum_init;
+extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init;
+extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init;
+extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init;
extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#ifdef __cplusplus
@@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/third_party/upb/upb/cmake/make_cmakelists.py b/third_party/upb/upb/cmake/make_cmakelists.py
index bd959178f4560..8135c6f205097 100755
--- a/third_party/upb/upb/cmake/make_cmakelists.py
+++ b/third_party/upb/upb/cmake/make_cmakelists.py
@@ -58,7 +58,7 @@ def IsSourceFile(name):
target_include_directories(%(name)s %(keyword)s
$
$
- $
+ $
)
"""
@@ -238,6 +238,8 @@ def bootstrap_cc_library(self, **kwargs):
def alias(self, **kwargs):
pass
+ def package(self, **kwargs):
+ pass
class Converter(object):
def __init__(self):
diff --git a/third_party/upb/upb/conformance/BUILD b/third_party/upb/upb/conformance/BUILD
index 9630c016bc64a..72a13b99b9264 100644
--- a/third_party/upb/upb/conformance/BUILD
+++ b/third_party/upb/upb/conformance/BUILD
@@ -16,9 +16,7 @@ load(
"make_shell_script",
)
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
licenses(["notice"])
diff --git a/third_party/upb/upb/hash/BUILD b/third_party/upb/upb/hash/BUILD
index 51f2da394141c..b7313d3979bff 100644
--- a/third_party/upb/upb/hash/BUILD
+++ b/third_party/upb/upb/hash/BUILD
@@ -7,9 +7,7 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
cc_library(
name = "hash",
@@ -44,7 +42,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -58,9 +55,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -70,4 +65,3 @@ filegroup(
),
visibility = ["//pkg:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/io/BUILD b/third_party/upb/upb/io/BUILD
index c1886185c2b26..700eb046d01fe 100644
--- a/third_party/upb/upb/io/BUILD
+++ b/third_party/upb/upb/io/BUILD
@@ -1,6 +1,4 @@
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
cc_library(
name = "string",
diff --git a/third_party/upb/upb/io/string.h b/third_party/upb/upb/io/string.h
index ffaffb009bf02..cac8ec92b5282 100644
--- a/third_party/upb/upb/io/string.h
+++ b/third_party/upb/upb/io/string.h
@@ -38,7 +38,7 @@ typedef struct {
upb_Arena* arena_;
} upb_String;
-// Initialize an already-allocted upb_String object.
+// Initialize an already-allocated upb_String object.
UPB_INLINE bool upb_String_Init(upb_String* s, upb_Arena* a) {
static const int kDefaultCapacity = 16;
diff --git a/third_party/upb/upb/io/tokenizer.c b/third_party/upb/upb/io/tokenizer.c
index cfc1d400f778b..9f2d1c14f0517 100644
--- a/third_party/upb/upb/io/tokenizer.c
+++ b/third_party/upb/upb/io/tokenizer.c
@@ -403,7 +403,7 @@ static void ConsumeString(upb_Tokenizer* t, char delimiter) {
}
// Read and consume a number, returning TYPE_FLOAT or TYPE_INTEGER depending
-// on what was read. This needs to know if the first characer was a zero in
+// on what was read. This needs to know if the first character was a zero in
// order to correctly recognize hex and octal numbers. It also needs to know
// whether the first character was a '.' to parse floating point correctly.
static upb_TokenType ConsumeNumber(upb_Tokenizer* t, bool started_with_zero,
diff --git a/third_party/upb/upb/json/BUILD b/third_party/upb/upb/json/BUILD
index 8979918fe89a5..18f5c0a0033f0 100644
--- a/third_party/upb/upb/json/BUILD
+++ b/third_party/upb/upb/json/BUILD
@@ -7,9 +7,7 @@ load(
)
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
cc_library(
name = "json",
@@ -93,26 +91,6 @@ upb_c_proto_library(
deps = ["//:struct_proto"],
)
-# begin:google_only
-# cc_test(
-# name = "fuzz_test",
-# srcs = ["fuzz_test.cc"],
-# deps = [
-# ":json",
-# ":test_upb_proto",
-# ":test_upb_proto_reflection",
-# "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main",
-# "//testing/fuzzing:fuzztest",
-# "//upb:base",
-# "//upb:mem",
-# "//upb:message",
-# "//upb:mini_table",
-# "//upb:reflection",
-# ],
-# )
-# end:google_only
-
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -133,4 +111,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/json/decode.c b/third_party/upb/upb/json/decode.c
index 9275bcb1af508..c14374550bdaf 100644
--- a/third_party/upb/upb/json/decode.c
+++ b/third_party/upb/upb/json/decode.c
@@ -41,6 +41,7 @@ typedef struct {
upb_Arena* arena; /* TODO: should we have a tmp arena for tmp data? */
const upb_DefPool* symtab;
int depth;
+ int result;
upb_Status* status;
jmp_buf err;
int line;
@@ -670,6 +671,16 @@ static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
return ret;
}
+static void jsondec_checkempty(jsondec* d, upb_StringView str,
+ const upb_FieldDef* f) {
+ if (str.size != 0) return;
+ d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+ upb_Status_SetErrorFormat(d->status,
+ "Empty string is not a valid number (field: %s). "
+ "This will be an error in a future version.",
+ upb_FieldDef_FullName(f));
+}
+
/* Primitive value types ******************************************************/
/* Parse INT32 or INT64 value. */
@@ -691,6 +702,7 @@ static upb_MessageValue jsondec_int(jsondec* d, const upb_FieldDef* f) {
}
case JD_STRING: {
upb_StringView str = jsondec_string(d);
+ jsondec_checkempty(d, str, f);
val.int64_val = jsondec_strtoint64(d, str);
break;
}
@@ -728,6 +740,7 @@ static upb_MessageValue jsondec_uint(jsondec* d, const upb_FieldDef* f) {
}
case JD_STRING: {
upb_StringView str = jsondec_string(d);
+ jsondec_checkempty(d, str, f);
val.uint64_val = jsondec_strtouint64(d, str);
break;
}
@@ -756,14 +769,26 @@ static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
break;
case JD_STRING:
str = jsondec_string(d);
- if (jsondec_streql(str, "NaN")) {
+ if (str.size == 0) {
+ jsondec_checkempty(d, str, f);
+ val.double_val = 0.0;
+ } else if (jsondec_streql(str, "NaN")) {
val.double_val = NAN;
} else if (jsondec_streql(str, "Infinity")) {
val.double_val = INFINITY;
} else if (jsondec_streql(str, "-Infinity")) {
val.double_val = -INFINITY;
} else {
- val.double_val = strtod(str.data, NULL);
+ char* end;
+ val.double_val = strtod(str.data, &end);
+ if (end != str.data + str.size) {
+ d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+ upb_Status_SetErrorFormat(
+ d->status,
+ "Non-number characters in quoted number (field: %s). "
+ "This will be an error in a future version.",
+ upb_FieldDef_FullName(f));
+ }
}
break;
default:
@@ -1505,10 +1530,10 @@ static void jsondec_wellknown(jsondec* d, upb_Message* msg,
}
}
-static bool upb_JsonDecoder_Decode(jsondec* const d, upb_Message* const msg,
- const upb_MessageDef* const m) {
+static int upb_JsonDecoder_Decode(jsondec* const d, upb_Message* const msg,
+ const upb_MessageDef* const m) {
UPB_ASSERT(!upb_Message_IsFrozen(msg));
- if (UPB_SETJMP(d->err)) return false;
+ if (UPB_SETJMP(d->err)) return kUpb_JsonDecodeResult_Error;
jsondec_tomsg(d, msg, m);
@@ -1517,16 +1542,19 @@ static bool upb_JsonDecoder_Decode(jsondec* const d, upb_Message* const msg,
jsondec_consumews(d);
if (d->ptr == d->end) {
- return true;
+ return d->result;
} else {
jsondec_seterrmsg(d, "unexpected trailing characters");
- return false;
+ return kUpb_JsonDecodeResult_Error;
}
}
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
- const upb_MessageDef* m, const upb_DefPool* symtab,
- int options, upb_Arena* arena, upb_Status* status) {
+int upb_JsonDecodeDetectingNonconformance(const char* buf, size_t size,
+ upb_Message* msg,
+ const upb_MessageDef* m,
+ const upb_DefPool* symtab,
+ int options, upb_Arena* arena,
+ upb_Status* status) {
UPB_ASSERT(!upb_Message_IsFrozen(msg));
jsondec d;
@@ -1539,6 +1567,7 @@ bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
d.status = status;
d.options = options;
d.depth = 64;
+ d.result = kUpb_JsonDecodeResult_Ok;
d.line = 1;
d.line_begin = d.ptr;
d.debug_field = NULL;
diff --git a/third_party/upb/upb/json/decode.h b/third_party/upb/upb/json/decode.h
index cc17e84d21f87..ffb05dc80b755 100644
--- a/third_party/upb/upb/json/decode.h
+++ b/third_party/upb/upb/json/decode.h
@@ -8,6 +8,11 @@
#ifndef UPB_JSON_DECODE_H_
#define UPB_JSON_DECODE_H_
+#include
+
+#include "upb/base/status.h"
+#include "upb/mem/arena.h"
+#include "upb/message/message.h"
#include "upb/reflection/def.h"
// Must be last.
@@ -19,9 +24,27 @@ extern "C" {
enum { upb_JsonDecode_IgnoreUnknown = 1 };
-UPB_API bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
- const upb_MessageDef* m, const upb_DefPool* symtab,
- int options, upb_Arena* arena, upb_Status* status);
+enum {
+ kUpb_JsonDecodeResult_Ok = 0,
+ kUpb_JsonDecodeResult_OkWithEmptyStringNumerics = 1,
+ kUpb_JsonDecodeResult_Error = 2,
+};
+
+UPB_API int upb_JsonDecodeDetectingNonconformance(const char* buf, size_t size,
+ upb_Message* msg,
+ const upb_MessageDef* m,
+ const upb_DefPool* symtab,
+ int options, upb_Arena* arena,
+ upb_Status* status);
+
+UPB_API_INLINE bool upb_JsonDecode(const char* buf, size_t size,
+ upb_Message* msg, const upb_MessageDef* m,
+ const upb_DefPool* symtab, int options,
+ upb_Arena* arena, upb_Status* status) {
+ return upb_JsonDecodeDetectingNonconformance(buf, size, msg, m, symtab,
+ options, arena, status) ==
+ kUpb_JsonDecodeResult_Ok;
+}
#ifdef __cplusplus
} /* extern "C" */
diff --git a/third_party/upb/upb/lex/BUILD b/third_party/upb/upb/lex/BUILD
index efcf9e9e40bc2..91c4d11a65dc5 100644
--- a/third_party/upb/upb/lex/BUILD
+++ b/third_party/upb/upb/lex/BUILD
@@ -7,9 +7,7 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
cc_library(
name = "lex",
@@ -51,7 +49,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -65,9 +62,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -77,4 +72,3 @@ filegroup(
),
visibility = ["//pkg:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/mem/BUILD b/third_party/upb/upb/mem/BUILD
index d6ed12b989460..9fe9092f88592 100644
--- a/third_party/upb/upb/mem/BUILD
+++ b/third_party/upb/upb/mem/BUILD
@@ -7,6 +7,8 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "mem",
srcs = [
@@ -53,7 +55,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -68,9 +69,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -80,4 +79,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/mem/arena.c b/third_party/upb/upb/mem/arena.c
index 544179228d8ee..435a1e10939d7 100644
--- a/third_party/upb/upb/mem/arena.c
+++ b/third_party/upb/upb/mem/arena.c
@@ -433,7 +433,7 @@ static void _upb_Arena_DoFuseArenaLists(upb_ArenaInternal* const parent,
static upb_ArenaInternal* _upb_Arena_DoFuse(upb_Arena* a1, upb_Arena* a2,
uintptr_t* ref_delta) {
- // `parent_or_count` has two disctint modes
+ // `parent_or_count` has two distinct modes
// - parent pointer mode
// - refcount mode
//
diff --git a/third_party/upb/upb/message/BUILD b/third_party/upb/upb/message/BUILD
index 0e8b5883c9d68..9724a5b6917dc 100644
--- a/third_party/upb/upb/message/BUILD
+++ b/third_party/upb/upb/message/BUILD
@@ -16,6 +16,8 @@ load(
)
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "message",
srcs = [
@@ -430,7 +432,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -444,9 +445,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -467,4 +466,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/message/accessors.h b/third_party/upb/upb/message/accessors.h
index 922026ee48336..613f634af3663 100644
--- a/third_party/upb/upb/message/accessors.h
+++ b/third_party/upb/upb/message/accessors.h
@@ -8,6 +8,8 @@
#ifndef UPB_MESSAGE_ACCESSORS_H_
#define UPB_MESSAGE_ACCESSORS_H_
+#include
+
#include "upb/base/string_view.h"
#include "upb/mem/arena.h"
#include "upb/message/array.h"
@@ -150,6 +152,10 @@ UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg,
const upb_MiniTableField* f,
int64_t value);
+UPB_API_INLINE void upb_Message_SetBaseFieldMessage(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ upb_Message* value);
+
UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg,
const upb_MiniTableField* f,
upb_StringView value);
@@ -222,6 +228,8 @@ UPB_API_INLINE bool upb_Message_SetInt64(upb_Message* msg,
const upb_MiniTableField* f,
int64_t value, upb_Arena* a);
+// Unlike the other similarly-named setters, this function can only be
+// called on base fields. Prefer upb_Message_SetBaseFieldMessage().
UPB_API_INLINE void upb_Message_SetMessage(upb_Message* msg,
const upb_MiniTableField* f,
upb_Message* value);
diff --git a/third_party/upb/upb/message/internal/accessors.h b/third_party/upb/upb/message/internal/accessors.h
index 5bbfb1e0bc299..aae0fdc0a8b2d 100644
--- a/third_party/upb/upb/message/internal/accessors.h
+++ b/third_party/upb/upb/message/internal/accessors.h
@@ -639,6 +639,13 @@ UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg,
upb_Message_SetBaseField(msg, f, &value);
}
+UPB_API_INLINE void upb_Message_SetBaseFieldMessage(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ struct upb_Message* value) {
+ UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr)
+ (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(value, false));
+}
+
UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg,
const upb_MiniTableField* f,
upb_StringView value) {
@@ -807,8 +814,8 @@ UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg,
UPB_API_INLINE void upb_Message_SetMessage(struct upb_Message* msg,
const upb_MiniTableField* f,
struct upb_Message* value) {
- UPB_PRIVATE(_upb_Message_SetTaggedMessagePtr)
- (msg, f, UPB_PRIVATE(_upb_TaggedMessagePtr_Pack)(value, false));
+ UPB_ASSERT(!upb_MiniTableField_IsExtension(f));
+ upb_Message_SetBaseFieldMessage(msg, f, value);
}
// Sets the value of a `string` or `bytes` field. The bytes of the value are not
diff --git a/third_party/upb/upb/message/internal/message.c b/third_party/upb/upb/message/internal/message.c
index 57ab2d7371cdb..5f321c7bb220f 100644
--- a/third_party/upb/upb/message/internal/message.c
+++ b/third_party/upb/upb/message/internal/message.c
@@ -17,9 +17,9 @@
// Must be last.
#include "upb/port/def.inc"
-const float kUpb_FltInfinity = INFINITY;
-const double kUpb_Infinity = INFINITY;
-const double kUpb_NaN = NAN;
+const float kUpb_FltInfinity = (float)(1.0 / 0.0);
+const double kUpb_Infinity = 1.0 / 0.0;
+const double kUpb_NaN = 0.0 / 0.0;
bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
upb_Arena* a) {
diff --git a/third_party/upb/upb/message/test.cc b/third_party/upb/upb/message/test.cc
index 50eeee50b7bcc..446da19dfa622 100644
--- a/third_party/upb/upb/message/test.cc
+++ b/third_party/upb/upb/message/test.cc
@@ -38,10 +38,6 @@
#include "upb/wire/decode.h"
#include "upb/wire/encode.h"
-// begin:google_only
-// #include "testing/fuzzing/fuzztest.h"
-// end:google_only
-
void VerifyMessage(const upb_test_TestExtensions* ext_msg) {
EXPECT_TRUE(upb_test_TestExtensions_has_optional_int32_ext(ext_msg));
// EXPECT_FALSE(upb_test_TestExtensions_Nested_has_optional_int32_ext(ext_msg));
@@ -583,196 +579,3 @@ TEST(MessageTest, Freeze) {
ASSERT_TRUE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
}
}
-
-// begin:google_only
-//
-// static void DecodeEncodeArbitrarySchemaAndPayload(
-// const upb::fuzz::MiniTableFuzzInput& input, std::string_view proto_payload,
-// int decode_options, int encode_options, bool length_prefixed = false) {
-// // Lexan does not have setenv
-// #ifndef _MSC_VER
-// setenv("FUZZTEST_STACK_LIMIT", "262144", 1);
-// #endif
-// // The value of 80 used here is empirical and intended to roughly represent
-// // the tiny 64K stack size used by the test framework. We still see the
-// // occasional stack overflow at 90, so far 80 has worked 100% of the time.
-// decode_options = upb_Decode_LimitDepth(decode_options, 80);
-// encode_options = upb_Encode_LimitDepth(encode_options, 80);
-//
-// upb::Arena arena;
-// upb_ExtensionRegistry* exts;
-// const upb_MiniTable* mini_table =
-// upb::fuzz::BuildMiniTable(input, &exts, arena.ptr());
-// if (!mini_table) return;
-// upb_Message* msg = upb_Message_New(mini_table, arena.ptr());
-// if (length_prefixed) {
-// size_t num_bytes_read = 0;
-// upb_DecodeStatus status = upb_DecodeLengthPrefixed(
-// proto_payload.data(), proto_payload.size(), msg, &num_bytes_read,
-// mini_table, exts, decode_options, arena.ptr());
-// ASSERT_TRUE(status != kUpb_DecodeStatus_Ok ||
-// num_bytes_read <= proto_payload.size());
-// } else {
-// upb_Decode(proto_payload.data(), proto_payload.size(), msg, mini_table,
-// exts, decode_options, arena.ptr());
-// }
-// char* ptr;
-// size_t size;
-// if (length_prefixed) {
-// upb_EncodeLengthPrefixed(msg, mini_table, encode_options, arena.ptr(), &ptr,
-// &size);
-// } else {
-// upb_Encode(msg, mini_table, encode_options, arena.ptr(), &ptr, &size);
-// }
-// }
-// FUZZ_TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayload);
-//
-// TEST(FuzzTest, DecodeUnknownProto2EnumExtension) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\256\354Rt\216\3271\234", "\243\243\267\207\336gV\366w"},
-// {"z"},
-// "}\212\304d\371\363\341\2329\325B\264\377?\215\223\201\201\226y\201%"
-// "\321\363\255;",
-// {}},
-// "\010", -724543908, -591643538);
-// }
-//
-// TEST(FuzzTest, DecodeExtensionEnsurePresenceInitialized) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\031", "S", "\364", "", "", "j", "\303", "", "\224", "\277"},
-// {},
-// "_C-\236$*)C0C>",
-// {4041515984, 2147483647, 1929379871, 0, 3715937258, 4294967295}},
-// "\010\002", 342248070, -806315555);
-// }
-//
-// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\n"}, {""}, ".\244", {}}, "\013\032\005\212a#\365\336\020\001\226",
-// 14803219, 670718349);
-// }
-//
-// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage2) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"\n", "G", "\n", "\274", ""},
-// {"", "\030"},
-// "_@",
-// {4294967295, 2147483647}},
-// std::string("\013\032\000\220", 4),
-// 279975758, 1647495141);
-// }
-//
-// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage3) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\n"}, {"B", ""}, "\212:b", {11141121}},
-// "\013\032\004\357;7\363\020\001\346\240\200\201\271", 399842149,
-// -452966025);
-// }
-//
-// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage4) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\n", "3\340", "\354"}, {}, "B}G", {4294967295, 4082331310}},
-// "\013\032\004\244B\331\255\020\001\220\224\243\350\t", -561523015,
-// 1683327312);
-// }
-//
-// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage5) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\n"}, {""}, "kB", {0}},
-// "x\203\251\006\013\032\002S\376\010\273\'\020\014\365\207\244\234",
-// -696925610, -654590577);
-// }
-//
-// TEST(FuzzTest, ExtendMessageSetWithEmptyExtension) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"\n"}, {}, "_", {}}, std::string(), 0,
-// 0);
-// }
-//
-// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegression) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"\320", "\320", "\320", "\320", "\320", "%2%%%%%"},
-// {"", "", "", "", "", "", "", "", "", "", "", "",
-// "", "", "", "", "", "", "", "", "", "", ""},
-// "\226\226\226\226\226\226\350\351\350\350\350\350\350\350\350\314",
-// {4026531839}},
-// std::string("\n\n\n\n\272\n======@@%%%%%%%%%%%%%%%@@@(("
-// "qqqqqqqq5555555555qqqqqffq((((((((((((\335@@>"
-// "\ru\360ncppppxxxxxxxxx\025\025\025xxxxxppppppp<="
-// "\2165\275\275\315\217\361\010\t\000\016\013in\n\n\n\256\263",
-// 130),
-// 901979906, 65537);
-// }
-//
-// // This test encodes a map field with extra cruft.
-// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionInvalidMap) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"%%%%///////"}, {}, "", {}},
-// std::string("\035|", 2), 65536, 3);
-// }
-//
-// // This test found a case where presence was unset for a mini table field.
-// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionMsan) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"%-#^#"}, {}, "", {}}, std::string(),
-// -1960166338, 16809991);
-// }
-//
-// // This test encodes a map containing a msg wrapping another, empty msg.
-// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionMapMap) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"%#G"}, {}, "", {}}, std::string("\022\002\022\000", 4), 0, 0);
-// }
-//
-// TEST(FuzzTest, GroupMap) {
-// // Groups should not be allowed as maps, but we previously failed to prevent
-// // this.
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {.mini_descriptors = {"$$FF$", "%-C"},
-// .enum_mini_descriptors = {},
-// .extensions = "",
-// .links = {1}},
-// std::string(
-// "\023\020\030\233\000\204\330\372#\000`"
-// "a\000\000\001\000\000\000ccccccc\030s\273sssssssss\030\030\030\030"
-// "\030\030\030\030\215\215\215\215\215\215\215\215\030\030\232\253\253"
-// "\232*\334\227\273\231\207\373\t\0051\305\265\335\224\226"),
-// 0, 0);
-// }
-//
-// TEST(FuzzTest, MapUnknownFieldSpanBuffers) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"$ 3", "%# "}, {}, "", {1}},
-// std::string(
-// "\"\002\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000",
-// 17),
-// 0, 0);
-// }
-//
-// // Another test for mismatched submsg types.
-// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegression22) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"$2222222222222222222222", "%,&"}, {}, "", {1}},
-// std::string("\035\170\170\170\051\263\001\030\000\035\357\357\340\021\035"
-// "\025\331\035\035\035\035\035\035\035\035",
-// 25),
-// 0, 0);
-// }
-//
-// TEST(FuzzTest, ExtensionWithoutExt) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"$ 3", "", "%#F"}, {}, "", {2, 1}},
-// std::string("\022\002\010\000", 4), 0,
-// 0);
-// }
-//
-// TEST(FuzzTest, MapFieldVerify) {
-// DecodeEncodeArbitrarySchemaAndPayload({{"% ^!"}, {}, "", {}}, "", 0, 0);
-// }
-//
-// TEST(FuzzTest, TooManyRequiredFields) {
-// DecodeEncodeArbitrarySchemaAndPayload(
-// {{"$ N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N "
-// "N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N"},
-// {},
-// "",
-// {}},
-// "", 0, 4);
-// }
-//
-// end:google_only
diff --git a/third_party/upb/upb/message/utf8_test.cc b/third_party/upb/upb/message/utf8_test.cc
index cd7dd1737135c..e7bd8946f6c16 100644
--- a/third_party/upb/upb/message/utf8_test.cc
+++ b/third_party/upb/upb/message/utf8_test.cc
@@ -168,58 +168,4 @@ TEST(Utf8Test, Proto2RepeatedFieldFailsValidation) {
ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
}
-// begin:google_only
-// TEST(Utf8Test, Proto3MixedFieldValidates) {
-// upb::Arena arena;
-// size_t size;
-// char* data = GetBadUtf8Payload(arena.ptr(), &size);
-//
-// upb_test_TestUtf8Proto3StringMixed* msg =
-// upb_test_TestUtf8Proto3StringMixed_new(arena.ptr());
-//
-// upb_DecodeStatus status = upb_Decode(
-// data, size, UPB_UPCAST(msg),
-// &upb_0test__TestUtf8Proto3StringMixed_msg_init, nullptr, 0, arena.ptr());
-//
-// // Parse fails, because proto3 string fields validate UTF-8.
-// ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
-// }
-//
-// TEST(Utf8Test, EnforceUtf8Options) {
-// upb::Arena arena;
-// size_t size;
-// char* data = GetBadUtf8Payload(arena.ptr(), &size);
-// upb_test_TestUtf8Proto3StringEnforceUtf8False* msg2 =
-// upb_test_TestUtf8Proto3StringEnforceUtf8False_parse(data, size,
-// arena.ptr());
-//
-// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
-// ASSERT_TRUE(msg2 != nullptr);
-// }
-//
-// TEST(Utf8Test, RepeatedEnforceUtf8Options) {
-// upb::Arena arena;
-// size_t size;
-// char* data = GetBadUtf8Payload(arena.ptr(), &size);
-// upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False* msg2 =
-// upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False_parse(data, size,
-// arena.ptr());
-//
-// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
-// ASSERT_TRUE(msg2 != nullptr);
-// }
-//
-// TEST(Utf8Test, EnforceUtf8OptionsMixed) {
-// upb::Arena arena;
-// size_t size;
-// char* data = GetBadUtf8Payload(arena.ptr(), &size);
-// upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed* msg2 =
-// upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed_parse(data, size,
-// arena.ptr());
-//
-// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
-// ASSERT_TRUE(msg2 != nullptr);
-// }
-// end:google_only
-
} // namespace
diff --git a/third_party/upb/upb/message/utf8_test.proto b/third_party/upb/upb/message/utf8_test.proto
index 515e3bf7d3af1..cf0d407bfac59 100644
--- a/third_party/upb/upb/message/utf8_test.proto
+++ b/third_party/upb/upb/message/utf8_test.proto
@@ -21,7 +21,7 @@ message TestUtf8RepeatedProto3String {
repeated string data = 1;
}
-// begin:google_only
+// copybara:strip_begin(enforce_utf8 option is not respected in OSS)
message TestUtf8Proto3StringMixed {
optional string data = 1;
@@ -45,4 +45,4 @@ message TestUtf8Proto3StringEnforceUtf8FalseMixed {
// handle the mix.
optional string other_data = 2;
}
-// end:google_only
+// copybara:strip_end
diff --git a/third_party/upb/upb/mini_descriptor/BUILD b/third_party/upb/upb/mini_descriptor/BUILD
index f60d854052e5e..a5dbd7ad0f871 100644
--- a/third_party/upb/upb/mini_descriptor/BUILD
+++ b/third_party/upb/upb/mini_descriptor/BUILD
@@ -4,6 +4,8 @@ load(
"UPB_DEFAULT_CPPOPTS",
)
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "mini_descriptor",
srcs = [
@@ -74,7 +76,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -88,9 +89,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -100,4 +99,3 @@ filegroup(
),
visibility = ["//pkg:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
index a84c739bbc9e4..592a8f09a8d40 100644
--- a/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
+++ b/third_party/upb/upb/mini_descriptor/internal/encode_test.cc
@@ -28,10 +28,6 @@
#include "upb/mini_table/message.h"
#include "upb/mini_table/sub.h"
-// begin:google_only
-// #include "testing/fuzzing/fuzztest.h"
-// end:google_only
-
// Must be last.
#include "upb/port/def.inc"
@@ -289,21 +285,3 @@ TEST_P(MiniTableTest, Extendible) {
EXPECT_EQ(kUpb_ExtMode_Extendable,
table->UPB_PRIVATE(ext) & kUpb_ExtMode_Extendable);
}
-
-// begin:google_only
-//
-// static void BuildMiniTable(std::string_view s, bool is_32bit) {
-// upb::Arena arena;
-// upb::Status status;
-// _upb_MiniTable_Build(
-// s.data(), s.size(),
-// is_32bit ? kUpb_MiniTablePlatform_32Bit : kUpb_MiniTablePlatform_64Bit,
-// arena.ptr(), status.ptr());
-// }
-// FUZZ_TEST(FuzzTest, BuildMiniTable);
-//
-// TEST(FuzzTest, BuildMiniTableRegression) {
-// BuildMiniTable("g}{v~fq{\271", false);
-// }
-//
-// end:google_only
diff --git a/third_party/upb/upb/mini_table/BUILD b/third_party/upb/upb/mini_table/BUILD
index 2e486e0d913dc..06332a71b1711 100644
--- a/third_party/upb/upb/mini_table/BUILD
+++ b/third_party/upb/upb/mini_table/BUILD
@@ -10,6 +10,8 @@ load(
"UPB_DEFAULT_COPTS",
)
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "mini_table",
srcs = [
@@ -93,7 +95,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -107,9 +108,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -119,4 +118,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/port/BUILD b/third_party/upb/upb/port/BUILD
index b72fa41a8b892..9088825d2080f 100644
--- a/third_party/upb/upb/port/BUILD
+++ b/third_party/upb/upb/port/BUILD
@@ -7,6 +7,8 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "port",
hdrs = [
@@ -35,7 +37,6 @@ filegroup(
visibility = ["//visibility:public"],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -49,4 +50,3 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
diff --git a/third_party/upb/upb/port/def.inc b/third_party/upb/upb/port/def.inc
index 6aa1835f40d98..4c073b32ffb02 100644
--- a/third_party/upb/upb/port/def.inc
+++ b/third_party/upb/upb/port/def.inc
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#ifndef UINTPTR_MAX
Error, UINTPTR_MAX is undefined
@@ -89,6 +90,12 @@ Error, UINTPTR_MAX is undefined
#define UPB_API_INLINE UPB_INLINE
#endif
+#ifdef EXPORT_UPBC
+#define UPBC_API UPB_EXPORT
+#else
+#define UPBC_API
+#endif
+
#define UPB_MALLOC_ALIGN 8
#define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align))
#define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align))
@@ -175,6 +182,9 @@ Error, UINTPTR_MAX is undefined
#ifdef __APPLE__
#define UPB_SETJMP(buf) _setjmp(buf)
#define UPB_LONGJMP(buf, val) _longjmp(buf, val)
+#elif defined(WASM_WAMR)
+#define UPB_SETJMP(buf) 0
+#define UPB_LONGJMP(buf, val) abort()
#else
#define UPB_SETJMP(buf) setjmp(buf)
#define UPB_LONGJMP(buf, val) longjmp(buf, val)
@@ -330,14 +340,11 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
#define UPB_DEPRECATED
#endif
-// begin:google_only
-// #define UPB_IS_GOOGLE3
-// end:google_only
-
-#if defined(UPB_IS_GOOGLE3) && !defined(UPB_BOOTSTRAP_STAGE0)
+#if defined(UPB_IS_GOOGLE3) && \
+ (!defined(UPB_BOOTSTRAP_STAGE) || UPB_BOOTSTRAP_STAGE != 0)
#define UPB_DESC(sym) proto2_##sym
#define UPB_DESC_MINITABLE(sym) &proto2__##sym##_msg_init
-#elif defined(UPB_BOOTSTRAP_STAGE0)
+#elif defined(UPB_BOOTSTRAP_STAGE) && UPB_BOOTSTRAP_STAGE == 0
#define UPB_DESC(sym) google_protobuf_##sym
#define UPB_DESC_MINITABLE(sym) google__protobuf__##sym##_msg_init()
#else
@@ -345,6 +352,7 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
#define UPB_DESC_MINITABLE(sym) &google__protobuf__##sym##_msg_init
#endif
+#undef UPB_IS_GOOGLE3
// Linker arrays combine elements from multiple translation units into a single
// array that can be iterated over at runtime.
@@ -421,3 +429,14 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
#define UPB_LINKARR_APPEND(name)
#endif
+
+// Future versions of upb will include breaking changes to some APIs.
+// This macro can be set to enable these API changes ahead of time, so that
+// user code can be updated before upgrading versions of protobuf.
+#ifdef UPB_FUTURE_BREAKING_CHANGES
+
+// Properly enforce closed enums in python.
+// Owner: mkruskal@
+#define UPB_FUTURE_PYTHON_CLOSED_ENUM_ENFORCEMENT 1
+
+#endif
diff --git a/third_party/upb/upb/port/undef.inc b/third_party/upb/upb/port/undef.inc
index d8453ffec164b..f94e2764e8c64 100644
--- a/third_party/upb/upb/port/undef.inc
+++ b/third_party/upb/upb/port/undef.inc
@@ -13,6 +13,7 @@
#undef UPB_EXPORT
#undef UPB_INLINE
#undef UPB_API
+#undef UPBC_API
#undef UPB_API_INLINE
#undef UPB_ALIGN_UP
#undef UPB_ALIGN_DOWN
@@ -60,3 +61,5 @@
#undef UPB_LINKARR_APPEND
#undef UPB_LINKARR_START
#undef UPB_LINKARR_STOP
+#undef UPB_FUTURE_BREAKING_CHANGES
+#undef UPB_FUTURE_PYTHON_CLOSED_ENUM_ENFORCEMENT
diff --git a/third_party/upb/upb/reflection/BUILD b/third_party/upb/upb/reflection/BUILD
index 694b1f01189a1..40fd8e54f1603 100644
--- a/third_party/upb/upb/reflection/BUILD
+++ b/third_party/upb/upb/reflection/BUILD
@@ -7,16 +7,12 @@
load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
load("//bazel:upb_proto_library.bzl", "upb_proto_reflection_library")
-
-# end:github_only
load(
"//editions:defaults.bzl",
"compile_edition_defaults",
"embed_edition_defaults",
)
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-
-# begin:github_only
load(
"//upb/cmake:build_defs.bzl",
"staleness_test",
@@ -27,23 +23,22 @@ load(
"bootstrap_upb_proto_library",
)
+package(default_applicable_licenses = ["//:license"])
+
bootstrap_upb_proto_library(
name = "descriptor_upb_proto",
- base_dir = "",
- # TODO: Export 'net/proto2/proto/descriptor.upb.h' and remove "-layering_check".
- features = ["-layering_check"],
+ bootstrap_hdr = "descriptor_bootstrap.h",
google3_src_files = ["net/proto2/proto/descriptor.proto"],
google3_src_rules = ["//net/proto2/proto:descriptor_proto_source"],
oss_src_files = ["google/protobuf/descriptor.proto"],
oss_src_rules = ["//:descriptor_proto_srcs"],
oss_strip_prefix = "third_party/protobuf/github/bootstrap/src",
proto_lib_deps = ["//:descriptor_proto"],
- visibility = ["//visibility:public"],
)
upb_proto_reflection_library(
name = "descriptor_upb_proto_reflection",
- visibility = ["//visibility:public"],
+ visibility = ["//upb:friends"],
deps = ["//:descriptor_proto"],
)
@@ -192,29 +187,6 @@ cc_test(
],
)
-# begin:google_only
-# compile_edition_defaults(
-# name = "upb_edition_defaults",
-# srcs = [
-# "//:descriptor_proto",
-# ],
-# compatible_with = ["//buildenv/target:non_prod"],
-# maximum_edition = "2023",
-# minimum_edition = "PROTO2",
-# )
-#
-# embed_edition_defaults(
-# name = "embedded_upb_edition_defaults_generate",
-# compatible_with = ["//buildenv/target:non_prod"],
-# defaults = "upb_edition_defaults",
-# output = "internal/upb_edition_defaults.h",
-# placeholder = "DEFAULTS_VALUE",
-# template = "internal/upb_edition_defaults.h.template",
-# )
-# end:google_only
-
-# TODO Merge these once we deal with the whitespace issues with reversible stripping.
-# begin:github_only
compile_edition_defaults(
name = "upb_edition_defaults",
srcs = [
@@ -239,9 +211,7 @@ staleness_test(
tags = ["manual"],
target_files = ["internal/upb_edition_defaults.h"],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -260,4 +230,3 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h
index af260e7acf760..736f42fe5a9d1 100644
--- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h
+++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb.h
@@ -6,13 +6,14 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
#include "google/protobuf/descriptor.upb_minitable.h"
+
// Must be last.
#include "upb/port/def.inc"
@@ -6893,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */
diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c
index 08fa451f750f4..f641f657d63f4 100644
--- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c
+++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c
@@ -14,7 +14,7 @@
#include "upb/port/def.inc"
extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr},
};
@@ -23,9 +23,9 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
};
const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
- &google_protobuf_FileDescriptorSet_submsgs[0],
+ &google_protobuf_FileDescriptorSet__submsgs[0],
&google_protobuf_FileDescriptorSet__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.FileDescriptorSet",
#endif
@@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = {
+static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
@@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13]
};
const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
- &google_protobuf_FileDescriptorProto_submsgs[0],
+ &google_protobuf_FileDescriptorProto__submsgs[0],
&google_protobuf_FileDescriptorProto__fields[0],
UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr},
@@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
};
const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
- &google_protobuf_DescriptorProto_submsgs[0],
+ &google_protobuf_DescriptorProto__submsgs[0],
&google_protobuf_DescriptorProto__fields[0],
UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
#ifdef UPB_TRACING_ENABLED
@@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr},
};
@@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__
};
const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = {
- &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+ &google_protobuf_DescriptorProto_ExtensionRange__submsgs[0],
&google_protobuf_DescriptorProto_ExtensionRange__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init =
};
const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = {
+static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init},
};
static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = {
@@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4]
};
const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = {
- &google_protobuf_ExtensionRangeOptions_submsgs[0],
+ &google_protobuf_ExtensionRangeOptions__submsgs[0],
&google_protobuf_ExtensionRangeOptions__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini
};
const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
@@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11]
};
const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
- &google_protobuf_FieldDescriptorProto_submsgs[0],
+ &google_protobuf_FieldDescriptorProto__submsgs[0],
&google_protobuf_FieldDescriptorProto__fields[0],
UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr},
};
@@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2]
};
const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
- &google_protobuf_OneofDescriptorProto_submsgs[0],
+ &google_protobuf_OneofDescriptorProto__submsgs[0],
&google_protobuf_OneofDescriptorProto__fields[0],
UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr},
@@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] =
};
const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = {
- &google_protobuf_EnumDescriptorProto_submsgs[0],
+ &google_protobuf_EnumDescriptorProto__submsgs[0],
&google_protobuf_EnumDescriptorProto__fields[0],
UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
#ifdef UPB_TRACING_ENABLED
@@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg
};
const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr},
};
@@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields
};
const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
- &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+ &google_protobuf_EnumValueDescriptorProto__submsgs[0],
&google_protobuf_EnumValueDescriptorProto__fields[0],
UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr},
};
@@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3
};
const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
- &google_protobuf_ServiceDescriptorProto_submsgs[0],
+ &google_protobuf_ServiceDescriptorProto__submsgs[0],
&google_protobuf_ServiceDescriptorProto__fields[0],
UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr},
};
@@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6]
};
const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
- &google_protobuf_MethodDescriptorProto_submsgs[0],
+ &google_protobuf_MethodDescriptorProto__submsgs[0],
&google_protobuf_MethodDescriptorProto__fields[0],
UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init},
};
static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
@@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
};
const upb_MiniTable google__protobuf__FileOptions_msg_init = {
- &google_protobuf_FileOptions_submsgs[0],
+ &google_protobuf_FileOptions__submsgs[0],
&google_protobuf_FileOptions__fields[0],
UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = {
};
const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
- &google_protobuf_MessageOptions_submsgs[0],
+ &google_protobuf_MessageOptions__submsgs[0],
&google_protobuf_MessageOptions__fields[0],
UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = {
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
@@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = {
};
const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
- &google_protobuf_FieldOptions_submsgs[0],
+ &google_protobuf_FieldOptions__submsgs[0],
&google_protobuf_FieldOptions__fields[0],
UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = {
@@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie
};
const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
- &google_protobuf_FieldOptions_EditionDefault_submsgs[0],
+ &google_protobuf_FieldOptions_EditionDefault__submsgs[0],
&google_protobuf_FieldOptions_EditionDefault__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FieldOptions_FeatureSupport__submsgs[3] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = {
@@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie
};
const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
- &google_protobuf_FieldOptions_FeatureSupport_submsgs[0],
+ &google_protobuf_FieldOptions_FeatureSupport__submsgs[0],
&google_protobuf_FieldOptions_FeatureSupport__fields[0],
UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = {
};
const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = {
};
const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
- &google_protobuf_OneofOptions_submsgs[0],
+ &google_protobuf_OneofOptions__submsgs[0],
&google_protobuf_OneofOptions__fields[0],
UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
- &google_protobuf_EnumOptions_submsgs[0],
+ &google_protobuf_EnumOptions__submsgs[0],
&google_protobuf_EnumOptions__fields[0],
UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
@@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = {
};
const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
- &google_protobuf_EnumValueOptions_submsgs[0],
+ &google_protobuf_EnumValueOptions__submsgs[0],
&google_protobuf_EnumValueOptions__fields[0],
UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = {
+static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
};
@@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = {
};
const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
- &google_protobuf_ServiceOptions_submsgs[0],
+ &google_protobuf_ServiceOptions__submsgs[0],
&google_protobuf_ServiceOptions__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init},
};
static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
@@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = {
};
const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
- &google_protobuf_MethodOptions_submsgs[0],
+ &google_protobuf_MethodOptions__submsgs[0],
&google_protobuf_MethodOptions__fields[0],
UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
#ifdef UPB_TRACING_ENABLED
@@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = {
};
const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr},
};
@@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] =
};
const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = {
- &google_protobuf_UninterpretedOption_submsgs[0],
+ &google_protobuf_UninterpretedOption__submsgs[0],
&google_protobuf_UninterpretedOption__fields[0],
UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
#ifdef UPB_TRACING_ENABLED
@@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = {
};
const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
@@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = {
};
const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
- &google_protobuf_FeatureSet_submsgs[0],
+ &google_protobuf_FeatureSet__submsgs[0],
&google_protobuf_FeatureSet__fields[0],
40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = {
@@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] =
};
const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
- &google_protobuf_FeatureSetDefaults_submsgs[0],
+ &google_protobuf_FeatureSetDefaults__submsgs[0],
&google_protobuf_FeatureSetDefaults__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = {
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = {
+static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
{.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr},
- {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init},
+ {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init},
};
static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = {
@@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi
};
const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = {
- &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0],
+ &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0],
&google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0],
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau
};
const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr},
};
@@ -1079,9 +1079,9 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = {
- &google_protobuf_SourceCodeInfo_submsgs[0],
+ &google_protobuf_SourceCodeInfo__submsgs[0],
&google_protobuf_SourceCodeInfo__fields[0],
- 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
+ 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
"google.protobuf.SourceCodeInfo",
#endif
@@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = {
};
const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = {
{.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr},
};
@@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
- &google_protobuf_GeneratedCodeInfo_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo__submsgs[0],
&google_protobuf_GeneratedCodeInfo__fields[0],
16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init;
-static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
- {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
+static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = {
+ {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init},
};
static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
@@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi
};
const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
- &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
+ &google_protobuf_GeneratedCodeInfo_Annotation__submsgs[0],
&google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0,
#ifdef UPB_TRACING_ENABLED
@@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
};
const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
-const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
+const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
64,
9,
{
@@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
+const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = {
64,
0,
{
@@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = {
64,
0,
{
@@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = {
64,
0,
{
@@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = {
64,
0,
{
@@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = {
64,
0,
{
@@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = {
64,
0,
{
@@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in
},
};
-const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
+const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = {
64,
0,
{
@@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = {
64,
0,
{
@@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = {
64,
0,
{
@@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = {
64,
0,
{
@@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = {
64,
0,
{
@@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = {
64,
0,
{
@@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init =
},
};
-const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
+const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = {
64,
0,
{
@@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init
},
};
-const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
+const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = {
64,
0,
{
@@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
},
};
-const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
+const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = {
64,
0,
{
@@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en
},
};
-const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
+const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = {
64,
0,
{
@@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = {
};
static const upb_MiniTableEnum *enums_layout[17] = {
- &google_protobuf_Edition_enum_init,
- &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
- &google_protobuf_FeatureSet_EnumType_enum_init,
- &google_protobuf_FeatureSet_FieldPresence_enum_init,
- &google_protobuf_FeatureSet_JsonFormat_enum_init,
- &google_protobuf_FeatureSet_MessageEncoding_enum_init,
- &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init,
- &google_protobuf_FeatureSet_Utf8Validation_enum_init,
- &google_protobuf_FieldDescriptorProto_Label_enum_init,
- &google_protobuf_FieldDescriptorProto_Type_enum_init,
- &google_protobuf_FieldOptions_CType_enum_init,
- &google_protobuf_FieldOptions_JSType_enum_init,
- &google_protobuf_FieldOptions_OptionRetention_enum_init,
- &google_protobuf_FieldOptions_OptionTargetType_enum_init,
- &google_protobuf_FileOptions_OptimizeMode_enum_init,
- &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
- &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
+ &google__protobuf__Edition_enum_init,
+ &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init,
+ &google__protobuf__FeatureSet__EnumType_enum_init,
+ &google__protobuf__FeatureSet__FieldPresence_enum_init,
+ &google__protobuf__FeatureSet__JsonFormat_enum_init,
+ &google__protobuf__FeatureSet__MessageEncoding_enum_init,
+ &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init,
+ &google__protobuf__FeatureSet__Utf8Validation_enum_init,
+ &google__protobuf__FieldDescriptorProto__Label_enum_init,
+ &google__protobuf__FieldDescriptorProto__Type_enum_init,
+ &google__protobuf__FieldOptions__CType_enum_init,
+ &google__protobuf__FieldOptions__JSType_enum_init,
+ &google__protobuf__FieldOptions__OptionRetention_enum_init,
+ &google__protobuf__FieldOptions__OptionTargetType_enum_init,
+ &google__protobuf__FileOptions__OptimizeMode_enum_init,
+ &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init,
+ &google__protobuf__MethodOptions__IdempotencyLevel_enum_init,
};
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
diff --git a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h
index 6cb83ecedcc06..1dea594faf25a 100644
--- a/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h
+++ b/third_party/upb/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_
#include "upb/generated_code_support.h"
@@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr;
extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr;
-extern const upb_MiniTableEnum google_protobuf_Edition_enum_init;
-extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
-extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
-extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
-extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
+extern const upb_MiniTableEnum google__protobuf__Edition_enum_init;
+extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init;
+extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init;
+extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init;
+extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init;
extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#ifdef __cplusplus
@@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */
diff --git a/third_party/upb/upb/reflection/common.h b/third_party/upb/upb/reflection/common.h
index ebe32828536a9..e2d5221c02e2b 100644
--- a/third_party/upb/upb/reflection/common.h
+++ b/third_party/upb/upb/reflection/common.h
@@ -12,17 +12,7 @@
#ifndef UPB_REFLECTION_COMMON_H_
#define UPB_REFLECTION_COMMON_H_
-// begin:google_only
-// #ifndef UPB_BOOTSTRAP_STAGE0
-// #include "net/proto2/proto/descriptor.upb.h"
-// #else
-// #include "google/protobuf/descriptor.upb.h"
-// #endif
-// end:google_only
-
-// begin:github_only
-#include "google/protobuf/descriptor.upb.h"
-// end:github_only
+#include "upb/reflection/descriptor_bootstrap.h" // IWYU pragma: export
typedef enum {
kUpb_Syntax_Proto2 = 2,
diff --git a/third_party/upb/upb/reflection/descriptor_bootstrap.h b/third_party/upb/upb/reflection/descriptor_bootstrap.h
new file mode 100644
index 0000000000000..c0b760cfa1fba
--- /dev/null
+++ b/third_party/upb/upb/reflection/descriptor_bootstrap.h
@@ -0,0 +1,19 @@
+#ifndef THIRD_PARTY_UPB_UPB_REFLECTION_DESCRIPTOR_BOOTSTRAP_H_
+#define THIRD_PARTY_UPB_UPB_REFLECTION_DESCRIPTOR_BOOTSTRAP_H_
+
+// IWYU pragma: begin_exports
+
+#if defined(UPB_BOOTSTRAP_STAGE) && UPB_BOOTSTRAP_STAGE == 0
+// This header is checked in.
+#include "upb/reflection/stage0/google/protobuf/descriptor.upb.h"
+#elif UPB_BOOTSTRAP_STAGE == 1
+// This header is generated at build time by the bootstrapping process.
+#include "upb/reflection/stage1/google/protobuf/descriptor.upb.h"
+#else
+// This is the normal header, generated by upb_c_proto_library().
+#include "google/protobuf/descriptor.upb.h"
+#endif
+
+// IWYU pragma: end_exports
+
+#endif // THIRD_PARTY_UPB_UPB_REFLECTION_DESCRIPTOR_BOOTSTRAP_H_
diff --git a/third_party/upb/upb/reflection/field_def.c b/third_party/upb/upb/reflection/field_def.c
index 9f2775b8699f7..cb077d2a72191 100644
--- a/third_party/upb/upb/reflection/field_def.c
+++ b/third_party/upb/upb/reflection/field_def.c
@@ -590,20 +590,6 @@ static bool _upb_FieldDef_InferLegacyFeatures(
ret = true;
}
-// begin:google_only
-// #ifndef UPB_BOOTSTRAP_STAGE0
-// if (syntax == kUpb_Syntax_Proto3 &&
-// UPB_DESC(FieldOptions_has_enforce_utf8)(options) &&
-// !UPB_DESC(FieldOptions_enforce_utf8)(options)) {
-// int val = UPB_DESC(FeatureSet_UNVERIFIED);
-// UPB_DESC(FeatureSet_set_utf8_validation(features, val));
-// ret = true;
-// }
-// #endif
-// // clang-format off
-// end:google_only
- // clang-format on
-
return ret;
}
@@ -982,9 +968,9 @@ void _upb_FieldDef_BuildMiniTableExtension(upb_DefBuilder* ctx,
const upb_MiniTableEnum* subenum = _upb_EnumDef_MiniTable(f->sub.enumdef);
sub = upb_MiniTableSub_FromEnum(subenum);
}
- bool ok2 = upb_MiniTableExtension_Init(desc.data, desc.size, mut_ext,
- upb_MessageDef_MiniTable(f->msgdef),
- sub, ctx->status);
+ bool ok2 = _upb_MiniTableExtension_Init(desc.data, desc.size, mut_ext,
+ upb_MessageDef_MiniTable(f->msgdef),
+ sub, ctx->platform, ctx->status);
if (!ok2) _upb_DefBuilder_Errf(ctx, "Could not build extension mini table");
}
diff --git a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
index eb586249815fd..f252ddc3262ed 100644
--- a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
+++ b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.c
@@ -1,6 +1,6 @@
#include
#include "upb/generated_code_support.h"
-#include "google/protobuf/descriptor.upb.h"
+#include "upb/reflection/descriptor_bootstrap.h"
static upb_Arena* upb_BootstrapArena() {
static upb_Arena* arena = NULL;
@@ -10,7 +10,7 @@ static upb_Arena* upb_BootstrapArena() {
const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init() {
static upb_MiniTable* mini_table = NULL;
- static const char* mini_descriptor = "$G";
+ static const char* mini_descriptor = "$PG";
if (mini_table) return mini_table;
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
@@ -32,7 +32,7 @@ const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init() {
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 7), google__protobuf__FieldDescriptorProto_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google__protobuf__FileOptions_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google__protobuf__SourceCodeInfo_msg_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 14), google_protobuf_Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 14), google__protobuf__Edition_enum_init());
return mini_table;
}
@@ -85,7 +85,7 @@ const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init() {
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__ExtensionRangeOptions__Declaration_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 50), google__protobuf__FeatureSet_msg_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_ExtensionRangeOptions_VerificationState_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__ExtensionRangeOptions__VerificationState_enum_init());
return mini_table;
}
@@ -106,8 +106,8 @@ const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_FieldDescriptorProto_Label_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_FieldDescriptorProto_Type_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__FieldDescriptorProto__Label_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__FieldDescriptorProto__Type_enum_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 8), google__protobuf__FieldOptions_msg_init());
return mini_table;
}
@@ -187,7 +187,7 @@ const upb_MiniTable* google__protobuf__FileOptions_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google_protobuf_FileOptions_OptimizeMode_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 9), google__protobuf__FileOptions__OptimizeMode_enum_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 50), google__protobuf__FeatureSet_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
return mini_table;
@@ -212,10 +212,10 @@ const upb_MiniTable* google__protobuf__FieldOptions_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_FieldOptions_CType_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_FieldOptions_JSType_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 17), google_protobuf_FieldOptions_OptionRetention_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 19), google_protobuf_FieldOptions_OptionTargetType_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FieldOptions__CType_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google__protobuf__FieldOptions__JSType_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 17), google__protobuf__FieldOptions__OptionRetention_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 19), google__protobuf__FieldOptions__OptionTargetType_enum_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 20), google__protobuf__FieldOptions__EditionDefault_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 21), google__protobuf__FeatureSet_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 22), google__protobuf__FieldOptions__FeatureSupport_msg_init());
@@ -230,7 +230,7 @@ const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__Edition_enum_init());
return mini_table;
}
@@ -241,9 +241,9 @@ const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_Edition_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_Edition_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__Edition_enum_init());
return mini_table;
}
@@ -303,7 +303,7 @@ const upb_MiniTable* google__protobuf__MethodOptions_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 34), google_protobuf_MethodOptions_IdempotencyLevel_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 34), google__protobuf__MethodOptions__IdempotencyLevel_enum_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 35), google__protobuf__FeatureSet_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 999), google__protobuf__UninterpretedOption_msg_init());
return mini_table;
@@ -337,12 +337,12 @@ const upb_MiniTable* google__protobuf__FeatureSet_msg_init() {
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google_protobuf_FeatureSet_FieldPresence_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google_protobuf_FeatureSet_EnumType_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_FeatureSet_Utf8Validation_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_FeatureSet_MessageEncoding_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google_protobuf_FeatureSet_JsonFormat_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FeatureSet__FieldPresence_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 2), google__protobuf__FeatureSet__EnumType_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__FeatureSet__Utf8Validation_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__FeatureSet__MessageEncoding_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 6), google__protobuf__FeatureSet__JsonFormat_enum_init());
return mini_table;
}
@@ -354,8 +354,8 @@ const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init() {
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 1), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google_protobuf_Edition_enum_init());
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__Edition_enum_init());
return mini_table;
}
@@ -366,7 +366,7 @@ const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefa
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google_protobuf_Edition_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 3), google__protobuf__Edition_enum_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 4), google__protobuf__FeatureSet_msg_init());
upb_MiniTable_SetSubMessage(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__FeatureSet_msg_init());
return mini_table;
@@ -374,7 +374,7 @@ const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefa
const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init() {
static upb_MiniTable* mini_table = NULL;
- static const char* mini_descriptor = "$G";
+ static const char* mini_descriptor = "$PG";
if (mini_table) return mini_table;
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
@@ -411,11 +411,11 @@ const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init()
mini_table =
upb_MiniTable_Build(mini_descriptor, strlen(mini_descriptor),
upb_BootstrapArena(), NULL);
- upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init());
+ upb_MiniTable_SetSubEnum(mini_table, (upb_MiniTableField*)upb_MiniTable_FindFieldByNumber(mini_table, 5), google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init());
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_Edition_enum_init() {
+const upb_MiniTableEnum* google__protobuf__Edition_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)~z!|a1qt_b)|i}{~~`!";
if (mini_table) return mini_table;
@@ -425,7 +425,7 @@ const upb_MiniTableEnum* google_protobuf_Edition_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_ExtensionRangeOptions_VerificationState_enum_init() {
+const upb_MiniTableEnum* google__protobuf__ExtensionRangeOptions__VerificationState_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!$";
if (mini_table) return mini_table;
@@ -435,7 +435,7 @@ const upb_MiniTableEnum* google_protobuf_ExtensionRangeOptions_VerificationState
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_EnumType_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__EnumType_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -445,7 +445,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_EnumType_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_FieldPresence_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__FieldPresence_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!1";
if (mini_table) return mini_table;
@@ -455,7 +455,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_FieldPresence_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_JsonFormat_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__JsonFormat_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -465,7 +465,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_JsonFormat_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_MessageEncoding_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__MessageEncoding_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -475,7 +475,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_MessageEncoding_enum_init()
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -485,7 +485,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_i
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FeatureSet_Utf8Validation_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FeatureSet__Utf8Validation_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!/";
if (mini_table) return mini_table;
@@ -495,7 +495,7 @@ const upb_MiniTableEnum* google_protobuf_FeatureSet_Utf8Validation_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldDescriptorProto__Label_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!0";
if (mini_table) return mini_table;
@@ -505,7 +505,7 @@ const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init()
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldDescriptorProto__Type_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!@AA1";
if (mini_table) return mini_table;
@@ -515,7 +515,7 @@ const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldOptions__CType_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -525,7 +525,7 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldOptions__JSType_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -535,7 +535,7 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldOptions__OptionRetention_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -545,7 +545,7 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init(
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FieldOptions__OptionTargetType_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!AA";
if (mini_table) return mini_table;
@@ -555,7 +555,7 @@ const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init() {
+const upb_MiniTableEnum* google__protobuf__FileOptions__OptimizeMode_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!0";
if (mini_table) return mini_table;
@@ -565,7 +565,7 @@ const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init() {
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init() {
+const upb_MiniTableEnum* google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
@@ -575,7 +575,7 @@ const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_e
return mini_table;
}
-const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init() {
+const upb_MiniTableEnum* google__protobuf__MethodOptions__IdempotencyLevel_enum_init() {
static const upb_MiniTableEnum* mini_table = NULL;
static const char* mini_descriptor = "!)";
if (mini_table) return mini_table;
diff --git a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
index 00f24b862a01e..5f5fb70150990 100644
--- a/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
+++ b/third_party/upb/upb/reflection/stage0/google/protobuf/descriptor.upb.h
@@ -6,8 +6,8 @@
* regenerated.
* NO CHECKED-IN PROTOBUF GENCODE */
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
+#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
+#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_
#include "upb/generated_code_support.h"
@@ -18,56 +18,56 @@
extern "C" {
#endif
-extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init();
-extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init();
-extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init();
-extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init();
-extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init();
-extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init();
-extern const upb_MiniTable* google__protobuf__FileOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init();
-extern const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init();
-extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init();
-extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init();
-extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init();
-extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init();
-extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init();
-extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init();
-extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init();
-extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init();
-extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init();
-extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init();
-extern const upb_MiniTableEnum* google_protobuf_Edition_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_ExtensionRangeOptions_VerificationState_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_EnumType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_FieldPresence_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_JsonFormat_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_MessageEncoding_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FeatureSet_Utf8Validation_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Label_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldDescriptorProto_Type_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_CType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_JSType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionRetention_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FieldOptions_OptionTargetType_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init();
-extern const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init();
+extern const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__DescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__DescriptorProto__ExtensionRange_msg_init(void);
+extern const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init(void);
+extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__EnumDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(void);
+extern const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FileOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__MessageOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FieldOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init(void);
+extern const upb_MiniTable* google__protobuf__OneofOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__EnumOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__ServiceOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__MethodOptions_msg_init(void);
+extern const upb_MiniTable* google__protobuf__UninterpretedOption_msg_init(void);
+extern const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FeatureSet_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init(void);
+extern const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(void);
+extern const upb_MiniTable* google__protobuf__SourceCodeInfo_msg_init(void);
+extern const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init(void);
+extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init(void);
+extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init(void);
+extern const upb_MiniTableEnum* google__protobuf__Edition_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__ExtensionRangeOptions__VerificationState_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__EnumType_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__FieldPresence_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__JsonFormat_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__MessageEncoding_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FeatureSet__Utf8Validation_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldDescriptorProto__Label_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldDescriptorProto__Type_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldOptions__CType_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldOptions__JSType_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldOptions__OptionRetention_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FieldOptions__OptionTargetType_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__FileOptions__OptimizeMode_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init(void);
+extern const upb_MiniTableEnum* google__protobuf__MethodOptions__IdempotencyLevel_enum_init(void);
typedef struct google_protobuf_FileDescriptorSet { upb_Message UPB_PRIVATE(base); } google_protobuf_FileDescriptorSet;
typedef struct google_protobuf_FileDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_FileDescriptorProto;
@@ -6746,4 +6746,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google
#include "upb/port/undef.inc"
-#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
+#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */
diff --git a/third_party/upb/upb/test/BUILD b/third_party/upb/upb/test/BUILD
index d85f03e9caef0..126df20aec9b0 100644
--- a/third_party/upb/upb/test/BUILD
+++ b/third_party/upb/upb/test/BUILD
@@ -19,9 +19,7 @@ load(
"UPB_DEFAULT_CPPOPTS",
)
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
cc_library(
name = "parse_text_proto",
@@ -326,7 +324,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -357,4 +354,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/test/fuzz_util.h b/third_party/upb/upb/test/fuzz_util.h
index 8e585d8124c9d..40b06ce5ae941 100644
--- a/third_party/upb/upb/test/fuzz_util.h
+++ b/third_party/upb/upb/test/fuzz_util.h
@@ -19,11 +19,11 @@ namespace upb {
namespace fuzz {
struct MiniTableFuzzInput {
- // MiniDescripotrs for N messages, in the format accepted by
+ // MiniDescriptors for N messages, in the format accepted by
// upb_MiniTable_Build().
std::vector mini_descriptors;
- // MiniDescripotrs for N enums, in the format accepted by
+ // MiniDescriptors for N enums, in the format accepted by
// upb_MiniTableEnum_Build().
std::vector enum_mini_descriptors;
diff --git a/third_party/upb/upb/text/BUILD b/third_party/upb/upb/text/BUILD
index 8b79887ef3b20..793c9a1278c00 100644
--- a/third_party/upb/upb/text/BUILD
+++ b/third_party/upb/upb/text/BUILD
@@ -7,6 +7,8 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "text",
srcs = [
@@ -103,7 +105,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -117,4 +118,3 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
diff --git a/third_party/upb/upb/text/debug_string.h b/third_party/upb/upb/text/debug_string.h
index cef8ad5231dfa..feaf6d4f84242 100644
--- a/third_party/upb/upb/text/debug_string.h
+++ b/third_party/upb/upb/text/debug_string.h
@@ -21,7 +21,7 @@
extern "C" {
#endif
-/* Encodes the given |msg| to a psuedo-text format: Instead of printing field
+/* Encodes the given |msg| to a pseudo-text format: Instead of printing field
* name to value entries, it will print field number to value entries; much like
* how unknown fields are printed in upb_TextEncode in this directory's
* encode.h. |mt| should correspond to the |msg|'s minitable.
diff --git a/third_party/upb/upb/text/encode.c b/third_party/upb/upb/text/encode.c
index 9e3a5356c5227..5938a16377383 100644
--- a/third_party/upb/upb/text/encode.c
+++ b/third_party/upb/upb/text/encode.c
@@ -54,13 +54,6 @@ static void _upb_TextEncode_Field(txtenc* e, upb_MessageValue val,
const char* name = upb_FieldDef_Name(f);
if (ctype == kUpb_CType_Message) {
-// begin:google_only
-// // TODO: Turn this into a feature check and opensource it.
-// if (_upb_FieldDef_IsGroupLike(f)) {
-// const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-// name = upb_MessageDef_Name(m);
-// }
-// end:google_only
if (is_ext) {
UPB_PRIVATE(_upb_TextEncode_Printf)(e, "[%s] {", full);
} else {
diff --git a/third_party/upb/upb/util/BUILD b/third_party/upb/upb/util/BUILD
index fe7e6c07e02f0..e95651f6e7bb2 100644
--- a/third_party/upb/upb/util/BUILD
+++ b/third_party/upb/upb/util/BUILD
@@ -4,9 +4,7 @@ load(
"upb_proto_reflection_library",
)
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])
licenses(["notice"])
@@ -18,8 +16,8 @@ cc_library(
hdrs = ["def_to_proto.h"],
visibility = ["//visibility:public"],
deps = [
+ "//src/google/protobuf:descriptor_upb_c_proto",
"//upb:base",
- "//upb:descriptor_upb_proto",
"//upb:port",
"//upb:reflection",
"//upb/reflection:internal",
@@ -52,9 +50,9 @@ cc_library(
deps = [
":def_to_proto",
"//:protobuf",
+ "//src/google/protobuf:descriptor_upb_c_proto",
"//src/google/protobuf/util:differencer",
"//upb:base",
- "//upb:descriptor_upb_proto",
"//upb:mem",
"//upb/reflection:internal",
"@com_google_googletest//:gtest",
@@ -72,10 +70,10 @@ cc_test(
":def_to_proto_test_upb_proto",
":def_to_proto_test_upb_proto_reflection",
"//:protobuf",
+ "//src/google/protobuf:descriptor_upb_c_proto",
+ "//src/google/protobuf:descriptor_upb_reflection_proto",
"//src/google/protobuf/util:differencer",
"//upb:base",
- "//upb:descriptor_upb_proto",
- "//upb:descriptor_upb_proto_reflection",
"//upb:mem",
"//upb:reflection",
"//upb/test:parse_text_proto",
@@ -85,19 +83,6 @@ cc_test(
],
)
-# begin:google_only
-# cc_test(
-# name = "def_to_proto_fuzz_test",
-# srcs = ["def_to_proto_fuzz_test.cc"],
-# tags = ["clang_only"],
-# deps = [
-# ":def_to_proto_test_lib",
-# "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main",
-# "//testing/fuzzing:fuzztest",
-# ],
-# )
-# end:google_only
-
# Required fields
cc_library(
@@ -165,7 +150,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = [
@@ -176,9 +160,7 @@ filegroup(
],
visibility = ["//python/dist:__pkg__"],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -209,4 +191,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/util/def_to_proto_test.cc b/third_party/upb/upb/util/def_to_proto_test.cc
index e14b8c4d154df..b4e644b21f34e 100644
--- a/third_party/upb/upb/util/def_to_proto_test.cc
+++ b/third_party/upb/upb/util/def_to_proto_test.cc
@@ -276,28 +276,6 @@ TEST(FuzzTest, DefaultWithValidHexEscapePrintable) {
})pb"));
}
-// begin:google_only
-// TEST(FuzzTest, DependencyWithEmbeddedNull) {
-// RoundTripDescriptor(ParseTextProtoOrDie(R"pb(file {
-// name: "a"
-// dependency: "a\000"
-// options { cc_api_version: 0 }
-// weak_dependency: 0
-// })pb"));
-// }
-//
-// TEST(FuzzTest, NanInOptions) {
-// RoundTripDescriptor(
-// ParseTextProtoOrDie(R"pb(file {
-// name: ""
-// service {
-// name: "A"
-// options { failure_detection_delay: nan }
-// }
-// })pb"));
-// }
-// end:google_only
-
TEST(FuzzTest, PackageStartsWithNumber) {
RoundTripDescriptor(
ParseTextProtoOrDie(R"pb(file { name: "" package: "0" })pb"));
diff --git a/third_party/upb/upb/wire/BUILD b/third_party/upb/upb/wire/BUILD
index 693a072bf785a..23a5239d68f1a 100644
--- a/third_party/upb/upb/wire/BUILD
+++ b/third_party/upb/upb/wire/BUILD
@@ -7,6 +7,8 @@
load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
+package(default_applicable_licenses = ["//:license"])
+
cc_library(
name = "wire",
srcs = [
@@ -59,6 +61,35 @@ cc_library(
],
)
+cc_library(
+ name = "byte_size",
+ srcs = ["byte_size.c"],
+ hdrs = ["byte_size.h"],
+ visibility = ["//visibility:public"],
+ deps = [
+ "//upb:mem",
+ "//upb:message",
+ "//upb:mini_table",
+ "//upb:port",
+ "//upb:wire",
+ ],
+)
+
+cc_test(
+ name = "byte_size_test",
+ srcs = ["byte_size_test.cc"],
+ deps = [
+ ":byte_size",
+ "//upb:base",
+ "//upb:mem",
+ "//upb:mini_table",
+ "//upb/test:test_messages_proto2_upb_minitable",
+ "//upb/test:test_messages_proto2_upb_proto",
+ "@com_google_googletest//:gtest",
+ "@com_google_googletest//:gtest_main",
+ ],
+)
+
cc_library(
name = "eps_copy_input_stream",
srcs = ["eps_copy_input_stream.c"],
@@ -81,7 +112,6 @@ cc_test(
],
)
-# begin:github_only
filegroup(
name = "source_files",
srcs = glob(
@@ -95,9 +125,7 @@ filegroup(
"//upb/cmake:__pkg__",
],
)
-# end:github_only
-# begin:github_only
filegroup(
name = "test_srcs",
srcs = glob(
@@ -107,4 +135,3 @@ filegroup(
),
visibility = ["//upb:__pkg__"],
)
-# end:github_only
diff --git a/third_party/upb/upb/wire/byte_size.c b/third_party/upb/upb/wire/byte_size.c
new file mode 100644
index 0000000000000..b35a186f2eb9c
--- /dev/null
+++ b/third_party/upb/upb/wire/byte_size.c
@@ -0,0 +1,37 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/wire/byte_size.h"
+
+#include
+
+#include "upb/mem/arena.h"
+#include "upb/message/message.h"
+#include "upb/mini_table/message.h"
+#include "upb/wire/encode.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+size_t upb_ByteSize(const upb_Message* msg, const upb_MiniTable* mt) {
+ upb_Arena* arena = upb_Arena_New();
+ char* buf;
+ size_t res = 0;
+
+ upb_Encode(msg, mt, 0, arena, &buf, &res);
+
+ upb_Arena_Free(arena);
+ return res;
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
\ No newline at end of file
diff --git a/third_party/upb/upb/wire/byte_size.h b/third_party/upb/upb/wire/byte_size.h
new file mode 100644
index 0000000000000..4018d74edf477
--- /dev/null
+++ b/third_party/upb/upb/wire/byte_size.h
@@ -0,0 +1,31 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef UPB_WIRE_BYTE_SIZE_H_
+#define UPB_WIRE_BYTE_SIZE_H_
+
+#include
+
+#include "upb/message/message.h"
+#include "upb/mini_table/message.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+UPB_API size_t upb_ByteSize(const upb_Message* msg, const upb_MiniTable* mt);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif // UPB_WIRE_BYTE_SIZE_H_
diff --git a/third_party/upb/upb/wire/byte_size_test.cc b/third_party/upb/upb/wire/byte_size_test.cc
new file mode 100644
index 0000000000000..ea4ffda8dd9b1
--- /dev/null
+++ b/third_party/upb/upb/wire/byte_size_test.cc
@@ -0,0 +1,40 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include "upb/wire/byte_size.h"
+
+#include
+#include "google/protobuf/test_messages_proto2.upb.h"
+#include "google/protobuf/test_messages_proto2.upb_minitable.h"
+#include "upb/base/upcast.h"
+#include "upb/mem/arena.h"
+#include "upb/mini_table/message.h"
+
+namespace {
+static const upb_MiniTable* kTestMiniTable =
+ &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init;
+
+TEST(ByteSizeTest, UnpopulatedMsg) {
+ upb_Arena* arena = upb_Arena_New();
+ protobuf_test_messages_proto2_TestAllTypesProto2* msg =
+ protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
+ auto res = upb_ByteSize(UPB_UPCAST(msg), kTestMiniTable);
+ EXPECT_EQ(res, 0);
+ upb_Arena_Free(arena);
+}
+
+TEST(ByteSizeTest, PopulatedMsg) {
+ upb_Arena* arena = upb_Arena_New();
+ protobuf_test_messages_proto2_TestAllTypesProto2* msg =
+ protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
+ protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_int32(msg, 322);
+ auto res = upb_ByteSize(UPB_UPCAST(msg), kTestMiniTable);
+ EXPECT_EQ(res, 3);
+ upb_Arena_Free(arena);
+}
+
+} // namespace
diff --git a/third_party/upb/upb/wire/decode.h b/third_party/upb/upb/wire/decode.h
index cc72f4f86eb41..47a2697f19c6d 100644
--- a/third_party/upb/upb/wire/decode.h
+++ b/third_party/upb/upb/wire/decode.h
@@ -45,7 +45,7 @@ enum {
* already has some sub-message fields present. If the sub-message does
* not occur in the binary payload, we will never visit it and discover the
* incomplete sub-message. For this reason, this check is only useful for
- * implemting ParseFromString() semantics. For MergeFromString(), a
+ * implementing ParseFromString() semantics. For MergeFromString(), a
* post-parse validation step will always be necessary. */
kUpb_DecodeOption_CheckRequired = 2,
diff --git a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
index c1c5dc76cc509..03d4bf5036d7b 100644
--- a/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
+++ b/third_party/upb/upb/wire/eps_copy_input_stream_test.cc
@@ -13,9 +13,6 @@
#include
#include "upb/mem/arena.hpp"
-// begin:google_only
-// #include "testing/fuzzing/fuzztest.h"
-// end:google_only
namespace {
@@ -27,316 +24,4 @@ TEST(EpsCopyInputStreamTest, ZeroSize) {
upb_EpsCopyInputStream_IsDoneWithCallback(&stream, &ptr, nullptr));
}
-// begin:google_only
-//
-// // We create a simple, trivial implementation of the stream that we can test
-// // our real implementation against.
-//
-// class FakeStream {
-// public:
-// explicit FakeStream(const std::string& data) : data_(data), offset_(0) {
-// limits_.push_back(data.size());
-// }
-//
-// // If we reached one or more limits correctly, returns the number of limits
-// // ended. If we tried to read beyond the current limit, returns -1.
-// // Otherwise, for simple success, returns 0.
-// int ReadData(int n, std::string* data) {
-// if (n > BytesUntilLimit()) return -1;
-//
-// data->assign(data_.data() + offset_, n);
-// offset_ += n;
-//
-// int end_limit_count = 0;
-//
-// while (BytesUntilLimit() == 0) {
-// if (PopLimit()) {
-// end_limit_count++;
-// } else {
-// eof_ = true;
-// break;
-// }
-// }
-//
-// return end_limit_count;
-// }
-//
-// bool TryPushLimit(int limit) {
-// if (!CheckSize(limit)) return false;
-// limits_.push_back(offset_ + limit);
-// return true;
-// }
-//
-// bool IsEof() const { return eof_; }
-//
-// private:
-// int BytesUntilLimit() const { return limits_.back() - offset_; }
-// bool CheckSize(int size) const { return BytesUntilLimit() >= size; }
-//
-// // Return false on EOF.
-// bool PopLimit() {
-// limits_.pop_back();
-// return !limits_.empty();
-// }
-//
-// std::string data_;
-// // Limits, specified in absolute stream terms.
-// std::vector limits_;
-// int offset_;
-// bool eof_ = false;
-// };
-//
-// char tmp_buf[kUpb_EpsCopyInputStream_SlopBytes];
-//
-// class EpsStream {
-// public:
-// EpsStream(const std::string& data, bool enable_aliasing)
-// : data_(data), enable_aliasing_(enable_aliasing) {
-// ptr_ = data_.data();
-// upb_EpsCopyInputStream_Init(&eps_, &ptr_, data_.size(), enable_aliasing);
-// }
-//
-// // Returns false at EOF or error.
-// int ReadData(int n, std::string* data) {
-// EXPECT_LE(n, kUpb_EpsCopyInputStream_SlopBytes);
-// if (enable_aliasing_) {
-// EXPECT_TRUE(upb_EpsCopyInputStream_AliasingAvailable(&eps_, ptr_, n));
-// }
-// // We want to verify that we can read kUpb_EpsCopyInputStream_SlopBytes
-// // safely, even if we haven't actually been requested to read that much.
-// // We copy to a global buffer so the copy can't be optimized away.
-// memcpy(&tmp_buf, ptr_, kUpb_EpsCopyInputStream_SlopBytes);
-// data->assign(tmp_buf, n);
-// ptr_ += n;
-// if (enable_aliasing_) {
-// EXPECT_TRUE(upb_EpsCopyInputStream_AliasingAvailable(&eps_, ptr_, 0));
-// }
-// return PopLimits();
-// }
-//
-// int ReadString(int n, std::string* data) {
-// if (!upb_EpsCopyInputStream_CheckSize(&eps_, ptr_, n)) return -1;
-// const char* str_data = ptr_;
-// if (enable_aliasing_) {
-// EXPECT_TRUE(upb_EpsCopyInputStream_AliasingAvailable(&eps_, ptr_, n));
-// }
-// ptr_ = upb_EpsCopyInputStream_ReadString(&eps_, &str_data, n, arena_.ptr());
-// if (!ptr_) return -1;
-// if (enable_aliasing_ && n) {
-// EXPECT_GE(reinterpret_cast(str_data),
-// reinterpret_cast(data_.data()));
-// EXPECT_LT(reinterpret_cast(str_data),
-// reinterpret_cast(data_.data() + data_.size()));
-// EXPECT_TRUE(upb_EpsCopyInputStream_AliasingAvailable(&eps_, ptr_, 0));
-// }
-// data->assign(str_data, n);
-// return PopLimits();
-// }
-//
-// bool TryPushLimit(int limit) {
-// if (!upb_EpsCopyInputStream_CheckSize(&eps_, ptr_, limit)) return false;
-// deltas_.push_back(upb_EpsCopyInputStream_PushLimit(&eps_, ptr_, limit));
-// return true;
-// }
-//
-// bool IsEof() const { return eof_; }
-//
-// private:
-// int PopLimits() {
-// int end_limit_count = 0;
-//
-// while (IsAtLimit()) {
-// if (error_) return -1;
-// if (PopLimit()) {
-// end_limit_count++;
-// } else {
-// eof_ = true; // EOF.
-// break;
-// }
-// }
-//
-// return error_ ? -1 : end_limit_count;
-// }
-//
-// bool IsAtLimit() {
-// return upb_EpsCopyInputStream_IsDoneWithCallback(
-// &eps_, &ptr_, &EpsStream::IsDoneFallback);
-// }
-//
-// // Return false on EOF.
-// bool PopLimit() {
-// if (deltas_.empty()) return false;
-// upb_EpsCopyInputStream_PopLimit(&eps_, ptr_, deltas_.back());
-// deltas_.pop_back();
-// return true;
-// }
-//
-// static const char* IsDoneFallback(upb_EpsCopyInputStream* e, const char* ptr,
-// int overrun) {
-// return _upb_EpsCopyInputStream_IsDoneFallbackInline(
-// e, ptr, overrun, &EpsStream::BufferFlipCallback);
-// }
-//
-// static const char* BufferFlipCallback(upb_EpsCopyInputStream* e,
-// const char* old_end,
-// const char* new_start) {
-// EpsStream* stream = reinterpret_cast(e);
-// if (!old_end) stream->error_ = true;
-// return new_start;
-// }
-//
-// upb_EpsCopyInputStream eps_;
-// std::string data_;
-// const char* ptr_;
-// std::vector deltas_;
-// upb::Arena arena_;
-// bool error_ = false;
-// bool eof_ = false;
-// bool enable_aliasing_;
-// };
-//
-// // Reads N bytes from the given position.
-// struct ReadOp {
-// int bytes; // Must be <= kUpb_EpsCopyInputStream_SlopBytes.
-// };
-//
-// struct ReadStringOp {
-// int bytes;
-// };
-//
-// // Pushes a new limit of N bytes from the current position.
-// struct PushLimitOp {
-// int bytes;
-// };
-//
-// typedef std::variant Op;
-//
-// struct EpsCopyTestScript {
-// int data_size;
-// bool enable_aliasing;
-// std::vector ops;
-// };
-//
-// auto ArbitraryEpsCopyTestScript() {
-// using ::fuzztest::Arbitrary;
-// using ::fuzztest::InRange;
-// using ::fuzztest::NonNegative;
-// using ::fuzztest::StructOf;
-// using ::fuzztest::VariantOf;
-// using ::fuzztest::VectorOf;
-//
-// int max_data_size = 512;
-//
-// return StructOf(
-// InRange(0, max_data_size), // data_size
-// Arbitrary(), // enable_aliasing
-// VectorOf(VariantOf(
-// // ReadOp
-// StructOf(InRange(0, kUpb_EpsCopyInputStream_SlopBytes)),
-// // ReadStringOp
-// StructOf(NonNegative()),
-// // PushLimitOp
-// StructOf(NonNegative()))));
-// }
-//
-// // Run a test that creates both real stream and a fake stream, and validates
-// // that they have the same behavior.
-// void TestAgainstFakeStream(const EpsCopyTestScript& script) {
-// std::string data(script.data_size, 'x');
-// for (int i = 0; i < script.data_size; ++i) {
-// data[i] = static_cast(i & 0xff);
-// }
-//
-// FakeStream fake_stream(data);
-// EpsStream eps_stream(data, script.enable_aliasing);
-//
-// for (const auto& op : script.ops) {
-// if (const ReadOp* read_op = std::get_if(&op)) {
-// std::string data_fake;
-// std::string data_eps;
-// int fake_result = fake_stream.ReadData(read_op->bytes, &data_fake);
-// int eps_result = eps_stream.ReadData(read_op->bytes, &data_eps);
-// EXPECT_EQ(fake_result, eps_result);
-// if (fake_result == -1) break; // Error
-// EXPECT_EQ(data_fake, data_eps);
-// EXPECT_EQ(fake_stream.IsEof(), eps_stream.IsEof());
-// if (fake_stream.IsEof()) break;
-// } else if (const ReadStringOp* read_op = std::get_if(&op)) {
-// std::string data_fake;
-// std::string data_eps;
-// int fake_result = fake_stream.ReadData(read_op->bytes, &data_fake);
-// int eps_result = eps_stream.ReadString(read_op->bytes, &data_eps);
-// EXPECT_EQ(fake_result, eps_result);
-// if (fake_result == -1) break; // Error
-// EXPECT_EQ(data_fake, data_eps);
-// EXPECT_EQ(fake_stream.IsEof(), eps_stream.IsEof());
-// if (fake_stream.IsEof()) break;
-// } else if (const PushLimitOp* push = std::get_if(&op)) {
-// EXPECT_EQ(fake_stream.TryPushLimit(push->bytes),
-// eps_stream.TryPushLimit(push->bytes));
-// } else {
-// EXPECT_TRUE(false); // Unknown op.
-// }
-// }
-// }
-//
-// // Test with:
-// // $ bazel run --config=fuzztest third_party/upb:eps_copy_input_stream_test
-// // -- --gunit_fuzz=
-// FUZZ_TEST(EpsCopyFuzzTest, TestAgainstFakeStream)
-// .WithDomains(ArbitraryEpsCopyTestScript());
-//
-// TEST(EpsCopyFuzzTest, TestAgainstFakeStreamRegression) {
-// TestAgainstFakeStream({299,
-// false,
-// {
-// PushLimitOp{2},
-// ReadOp{14},
-// }});
-// }
-//
-// TEST(EpsCopyFuzzTest, AliasingEnabledZeroSizeReadString) {
-// TestAgainstFakeStream({510, true, {ReadStringOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, AliasingDisabledZeroSizeReadString) {
-// TestAgainstFakeStream({510, false, {ReadStringOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, ReadStringZero) {
-// TestAgainstFakeStream({0, true, {ReadStringOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, ReadZero) {
-// TestAgainstFakeStream({0, true, {ReadOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, ReadZeroTwice) {
-// TestAgainstFakeStream({0, true, {ReadOp{0}, ReadOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, ReadStringZeroThenRead) {
-// TestAgainstFakeStream({0, true, {ReadStringOp{0}, ReadOp{0}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, ReadStringOverflowsBufferButNotLimit) {
-// TestAgainstFakeStream({351,
-// false,
-// {
-// ReadOp{7},
-// PushLimitOp{2147483647},
-// ReadStringOp{344},
-// }});
-// }
-//
-// TEST(EpsCopyFuzzTest, LastBufferAliasing) {
-// TestAgainstFakeStream({27, true, {ReadOp{12}, ReadStringOp{3}}});
-// }
-//
-// TEST(EpsCopyFuzzTest, FirstBufferAliasing) {
-// TestAgainstFakeStream({7, true, {ReadStringOp{3}}});
-// }
-//
-// end:google_only
-
} // namespace
diff --git a/third_party/utf8_range/BUILD.bazel b/third_party/utf8_range/BUILD.bazel
index fdc1a49b1e109..90b1088c4c5dc 100644
--- a/third_party/utf8_range/BUILD.bazel
+++ b/third_party/utf8_range/BUILD.bazel
@@ -4,13 +4,23 @@
# license that can be found in the LICENSE file or at
# https://opensource.org/licenses/MIT.
+load("@rules_license//rules:license.bzl", "license")
+
DEFAULT_VISIBILITY = [
"//src/google/protobuf:__subpackages__",
"//third_party/utf8_range:__subpackages__",
"//util/utf8/internal:__subpackages__",
]
-package(default_visibility = ["//visibility:public"])
+package(
+ default_applicable_licenses = ["//third_party/utf8_range:license"],
+ default_visibility = ["//visibility:public"],
+)
+
+license(
+ name = "license",
+ package_name = "utf8_range",
+)
licenses(["notice"])
diff --git a/third_party/utf8_range/README.md b/third_party/utf8_range/README.md
index 30ff5b785b8fa..7971a106ed683 100644
--- a/third_party/utf8_range/README.md
+++ b/third_party/utf8_range/README.md
@@ -23,7 +23,7 @@ Four UTF-8 validation methods are compared on both x86 and Arm platforms. Benchm
* Run "make" to build. Built and tested with gcc-7.3.
* Run "./utf8" to see all command line options.
* Benchmark
- * Run "./utf8 bench" to bechmark all algorithms with [default test file](https://raw.githubusercontent.com/cyb70289/utf8/master/UTF-8-demo.txt).
+ * Run "./utf8 bench" to benchmark all algorithms with [default test file](https://raw.githubusercontent.com/cyb70289/utf8/master/UTF-8-demo.txt).
* Run "./utf8 bench size NUM" to benchmark specified string size.
* Run "./utf8 test" to test all algorithms with positive and negative test cases.
* To benchmark or test specific algorithm, run something like "./utf8 bench range".
@@ -123,8 +123,8 @@ To implement above operations efficiently with SIMD:
* For 16 input bytes, use lookup table to map C0..DF to 1, E0..EF to 2, F0..FF to 3, others to 0. Save to first_len.
* Map C0..FF to 8, we get range indices for First Byte.
* Shift first_len one byte, we get range indices for Second Byte.
-* Saturate substract first_len by one(3->2, 2->1, 1->0, 0->0), then shift two bytes, we get range indices for Third Byte.
-* Saturate substract first_len by two(3->1, 2->0, 1->0, 0->0), then shift three bytes, we get range indices for Fourth Byte.
+* Saturate subtract first_len by one(3->2, 2->1, 1->0, 0->0), then shift two bytes, we get range indices for Third Byte.
+* Saturate subtract first_len by two(3->1, 2->0, 1->0, 0->0), then shift three bytes, we get range indices for Fourth Byte.
Example(assume no previous data)
@@ -191,8 +191,8 @@ NEON ```tbl``` instruction is very convenient for table lookup:
Leverage these features, we can solve the problem with as few as **two** operations:
* Precreate a 16x2 lookup table, where table[0]=2, table[13]=3, table[16]=3, table[20]=4, table[others]=0.
-* Substract input bytes with E0 (E0 -> 0, ED -> 13, F0 -> 16, F4 -> 20).
-* Use the substracted byte as index of lookup table and get range adjustment directly.
+* Subtract input bytes with E0 (E0 -> 0, ED -> 13, F0 -> 16, F4 -> 20).
+* Use the subtracted byte as index of lookup table and get range adjustment directly.
* For indices less than 32, we get zero or required adjustment value per input byte
* For out of bound indices, we get zero per ```tbl``` behaviour
@@ -208,10 +208,10 @@ We can still leverage these features to solve the problem in **five** operations
* Precreate two tables:
* table_df[1] = 2, table_df[14] = 3, table_df[others] = 0
* table_ef[1] = 3, table_ef[5] = 4, table_ef[others] = 0
-* Substract input bytes with EF (E0 -> 241, ED -> 254, F0 -> 1, F4 -> 5) to get the temporary indices
+* Subtract input bytes with EF (E0 -> 241, ED -> 254, F0 -> 1, F4 -> 5) to get the temporary indices
* Get range index for E0,ED
- * Saturate substract temporary indices with 240 (E0 -> 1, ED -> 14, all values below 240 becomes 0)
- * Use substracted indices to look up table_df, get the correct adjustment
+ * Saturate subtract temporary indices with 240 (E0 -> 1, ED -> 14, all values below 240 becomes 0)
+ * Use subtracted indices to look up table_df, get the correct adjustment
* Get range index for F0,F4
* Saturate add temporary indices with 112(0x70) (F0 -> 0x71, F4 -> 0x75, all values above 16 will be larger than 128(7-th bit set))
* Use added indices to look up table_ef, get the correct adjustment (index 0x71,0x75 returns 1st,5th elements, per ```pshufb``` behaviour)
diff --git a/third_party/utf8_range/boost.cpp b/third_party/utf8_range/boost.cpp
index 2954f612820b1..c41d019efd344 100644
--- a/third_party/utf8_range/boost.cpp
+++ b/third_party/utf8_range/boost.cpp
@@ -2,7 +2,7 @@
using namespace std;
-/* Return 0 on sucess, -1 on error */
+/* Return 0 on success, -1 on error */
extern "C" int utf8_boost(const unsigned char* data, int len) {
try {
boost::locale::conv::utf_to_utf(data, data + len,
diff --git a/third_party/utf8_range/fuzz/BUILD.bazel b/third_party/utf8_range/fuzz/BUILD.bazel
index 43e153eb87122..d16d1acd20c66 100644
--- a/third_party/utf8_range/fuzz/BUILD.bazel
+++ b/third_party/utf8_range/fuzz/BUILD.bazel
@@ -1,5 +1,7 @@
load("@rules_fuzzing//fuzzing:cc_defs.bzl", "cc_fuzz_test")
+package(default_applicable_licenses = ["//third_party/utf8_range:license"])
+
cc_fuzz_test(
name = "utf8_validity_fuzzer",
testonly = 1,
diff --git a/third_party/utf8_range/main.c b/third_party/utf8_range/main.c
index 214fd4ff5c9cb..b0ca3e1cfba73 100644
--- a/third_party/utf8_range/main.c
+++ b/third_party/utf8_range/main.c
@@ -222,7 +222,7 @@ static int test_manual(const struct ftab *ftab)
}
for (int i = 0; i < sizeof(neg)/sizeof(neg[0]); ++i) {
if (ftab->func(neg[i].data, neg[i].len) == 0) {
- printf("FAILED negitive test: ");
+ printf("FAILED negative test: ");
print_test(neg[i].data, neg[i].len);
return -1;
}
@@ -256,7 +256,7 @@ static int test_manual(const struct ftab *ftab)
while (buf_len >= 1 && buf[buf_len-1] <= 0x7F)
--buf_len;
if (buf_len && ftab->func(buf, buf_len-1) == 0) {
- printf("FAILED negitive test: ");
+ printf("FAILED negative test: ");
print_test(buf, buf_len);
return -1;
}
diff --git a/third_party/utf8_range/range-avx2.c b/third_party/utf8_range/range-avx2.c
index 0791cf83ce1d0..d8922840c2ee8 100644
--- a/third_party/utf8_range/range-avx2.c
+++ b/third_party/utf8_range/range-avx2.c
@@ -175,7 +175,7 @@ int utf8_range_avx2(const unsigned char *data, int len)
range = _mm256_or_si256(range, tmp2);
/*
- * Now we have below range indices caluclated
+ * Now we have below range indices calculated
* Correct cases:
* - 8 for C0~FF
* - 3 for 1st byte after F0~FF
diff --git a/third_party/utf8_range/range-neon.c b/third_party/utf8_range/range-neon.c
index 99c2a24835a4a..e8c533cb2b293 100644
--- a/third_party/utf8_range/range-neon.c
+++ b/third_party/utf8_range/range-neon.c
@@ -163,7 +163,7 @@ int utf8_range(const unsigned char *data, int len)
range = vorrq_u8(range, tmp2);
/*
- * Now we have below range indices caluclated
+ * Now we have below range indices calculated
* Correct cases:
* - 8 for C0~FF
* - 3 for 1st byte after F0~FF
diff --git a/third_party/utf8_range/range-sse.c b/third_party/utf8_range/range-sse.c
index 3dcde8e7b83b8..41d15593ed3f0 100644
--- a/third_party/utf8_range/range-sse.c
+++ b/third_party/utf8_range/range-sse.c
@@ -150,7 +150,7 @@ int utf8_range(const unsigned char *data, int len)
range = _mm_or_si128(range, tmp);
/*
- * Now we have below range indices caluclated
+ * Now we have below range indices calculated
* Correct cases:
* - 8 for C0~FF
* - 3 for 1st byte after F0~FF
diff --git a/third_party/utf8_range/utf8_to_utf16/main.c b/third_party/utf8_range/utf8_to_utf16/main.c
index cb8976406d169..9e6751e3396ed 100644
--- a/third_party/utf8_range/utf8_to_utf16/main.c
+++ b/third_party/utf8_range/utf8_to_utf16/main.c
@@ -197,7 +197,7 @@ static int test_manual(const struct ftab *ftab, unsigned short *buf16,
ret = ftab->func(neg[i].data, neg[i].len, buf16, &len16);
_ret = utf8_to16_iconv(neg[i].data, neg[i].len, _buf16, &_len16);
if (ret != _ret || len16 != _len16 || memcmp(buf16, _buf16, len16)) {
- printf("FAILED negitive test(%d:%d, %lu:%lu): ",
+ printf("FAILED negative test(%d:%d, %lu:%lu): ",
ret, _ret, len16, _len16);
print_test(neg[i].data, neg[i].len);
return -1;
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index e7ed5c2150570..328fa4a380711 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -93,7 +93,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248",
"tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:0763d919b17b4cfe5b65aff3bf911c04e9e4d46d11649858742033facd9f534f",
"tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004",
- "tools/dockerfile/test/cxx_clang_18_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_18_x64@sha256:46beb9901d0c480a40724a3934677ef5e8d6b2f177517c98e67ccff5d881503f",
+ "tools/dockerfile/test/cxx_clang_19_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_19_x64@sha256:2b5e396dbb9ef751471eb5c5433cbf3e694616daf0e8f9df53f0933e7796de5d",
"tools/dockerfile/test/cxx_clang_7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_7_x64@sha256:b35f94648ada85aab9110dae0ebca594cd278672d4bbce38312cefa372952cae",
"tools/dockerfile/test/cxx_debian11_openssl102_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl102_x64@sha256:477ae0da7ff7faa9cf195c0d32472fec4cf8b7325505c63e00b5c794c9a4b1a7",
"tools/dockerfile/test/cxx_debian11_openssl111_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl111_x64@sha256:d383e66d4a089f9305768e3037faa2a887ff91565b0f3ddd96985dca94e9754f",
diff --git a/tools/bazelify_tests/test/portability_tests.bzl b/tools/bazelify_tests/test/portability_tests.bzl
index 75cdf581880dd..68531b1619d57 100644
--- a/tools/bazelify_tests/test/portability_tests.bzl
+++ b/tools/bazelify_tests/test/portability_tests.bzl
@@ -62,7 +62,7 @@ def generate_run_tests_portability_tests(name):
["gcc_12_openssl309", "--cmake_configure_extra_args=-DgRPC_SSL_PROVIDER=package", "tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version"],
["gcc_musl", "", "tools/dockerfile/test/cxx_alpine_x64.current_version"],
["clang_7", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_7_x64.current_version"],
- ["clang_18_cxx23", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++ --cmake_configure_extra_args=-DCMAKE_CXX_STANDARD=23", "tools/dockerfile/test/cxx_clang_18_x64.current_version"],
+ ["clang_19_cxx23", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++ --cmake_configure_extra_args=-DCMAKE_CXX_STANDARD=23", "tools/dockerfile/test/cxx_clang_19_x64.current_version"],
]
for compiler_name, args, docker_image_version in compiler_configs:
diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py
index 2fcb4a99bb034..1e2b72d845419 100644
--- a/tools/distrib/python/grpc_version.py
+++ b/tools/distrib/python/grpc_version.py
@@ -15,4 +15,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpc_version.py.template`!!!
VERSION = '1.69.0.dev0'
-PROTOBUF_VERSION = '3.28.1'
+PROTOBUF_VERSION = '3.29.0'
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
index ce74eecf1bfbc..afe296c005dc4 100644
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -15,4 +15,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
VERSION = '1.69.0.dev0'
-PROTOBUF_VERSION = '3.28.1'
+PROTOBUF_VERSION = '3.29.0'
diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index 00696e3486d2c..7df166c2877de 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -145,6 +145,7 @@
'third_party/protobuf/src/google/protobuf/arenastring.cc',
'third_party/protobuf/src/google/protobuf/arenaz_sampler.cc',
'third_party/protobuf/src/google/protobuf/compiler/code_generator.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/code_generator_lite.cc',
'third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc',
'third_party/protobuf/src/google/protobuf/compiler/cpp/enum.cc',
'third_party/protobuf/src/google/protobuf/compiler/cpp/extension.cc',
@@ -204,7 +205,6 @@
'third_party/protobuf/src/google/protobuf/compiler/java/helpers.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/internal_helpers.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/java_features.pb.cc',
- 'third_party/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/lite/enum.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/lite/enum_field.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/lite/extension.cc',
@@ -220,6 +220,9 @@
'third_party/protobuf/src/google/protobuf/compiler/java/name_resolver.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/names.cc',
'third_party/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/kotlin/file.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/kotlin/generator.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/kotlin/message.cc',
'third_party/protobuf/src/google/protobuf/compiler/main.cc',
'third_party/protobuf/src/google/protobuf/compiler/objectivec/enum.cc',
'third_party/protobuf/src/google/protobuf/compiler/objectivec/enum_field.cc',
@@ -252,10 +255,12 @@
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/default_value.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/map.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/repeated_field.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_cord.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_message.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/singular_string.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/rust/accessors/with_presence.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/context.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/crate_mapping.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/enum.cc',
@@ -266,6 +271,7 @@
'third_party/protobuf/src/google/protobuf/compiler/rust/relative_path.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/rust_field_type.cc',
'third_party/protobuf/src/google/protobuf/compiler/rust/rust_keywords.cc',
+ 'third_party/protobuf/src/google/protobuf/compiler/rust/upb_helpers.cc',
'third_party/protobuf/src/google/protobuf/compiler/subprocess.cc',
'third_party/protobuf/src/google/protobuf/compiler/versions.cc',
'third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc',
@@ -316,7 +322,9 @@
'third_party/protobuf/src/google/protobuf/wire_format_lite.cc',
'third_party/protobuf/third_party/utf8_range/utf8_range.c',
'third_party/protobuf/third_party/utf8_range/utf8_validity.cc',
- 'third_party/protobuf/upb_generator/mangle.cc'
+ 'third_party/protobuf/upb_generator/common/names.cc',
+ 'third_party/protobuf/upb_generator/minitable/names.cc',
+ 'third_party/protobuf/upb_generator/minitable/names_internal.cc'
]
PROTO_FILES=[
@@ -343,4 +351,4 @@
]
PROTO_INCLUDE='third_party/protobuf/src'
-PROTOBUF_SUBMODULE_VERSION="10ef3f77683f77fb3c059bf47725c27b3ff41e63"
+PROTOBUF_SUBMODULE_VERSION="2d4414f384dc499af113b5991ce3eaa9df6dd931"
diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py
index 74f9a8dacb1f6..bd2d801bd7dac 100644
--- a/tools/distrib/python/xds_protos/grpc_version.py
+++ b/tools/distrib/python/xds_protos/grpc_version.py
@@ -15,4 +15,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/grpc_version.py.template`!!!
VERSION = '1.69.0.dev0'
-PROTOBUF_VERSION = '3.28.1'
+PROTOBUF_VERSION = '3.29.0'
diff --git a/tools/dockerfile/test/cxx_clang_18_x64.current_version b/tools/dockerfile/test/cxx_clang_18_x64.current_version
deleted file mode 100644
index ada1c8f4b23c0..0000000000000
--- a/tools/dockerfile/test/cxx_clang_18_x64.current_version
+++ /dev/null
@@ -1 +0,0 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_18_x64:a3f9bea542d5048a4b0d7fdf91e9253705edb4f2@sha256:46beb9901d0c480a40724a3934677ef5e8d6b2f177517c98e67ccff5d881503f
\ No newline at end of file
diff --git a/tools/dockerfile/test/cxx_clang_19_x64.current_version b/tools/dockerfile/test/cxx_clang_19_x64.current_version
new file mode 100644
index 0000000000000..f8a605c589934
--- /dev/null
+++ b/tools/dockerfile/test/cxx_clang_19_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_19_x64:251760b46bd00d63fa042bdb5c5817425d22a5d8@sha256:2b5e396dbb9ef751471eb5c5433cbf3e694616daf0e8f9df53f0933e7796de5d
\ No newline at end of file
diff --git a/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile b/tools/dockerfile/test/cxx_clang_19_x64/Dockerfile
similarity index 99%
rename from tools/dockerfile/test/cxx_clang_18_x64/Dockerfile
rename to tools/dockerfile/test/cxx_clang_19_x64/Dockerfile
index 7d29882d0789d..6a3c3933375b5 100644
--- a/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_clang_19_x64/Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM silkeh/clang:18-bookworm
+FROM silkeh/clang:19-bookworm
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
#=================
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index b47a4a1df6e08..60a2221581896 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -598,8 +598,8 @@ def _compiler_options(
return ("alpine", [])
elif compiler == "clang7":
return ("clang_7", self._clang_cmake_configure_extra_args())
- elif compiler == "clang18":
- return ("clang_18", self._clang_cmake_configure_extra_args())
+ elif compiler == "clang19":
+ return ("clang_19", self._clang_cmake_configure_extra_args())
else:
raise Exception("Compiler %s not supported." % compiler)
@@ -1709,7 +1709,7 @@ def _build_and_run(
"gcc14",
"gcc_musl",
"clang7",
- "clang18",
+ "clang19",
# TODO: Automatically populate from supported version
"python3.7",
"python3.8",
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 8f82e2d23e930..af7cf801e15a8 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -362,7 +362,7 @@ def _create_portability_test_jobs(
"gcc14",
"gcc_musl",
"clang7",
- "clang18",
+ "clang19",
]:
test_jobs += _generate_jobs(
languages=["c", "c++"],
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index db3051dfe2ff0..cff0f782c6033 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -36,7 +36,7 @@ third_party/googletest 2dd1c131950043a8ad5ab0d2dda0e0970596586a
third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
third_party/opentelemetry-cpp a388e87d72b8321c189c8d41edb746ffa687ce3c
-third_party/protobuf 10ef3f77683f77fb3c059bf47725c27b3ff41e63
+third_party/protobuf 2d4414f384dc499af113b5991ce3eaa9df6dd931
third_party/protoc-gen-validate 32c2415389a3538082507ae537e7edd9578c64ed
third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1
third_party/xds 3a472e524827f72d1ad621c4983dd5af54c46776