From b997cb6d8d08750a1e92ef099a39bce56f93788c Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Thu, 21 Dec 2023 08:09:54 -0800 Subject: [PATCH] upb: add a non-void typedef for upb_Message PiperOrigin-RevId: 592863926 --- protos/protos.h | 10 +- protos/protos_internal_test.cc | 4 +- protos_generator/gen_accessors.cc | 2 +- protos_generator/gen_messages.cc | 17 +- python/BUILD.bazel | 1 + python/descriptor.c | 42 +- python/descriptor_pool.c | 9 +- python/map.c | 2 +- upb/base/BUILD | 1 + upb/base/upcast.h | 29 + upb/conformance/BUILD | 2 + upb/conformance/conformance_upb.c | 5 +- upb/generated_code_support.h | 1 + upb/json/decode_test.cc | 5 +- upb/json/encode_test.cc | 9 +- upb/json/fuzz_test.cc | 13 +- upb/message/accessors_test.cc | 153 +- upb/message/copy_test.cc | 51 +- upb/message/promote_test.cc | 70 +- upb/message/test.cc | 55 +- upb/message/types.h | 4 +- upb/message/utf8_test.cc | 18 +- upb/reflection/BUILD | 2 + upb/reflection/field_def.c | 4 +- upb/reflection/internal/def_builder.c | 8 +- .../stage0/google/protobuf/descriptor.upb.h | 2263 +++++++++-------- upb/test/BUILD | 1 + upb/test/test_cpp.cc | 12 +- upb/util/def_to_proto_test.cc | 4 +- upb/util/required_fields_test.cc | 17 +- upb/wire/decode.c | 12 +- upb/wire/encode.c | 6 +- upb/wire/encode.h | 6 +- upb_generator/protoc-gen-upb.cc | 74 +- .../google/protobuf/compiler/plugin.upb.h | 250 +- upb_generator/upbdev.c | 10 +- 36 files changed, 1793 insertions(+), 1379 deletions(-) create mode 100644 upb/base/upcast.h diff --git a/protos/protos.h b/protos/protos.h index a06c9e4815..0521e33c37 100644 --- a/protos/protos.h +++ b/protos/protos.h @@ -72,7 +72,7 @@ class Ptr final { #endif private: - Ptr(void* msg, upb_Arena* arena) : p_(msg, arena) {} // NOLINT + Ptr(upb_Message* msg, upb_Arena* arena) : p_(msg, arena) {} // NOLINT friend class Ptr; friend typename T::Access; @@ -132,11 +132,11 @@ struct PrivateAccess { return message->msg(); } template - static auto Proxy(void* p, upb_Arena* arena) { + static auto Proxy(upb_Message* p, upb_Arena* arena) { return typename T::Proxy(p, arena); } template - static auto CProxy(const void* p, upb_Arena* arena) { + static auto CProxy(const upb_Message* p, upb_Arena* arena) { return typename T::CProxy(p, arena); } }; @@ -152,7 +152,7 @@ T CreateMessage() { } template -typename T::Proxy CreateMessageProxy(void* msg, upb_Arena* arena) { +typename T::Proxy CreateMessageProxy(upb_Message* msg, upb_Arena* arena) { return typename T::Proxy(msg, arena); } @@ -418,7 +418,7 @@ absl::StatusOr> GetExtension( upb_MiniTableExtension_Number(id.mini_table_ext())); } return Ptr(::protos::internal::CreateMessage( - ext->data.ptr, ::protos::internal::GetArena(message))); + (upb_Message*)ext->data.ptr, ::protos::internal::GetArena(message))); } template (message, source_arena); + TestModel model = protos::internal::MoveMessage( + (upb_Message*)message, source_arena); // Now that we have moved ownership, free original arena. upb_Arena_Free(source_arena); EXPECT_EQ(model.int_value_with_default(), 123); diff --git a/protos_generator/gen_accessors.cc b/protos_generator/gen_accessors.cc index 5a121c82bd..44a0cc64f7 100644 --- a/protos_generator/gen_accessors.cc +++ b/protos_generator/gen_accessors.cc @@ -325,7 +325,7 @@ void WriteMapAccessorDefinitions(const protobuf::Descriptor* message, $5* msg_value; $7bool success = $4_$9_get(msg_, $8, &msg_value); if (success) { - return ::protos::internal::CreateMessage<$6>(msg_value, arena_); + return ::protos::internal::CreateMessage<$6>(UPB_UPCAST(msg_value), arena_); } return absl::NotFoundError(""); } diff --git a/protos_generator/gen_messages.cc b/protos_generator/gen_messages.cc index 89ca8611e6..03c48ea2ba 100644 --- a/protos_generator/gen_messages.cc +++ b/protos_generator/gen_messages.cc @@ -181,8 +181,8 @@ void WriteModelPublicDeclaration( output( R"cc( private: - const void* msg() const { return msg_; } - void* msg() { return msg_; } + const upb_Message* msg() const { return UPB_UPCAST(msg_); } + upb_Message* msg() { return UPB_UPCAST(msg_); } $0(upb_Message* msg, upb_Arena* arena) : $0Access() { msg_ = ($1*)msg; @@ -242,9 +242,10 @@ void WriteModelProxyDeclaration(const protobuf::Descriptor* descriptor, output( R"cc( private: - void* msg() const { return msg_; } + upb_Message* msg() const { return UPB_UPCAST(msg_); } - $0Proxy(void* msg, upb_Arena* arena) : internal::$0Access(($1*)msg, arena) {} + $0Proxy(upb_Message* msg, upb_Arena* arena) + : internal::$0Access(($1*)msg, arena) {} friend $0::Proxy(::protos::CreateMessage<$0>(::protos::Arena& arena)); friend $0::Proxy(::protos::internal::CreateMessageProxy<$0>( upb_Message*, upb_Arena*)); @@ -295,9 +296,9 @@ void WriteModelCProxyDeclaration(const protobuf::Descriptor* descriptor, R"cc( private: using AsNonConst = $0Proxy; - const void* msg() const { return msg_; } + const upb_Message* msg() const { return UPB_UPCAST(msg_); } - $0CProxy(const void* msg, upb_Arena* arena) + $0CProxy(const upb_Message* msg, upb_Arena* arena) : internal::$0Access(($1*)msg, arena){}; friend struct ::protos::internal::PrivateAccess; friend class RepeatedFieldProxy; @@ -340,7 +341,7 @@ void WriteMessageImplementation( } $0::$0(const $0& from) : $0Access() { arena_ = owned_arena_.ptr(); - msg_ = ($1*)::protos::internal::DeepClone(from.msg_, &$2, arena_); + msg_ = ($1*)::protos::internal::DeepClone(UPB_UPCAST(from.msg_), &$2, arena_); } $0::$0(const CProxy& from) : $0Access() { arena_ = owned_arena_.ptr(); @@ -354,7 +355,7 @@ void WriteMessageImplementation( } $0& $0::operator=(const $3& from) { arena_ = owned_arena_.ptr(); - msg_ = ($1*)::protos::internal::DeepClone(from.msg_, &$2, arena_); + msg_ = ($1*)::protos::internal::DeepClone(UPB_UPCAST(from.msg_), &$2, arena_); return *this; } $0& $0::operator=(const CProxy& from) { diff --git a/python/BUILD.bazel b/python/BUILD.bazel index f604badcf6..7f2b247115 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -190,6 +190,7 @@ py_extension( ], target_compatible_with = select(_message_target_compatible_with), deps = [ + "//upb:base", "//upb:descriptor_upb_proto_reflection", "//upb:eps_copy_input_stream", "//upb:hash", diff --git a/python/descriptor.c b/python/descriptor.c index ea4c028152..c5af6dd90e 100644 --- a/python/descriptor.c +++ b/python/descriptor.c @@ -12,6 +12,7 @@ #include "python/descriptor_pool.h" #include "python/message.h" #include "python/protobuf.h" +#include "upb/base/upcast.h" #include "upb/reflection/def.h" #include "upb/util/def_to_proto.h" @@ -391,7 +392,7 @@ static PyObject* PyUpb_Descriptor_GetOneofs(PyObject* _self, void* closure) { static PyObject* PyUpb_Descriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_MessageDef_Options(self->def), + &self->options, UPB_UPCAST(upb_MessageDef_Options(self->def)), &google__protobuf__MessageOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".MessageOptions"); } @@ -399,7 +400,7 @@ static PyObject* PyUpb_Descriptor_GetOptions(PyObject* _self, PyObject* args) { static PyObject* PyUpb_Descriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_MessageDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_MessageDef_ResolvedFeatures(self->def))); } static PyObject* PyUpb_Descriptor_CopyToProto(PyObject* _self, @@ -700,10 +701,10 @@ static PyType_Slot PyUpb_Descriptor_Slots[] = { {0, NULL}}; static PyType_Spec PyUpb_Descriptor_Spec = { - PYUPB_MODULE_NAME ".Descriptor", // tp_name - sizeof(PyUpb_DescriptorBase), // tp_basicsize - 0, // tp_itemsize - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags + PYUPB_MODULE_NAME ".Descriptor", // tp_name + sizeof(PyUpb_DescriptorBase), // tp_basicsize + 0, // tp_itemsize + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags PyUpb_Descriptor_Slots, }; @@ -809,7 +810,7 @@ static PyObject* PyUpb_EnumDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_EnumDef_Options(self->def), + &self->options, UPB_UPCAST(upb_EnumDef_Options(self->def)), &google__protobuf__EnumOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".EnumOptions"); } @@ -818,7 +819,7 @@ static PyObject* PyUpb_EnumDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_EnumDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_EnumDef_ResolvedFeatures(self->def))); } static PyObject* PyUpb_EnumDescriptor_CopyToProto(PyObject* _self, @@ -908,7 +909,7 @@ static PyObject* PyUpb_EnumValueDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_EnumValueDef_Options(self->def), + &self->options, UPB_UPCAST(upb_EnumValueDef_Options(self->def)), &google__protobuf__EnumValueOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".EnumValueOptions"); } @@ -917,7 +918,8 @@ static PyObject* PyUpb_EnumValueDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_EnumValueDef_ResolvedFeatures(self->def)); + &self->features, + UPB_UPCAST(upb_EnumValueDef_ResolvedFeatures(self->def))); } static PyGetSetDef PyUpb_EnumValueDescriptor_Getters[] = { @@ -1121,7 +1123,7 @@ static PyObject* PyUpb_FieldDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_FieldDef_Options(self->def), + &self->options, UPB_UPCAST(upb_FieldDef_Options(self->def)), &google__protobuf__FieldOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FieldOptions"); } @@ -1130,7 +1132,7 @@ static PyObject* PyUpb_FieldDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_FieldDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_FieldDef_ResolvedFeatures(self->def))); } static PyGetSetDef PyUpb_FieldDescriptor_Getters[] = { @@ -1381,7 +1383,7 @@ static PyObject* PyUpb_FileDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_FileDef_Options(self->def), + &self->options, UPB_UPCAST(upb_FileDef_Options(self->def)), &google__protobuf__FileOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".FileOptions"); } @@ -1390,7 +1392,7 @@ static PyObject* PyUpb_FileDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_FileDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_FileDef_ResolvedFeatures(self->def))); } static PyObject* PyUpb_FileDescriptor_CopyToProto(PyObject* _self, @@ -1515,7 +1517,7 @@ static PyObject* PyUpb_MethodDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_MethodDef_Options(self->def), + &self->options, UPB_UPCAST(upb_MethodDef_Options(self->def)), &google__protobuf__MethodOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".MethodOptions"); } @@ -1524,7 +1526,7 @@ static PyObject* PyUpb_MethodDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_MethodDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_MethodDef_ResolvedFeatures(self->def))); } static PyObject* PyUpb_MethodDescriptor_CopyToProto(PyObject* _self, @@ -1632,7 +1634,7 @@ static PyObject* PyUpb_OneofDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_OneofDef_Options(self->def), + &self->options, UPB_UPCAST(upb_OneofDef_Options(self->def)), &google__protobuf__OneofOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".OneofOptions"); } @@ -1641,7 +1643,7 @@ static PyObject* PyUpb_OneofDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_OneofDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_OneofDef_ResolvedFeatures(self->def))); } static PyGetSetDef PyUpb_OneofDescriptor_Getters[] = { @@ -1742,7 +1744,7 @@ static PyObject* PyUpb_ServiceDescriptor_GetOptions(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetOptions( - &self->options, upb_ServiceDef_Options(self->def), + &self->options, UPB_UPCAST(upb_ServiceDef_Options(self->def)), &google__protobuf__ServiceOptions_msg_init, PYUPB_DESCRIPTOR_PROTO_PACKAGE ".ServiceOptions"); } @@ -1751,7 +1753,7 @@ static PyObject* PyUpb_ServiceDescriptor_GetFeatures(PyObject* _self, PyObject* args) { PyUpb_DescriptorBase* self = (void*)_self; return PyUpb_DescriptorBase_GetFeatures( - &self->features, upb_ServiceDef_ResolvedFeatures(self->def)); + &self->features, UPB_UPCAST(upb_ServiceDef_ResolvedFeatures(self->def))); } static PyObject* PyUpb_ServiceDescriptor_CopyToProto(PyObject* _self, diff --git a/python/descriptor_pool.c b/python/descriptor_pool.c index 09efbda5fc..089d31b1a6 100644 --- a/python/descriptor_pool.c +++ b/python/descriptor_pool.c @@ -12,6 +12,7 @@ #include "python/descriptor.h" #include "python/message.h" #include "python/protobuf.h" +#include "upb/base/upcast.h" #include "upb/reflection/def.h" #include "upb/util/def_to_proto.h" @@ -147,8 +148,7 @@ bool PyUpb_DescriptorPool_CheckNoDatabase(PyObject* _self) { return true; } static bool PyUpb_DescriptorPool_LoadDependentFiles( PyUpb_DescriptorPool* self, google_protobuf_FileDescriptorProto* proto) { size_t n; - const upb_StringView* deps = - google_protobuf_FileDescriptorProto_dependency(proto, &n); + const upb_StringView* deps = google_protobuf_FileDescriptorProto_dependency(proto, &n); for (size_t i = 0; i < n; i++) { const upb_FileDef* dep = upb_DefPool_FindFileByNameWithSize( self->symtab, deps[i].data, deps[i].size); @@ -191,14 +191,13 @@ static PyObject* PyUpb_DescriptorPool_DoAddSerializedFile( if (file) { // If the existing file is equal to the new file, then silently ignore the // duplicate add. - google_protobuf_FileDescriptorProto* existing = - upb_FileDef_ToProto(file, arena); + google_protobuf_FileDescriptorProto* existing = upb_FileDef_ToProto(file, arena); if (!existing) { PyErr_SetNone(PyExc_MemoryError); goto done; } const upb_MessageDef* m = PyUpb_DescriptorPool_GetFileProtoDef(); - if (upb_Message_IsEqual(proto, existing, m)) { + if (upb_Message_IsEqual(UPB_UPCAST(proto), UPB_UPCAST(existing), m)) { result = PyUpb_FileDescriptor_Get(file); goto done; } diff --git a/python/map.c b/python/map.c index 4330aae1f4..bbbd636118 100644 --- a/python/map.c +++ b/python/map.c @@ -184,7 +184,7 @@ static PyObject* PyUpb_MapContainer_Subscript(PyObject* _self, PyObject* key) { map = PyUpb_MapContainer_EnsureReified(_self); upb_Arena* arena = PyUpb_Arena_Get(self->arena); if (upb_FieldDef_IsSubMessage(val_f)) { - const upb_Message* m = upb_FieldDef_MessageSubDef(val_f); + const upb_MessageDef* m = upb_FieldDef_MessageSubDef(val_f); const upb_MiniTable* layout = upb_MessageDef_MiniTable(m); u_val.msg_val = upb_Message_New(layout, arena); } else { diff --git a/upb/base/BUILD b/upb/base/BUILD index 54ef6d1867..1a025c295d 100644 --- a/upb/base/BUILD +++ b/upb/base/BUILD @@ -17,6 +17,7 @@ cc_library( "status.h", "status.hpp", "string_view.h", + "upcast.h", ], copts = UPB_DEFAULT_COPTS, visibility = ["//visibility:public"], diff --git a/upb/base/upcast.h b/upb/base/upcast.h new file mode 100644 index 0000000000..92d699dd21 --- /dev/null +++ b/upb/base/upcast.h @@ -0,0 +1,29 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2023 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_BASE_UPCAST_H_ +#define UPB_BASE_UPCAST_H_ + +// Must be last. +#include "upb/port/def.inc" + +// This macro provides a way to upcast message pointers in a way that is +// somewhat more bulletproof than blindly casting a pointer. Example: +// +// typedef struct { +// upb_Message UPB_PRIVATE(base); +// } pkg_FooMessage; +// +// void f(pkg_FooMessage* msg) { +// upb_Decode(UPB_UPCAST(msg), ...); +// } + +#define UPB_UPCAST(x) (&(x)->base##_dont_copy_me__upb_internal_use_only) + +#include "upb/port/undef.inc" + +#endif /* UPB_BASE_UPCAST_H_ */ diff --git a/upb/conformance/BUILD b/upb/conformance/BUILD index 94d18bac3a..8cdd3f7a7b 100644 --- a/upb/conformance/BUILD +++ b/upb/conformance/BUILD @@ -75,6 +75,7 @@ cc_binary( ":test_messages_proto3_upbdefs", "//src/google/protobuf/editions:test_messages_proto2_editions_upbdefs", "//src/google/protobuf/editions:test_messages_proto3_editions_upbdefs", + "//upb:base", "//upb:json", "//upb:port", "//upb:reflection", @@ -128,6 +129,7 @@ cc_binary( ":test_messages_proto3_upbdefs", "//src/google/protobuf/editions:test_messages_proto2_editions_upbdefs", "//src/google/protobuf/editions:test_messages_proto3_editions_upbdefs", + "//upb:base", "//upb:json", "//upb:port", "//upb:reflection", diff --git a/upb/conformance/conformance_upb.c b/upb/conformance/conformance_upb.c index 4efe32c17d..78cce522f2 100644 --- a/upb/conformance/conformance_upb.c +++ b/upb/conformance/conformance_upb.c @@ -20,6 +20,7 @@ #include "google/protobuf/editions/golden/test_messages_proto3_editions.upbdefs.h" #include "google/protobuf/test_messages_proto2.upbdefs.h" #include "google/protobuf/test_messages_proto3.upbdefs.h" +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/json/encode.h" #include "upb/reflection/message.h" @@ -291,9 +292,9 @@ bool DoTestIo(upb_DefPool* symtab) { test_count++; if (verbose) { - debug_print("Request", c.request, + debug_print("Request", UPB_UPCAST(c.request), conformance_ConformanceRequest_getmsgdef(symtab), &c); - debug_print("Response", c.response, + debug_print("Response", UPB_UPCAST(c.response), conformance_ConformanceResponse_getmsgdef(symtab), &c); fprintf(stderr, "\n"); } diff --git a/upb/generated_code_support.h b/upb/generated_code_support.h index cbc72945b9..025ff0eeda 100644 --- a/upb/generated_code_support.h +++ b/upb/generated_code_support.h @@ -9,6 +9,7 @@ #define UPB_GENERATED_CODE_SUPPORT_H_ // IWYU pragma: begin_exports +#include "upb/base/upcast.h" #include "upb/message/accessors.h" #include "upb/message/array.h" #include "upb/message/internal/accessors.h" diff --git a/upb/json/decode_test.cc b/upb/json/decode_test.cc index e3005c32a4..e8a6e3d411 100644 --- a/upb/json/decode_test.cc +++ b/upb/json/decode_test.cc @@ -13,6 +13,7 @@ #include "google/protobuf/struct.upb.h" #include #include "upb/base/status.hpp" +#include "upb/base/upcast.h" #include "upb/json/test.upb.h" #include "upb/json/test.upbdefs.h" #include "upb/mem/arena.h" @@ -27,8 +28,8 @@ static upb_test_Box* JsonDecode(const char* json, upb_Arena* a) { upb_test_Box* box = upb_test_Box_new(a); int options = 0; - bool ok = upb_JsonDecode(json, strlen(json), box, m.ptr(), defpool.ptr(), - options, a, status.ptr()); + bool ok = upb_JsonDecode(json, strlen(json), UPB_UPCAST(box), m.ptr(), + defpool.ptr(), options, a, status.ptr()); return ok ? box : nullptr; } diff --git a/upb/json/encode_test.cc b/upb/json/encode_test.cc index a5fc792e47..42ce6dde4d 100644 --- a/upb/json/encode_test.cc +++ b/upb/json/encode_test.cc @@ -13,6 +13,7 @@ #include "google/protobuf/struct.upb.h" #include #include "upb/base/status.hpp" +#include "upb/base/upcast.h" #include "upb/json/test.upb.h" #include "upb/json/test.upbdefs.h" #include "upb/mem/arena.h" @@ -26,12 +27,12 @@ static std::string JsonEncode(const upb_test_Box* msg, int options) { upb::MessageDefPtr m(upb_test_Box_getmsgdef(defpool.ptr())); EXPECT_TRUE(m.ptr() != nullptr); - size_t json_size = upb_JsonEncode(msg, m.ptr(), defpool.ptr(), options, - nullptr, 0, status.ptr()); + size_t json_size = upb_JsonEncode(UPB_UPCAST(msg), m.ptr(), defpool.ptr(), + options, nullptr, 0, status.ptr()); char* json_buf = (char*)upb_Arena_Malloc(a.ptr(), json_size + 1); - size_t size = upb_JsonEncode(msg, m.ptr(), defpool.ptr(), options, json_buf, - json_size + 1, status.ptr()); + size_t size = upb_JsonEncode(UPB_UPCAST(msg), m.ptr(), defpool.ptr(), options, + json_buf, json_size + 1, status.ptr()); EXPECT_EQ(size, json_size); return std::string(json_buf, json_size); } diff --git a/upb/json/fuzz_test.cc b/upb/json/fuzz_test.cc index 381c8ebad3..d430d15f40 100644 --- a/upb/json/fuzz_test.cc +++ b/upb/json/fuzz_test.cc @@ -12,6 +12,7 @@ #include #include "testing/fuzzing/fuzztest.h" #include "upb/base/status.hpp" +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/json/encode.h" #include "upb/json/test.upb.h" @@ -37,17 +38,17 @@ void DecodeEncodeArbitraryJson(std::string_view json) { upb_test_Box* box = upb_test_Box_new(arena.ptr()); int options = 0; - bool ok = upb_JsonDecode(json_heap, json.size(), box, m.ptr(), defpool.ptr(), - options, arena.ptr(), status.ptr()); + bool ok = upb_JsonDecode(json_heap, json.size(), UPB_UPCAST(box), m.ptr(), + defpool.ptr(), options, arena.ptr(), status.ptr()); delete[] json_heap; if (!ok) return; - size_t size = upb_JsonEncode(box, m.ptr(), defpool.ptr(), options, nullptr, 0, - status.ptr()); + size_t size = upb_JsonEncode(UPB_UPCAST(box), m.ptr(), defpool.ptr(), options, + nullptr, 0, status.ptr()); char* json_buf = (char*)upb_Arena_Malloc(arena.ptr(), size + 1); - size_t written = upb_JsonEncode(box, m.ptr(), defpool.ptr(), options, - json_buf, size + 1, status.ptr()); + size_t written = upb_JsonEncode(UPB_UPCAST(box), m.ptr(), defpool.ptr(), + options, json_buf, size + 1, status.ptr()); EXPECT_EQ(written, size); } FUZZ_TEST(FuzzTest, DecodeEncodeArbitraryJson); diff --git a/upb/message/accessors_test.cc b/upb/message/accessors_test.cc index 15de392b6d..9d8aa0e7cc 100644 --- a/upb/message/accessors_test.cc +++ b/upb/message/accessors_test.cc @@ -27,6 +27,7 @@ #include "upb/base/descriptor_constants.h" #include "upb/base/status.h" #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/mem/arena.h" #include "upb/message/array.h" #include "upb/message/message.h" @@ -81,11 +82,11 @@ TEST(GeneratedCode, HazzersProto2) { // Scalar/Boolean. const upb_MiniTableField* optional_bool_field = find_proto2_field(kFieldOptionalBool); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_bool_field)); + EXPECT_EQ(false, upb_Message_HasField(UPB_UPCAST(msg), optional_bool_field)); protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_bool(msg, true); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_bool_field)); - upb_Message_ClearField(msg, optional_bool_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_bool_field)); + EXPECT_EQ(true, upb_Message_HasField(UPB_UPCAST(msg), optional_bool_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_bool_field); + EXPECT_EQ(false, upb_Message_HasField(UPB_UPCAST(msg), optional_bool_field)); EXPECT_EQ( false, protobuf_test_messages_proto2_TestAllTypesProto2_optional_bool(msg)); @@ -93,16 +94,18 @@ TEST(GeneratedCode, HazzersProto2) { // String. const upb_MiniTableField* optional_string_field = find_proto2_field(kFieldOptionalString); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_string( msg, upb_StringView_FromString(kTestStr1)); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field)); + EXPECT_EQ(true, upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); EXPECT_EQ( strlen(kTestStr1), protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg) .size); - upb_Message_ClearField(msg, optional_string_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_string_field); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); EXPECT_EQ( 0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg) .size); @@ -110,12 +113,15 @@ TEST(GeneratedCode, HazzersProto2) { // Message. const upb_MiniTableField* optional_message_field = find_proto2_field(kFieldOptionalNestedMessage); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); protobuf_test_messages_proto2_TestAllTypesProto2_mutable_optional_nested_message( msg, arena); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field)); - upb_Message_ClearField(msg, optional_message_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_message_field); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); EXPECT_EQ( true, protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message( @@ -127,21 +133,31 @@ TEST(GeneratedCode, HazzersProto2) { const upb_MiniTableField* optional_oneof_string_field = find_proto2_field(kFieldOptionalOneOfString); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field)); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_uint32_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_string_field)); protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_uint32(msg, 123); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_uint32_field)); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_uint32_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_string_field)); protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_string( msg, upb_StringView_FromString(kTestStr1)); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field)); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_string_field)); - upb_Message_ClearField(msg, optional_oneof_uint32_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field)); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_string_field)); - upb_Message_ClearField(msg, optional_oneof_string_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field)); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_uint32_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_string_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_oneof_uint32_field); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_uint32_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_string_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_oneof_string_field); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_uint32_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_oneof_string_field)); upb_Arena_Free(arena); } @@ -157,10 +173,12 @@ TEST(GeneratedCode, ScalarsProto2) { EXPECT_EQ( 0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg)); - EXPECT_EQ(0, upb_Message_GetInt32(msg, optional_int32_field, 0)); - upb_Message_SetInt32(msg, optional_int32_field, kTestInt32, nullptr); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_int32_field)); - EXPECT_EQ(kTestInt32, upb_Message_GetInt32(msg, optional_int32_field, 0)); + EXPECT_EQ(0, upb_Message_GetInt32(UPB_UPCAST(msg), optional_int32_field, 0)); + upb_Message_SetInt32(UPB_UPCAST(msg), optional_int32_field, kTestInt32, + nullptr); + EXPECT_EQ(true, upb_Message_HasField(UPB_UPCAST(msg), optional_int32_field)); + EXPECT_EQ(kTestInt32, + upb_Message_GetInt32(UPB_UPCAST(msg), optional_int32_field, 0)); EXPECT_EQ( kTestInt32, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg)); @@ -170,9 +188,12 @@ TEST(GeneratedCode, ScalarsProto2) { EXPECT_EQ( 0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg)); - EXPECT_EQ(0, upb_Message_GetUInt32(msg, optional_uint32_field, 0)); - upb_Message_SetUInt32(msg, optional_uint32_field, kTestUInt32, nullptr); - EXPECT_EQ(kTestUInt32, upb_Message_GetUInt32(msg, optional_uint32_field, 0)); + EXPECT_EQ(0, + upb_Message_GetUInt32(UPB_UPCAST(msg), optional_uint32_field, 0)); + upb_Message_SetUInt32(UPB_UPCAST(msg), optional_uint32_field, kTestUInt32, + nullptr); + EXPECT_EQ(kTestUInt32, + upb_Message_GetUInt32(UPB_UPCAST(msg), optional_uint32_field, 0)); EXPECT_EQ( kTestUInt32, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg)); @@ -192,18 +213,20 @@ TEST(GeneratedCode, ScalarProto3) { EXPECT_EQ( 0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg)); - upb_Message_SetInt64(msg, optional_int64_field, -1, nullptr); + upb_Message_SetInt64(UPB_UPCAST(msg), optional_int64_field, -1, nullptr); EXPECT_EQ( -1, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg)); - EXPECT_EQ(-1, upb_Message_GetInt64(msg, optional_int64_field, 0)); + EXPECT_EQ(-1, upb_Message_GetInt64(UPB_UPCAST(msg), optional_int64_field, 0)); EXPECT_EQ( 0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg)); - upb_Message_SetUInt64(msg, optional_uint64_field, kTestUInt64, nullptr); + upb_Message_SetUInt64(UPB_UPCAST(msg), optional_uint64_field, kTestUInt64, + nullptr); EXPECT_EQ( kTestUInt64, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg)); - EXPECT_EQ(kTestUInt64, upb_Message_GetUInt64(msg, optional_uint64_field, 0)); + EXPECT_EQ(kTestUInt64, + upb_Message_GetUInt64(UPB_UPCAST(msg), optional_uint64_field, 0)); upb_Arena_Free(arena); } @@ -217,25 +240,27 @@ TEST(GeneratedCode, Strings) { find_proto2_field(kFieldOptionalString); // Test default. - EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); // Test read after write using C. protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_string( msg, upb_StringView_FromString(kTestStr1)); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field)); - upb_StringView value = upb_Message_GetString(msg, optional_string_field, - upb_StringView{nullptr, 0}); + EXPECT_EQ(true, upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); + upb_StringView value = upb_Message_GetString( + UPB_UPCAST(msg), optional_string_field, upb_StringView{nullptr, 0}); std::string read_value = std::string(value.data, value.size); EXPECT_EQ(kTestStr1, read_value); // Clear. - upb_Message_ClearField(msg, optional_string_field); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field)); + upb_Message_ClearField(UPB_UPCAST(msg), optional_string_field); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); EXPECT_EQ( false, protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string( msg)); - upb_Message_SetString(msg, optional_string_field, + upb_Message_SetString(UPB_UPCAST(msg), optional_string_field, upb_StringView_FromString(kTestStr2), nullptr); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field)); + EXPECT_EQ(true, upb_Message_HasField(UPB_UPCAST(msg), optional_string_field)); EXPECT_EQ( true, protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string( @@ -256,23 +281,25 @@ TEST(GeneratedCode, SubMessage) { find_proto2_field(kFieldOptionalNestedMessage); const upb_Message* test_message = - upb_Message_GetMessage(msg, optional_message_field, nullptr); + upb_Message_GetMessage(UPB_UPCAST(msg), optional_message_field, nullptr); EXPECT_EQ(nullptr, test_message); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); // Get mutable using C API. protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage* nested_message = protobuf_test_messages_proto2_TestAllTypesProto2_mutable_optional_nested_message( msg, arena); EXPECT_EQ(true, nested_message != nullptr); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a( nested_message, 5); // Read back using mini table API. const upb_Message* sub_message = - upb_Message_GetMessage(msg, optional_message_field, nullptr); + upb_Message_GetMessage(UPB_UPCAST(msg), optional_message_field, nullptr); EXPECT_EQ(true, sub_message != nullptr); const upb_MiniTableField* nested_message_a_field = @@ -281,29 +308,34 @@ TEST(GeneratedCode, SubMessage) { kFieldOptionalNestedMessageA); EXPECT_EQ(5, upb_Message_GetInt32(sub_message, nested_message_a_field, 0)); - upb_Message_ClearField(msg, optional_message_field); + upb_Message_ClearField(UPB_UPCAST(msg), optional_message_field); EXPECT_EQ( nullptr, protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message( msg)); - EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(false, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); - upb_Message* new_nested_message = - protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_new(arena); + upb_Message* new_nested_message = UPB_UPCAST( + protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_new( + arena)); upb_Message_SetInt32(new_nested_message, nested_message_a_field, 123, nullptr); upb_Message_SetMessage( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, optional_message_field, new_nested_message); upb_Message* mutable_message = upb_Message_GetOrCreateMutableMessage( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, optional_message_field, arena); EXPECT_EQ( true, protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message( msg) != nullptr); - EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field)); + EXPECT_EQ(true, + upb_Message_HasField(UPB_UPCAST(msg), optional_message_field)); EXPECT_EQ(123, upb_Message_GetInt32(mutable_message, nested_message_a_field, 0)); @@ -325,7 +357,8 @@ TEST(GeneratedCode, RepeatedScalar) { // Test Get/Set Array values, validate with C API. EXPECT_EQ(0, len); EXPECT_EQ(nullptr, arr); - EXPECT_EQ(nullptr, upb_Message_GetArray(msg, repeated_int32_field)); + EXPECT_EQ(nullptr, + upb_Message_GetArray(UPB_UPCAST(msg), repeated_int32_field)); protobuf_test_messages_proto2_TestAllTypesProto2_resize_repeated_int32( msg, 10, arena); int32_t* mutable_values = @@ -333,13 +366,13 @@ TEST(GeneratedCode, RepeatedScalar) { msg, &len); mutable_values[5] = 123; const upb_Array* readonly_arr = - upb_Message_GetArray(msg, repeated_int32_field); + upb_Message_GetArray(UPB_UPCAST(msg), repeated_int32_field); EXPECT_EQ(123, upb_Array_Get(readonly_arr, 5).int32_val); upb_MessageValue new_value; new_value.int32_val = 567; upb_Array* mutable_array = - upb_Message_GetMutableArray(msg, repeated_int32_field); + upb_Message_GetMutableArray(UPB_UPCAST(msg), repeated_int32_field); upb_Array_Set(mutable_array, 5, new_value); EXPECT_EQ(new_value.int32_val, protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32( @@ -370,10 +403,12 @@ TEST(GeneratedCode, GetMutableMessage) { const upb_MiniTableField* optional_message_field = find_proto2_field(kFieldOptionalNestedMessage); upb_Message* msg1 = upb_Message_GetOrCreateMutableMessage( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, optional_message_field, arena); upb_Message* msg2 = upb_Message_GetOrCreateMutableMessage( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, optional_message_field, arena); // Verify that newly constructed sub message is stored in msg. EXPECT_EQ(msg1, msg2); diff --git a/upb/message/copy_test.cc b/upb/message/copy_test.cc index 3a40bc3b11..727b352e00 100644 --- a/upb/message/copy_test.cc +++ b/upb/message/copy_test.cc @@ -23,6 +23,7 @@ #include "google/protobuf/test_messages_proto2.upb.h" #include "google/protobuf/test_messages_proto2.upb_minitable.h" #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/mem/arena.h" #include "upb/message/accessors.h" #include "upb/message/internal/message.h" @@ -61,31 +62,34 @@ TEST(GeneratedCode, DeepCloneMessageScalarAndString) { find_proto2_field(kFieldOptionalInt32); const upb_MiniTableField* optional_string_field = find_proto2_field(kFieldOptionalString); - upb_Message_SetInt32(msg, optional_int32_field, kTestInt32, nullptr); + upb_Message_SetInt32(UPB_UPCAST(msg), optional_int32_field, kTestInt32, + nullptr); char* string_in_arena = (char*)upb_Arena_Malloc(source_arena, sizeof(kTestStr1)); memcpy(string_in_arena, kTestStr1, sizeof(kTestStr1)); upb_Message_SetString( - msg, optional_string_field, + UPB_UPCAST(msg), optional_string_field, upb_StringView_FromDataAndSize(string_in_arena, sizeof(kTestStr1) - 1), source_arena); upb_Arena* arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, arena); // After cloning overwrite values and destroy source arena for MSAN. memset(string_in_arena, 0, sizeof(kTestStr1)); upb_Arena_Free(source_arena); - EXPECT_TRUE(upb_Message_HasField(clone, optional_int32_field)); - EXPECT_EQ(upb_Message_GetInt32(clone, optional_int32_field, 0), kTestInt32); - EXPECT_TRUE(upb_Message_HasField(clone, optional_string_field)); - EXPECT_EQ(upb_Message_GetString(clone, optional_string_field, + EXPECT_TRUE(upb_Message_HasField(UPB_UPCAST(clone), optional_int32_field)); + EXPECT_EQ(upb_Message_GetInt32(UPB_UPCAST(clone), optional_int32_field, 0), + kTestInt32); + EXPECT_TRUE(upb_Message_HasField(UPB_UPCAST(clone), optional_string_field)); + EXPECT_EQ(upb_Message_GetString(UPB_UPCAST(clone), optional_string_field, upb_StringView_FromDataAndSize(nullptr, 0)) .size, sizeof(kTestStr1) - 1); EXPECT_TRUE(upb_StringView_IsEqual( - upb_Message_GetString(clone, optional_string_field, + upb_Message_GetString(UPB_UPCAST(clone), optional_string_field, upb_StringView_FromDataAndSize(nullptr, 0)), upb_StringView_FromString(kTestStr1))); upb_Arena_Free(arena); @@ -103,22 +107,25 @@ TEST(GeneratedCode, DeepCloneMessageSubMessage) { protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a( nested, kTestNestedInt32); upb_Message_SetMessage( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, - nested_message_field, nested); + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + nested_message_field, UPB_UPCAST(nested)); upb_Arena* arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, arena); // After cloning overwrite values and destroy source arena for MSAN. protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(nested, 0); upb_Arena_Free(source_arena); - EXPECT_TRUE(upb_Message_HasField(clone, nested_message_field)); + EXPECT_TRUE(upb_Message_HasField(UPB_UPCAST(clone), nested_message_field)); protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage* cloned_nested = (protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage*) - upb_Message_GetMessage(clone, nested_message_field, nullptr); + upb_Message_GetMessage(UPB_UPCAST(clone), nested_message_field, + nullptr); EXPECT_EQ(protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_a( cloned_nested), kTestNestedInt32); @@ -138,7 +145,8 @@ TEST(GeneratedCode, DeepCloneMessageArrayField) { upb_Arena* arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, arena); protobuf_test_messages_proto2_TestAllTypesProto2_clear_repeated_sint32(msg); upb_Arena_Free(source_arena); @@ -177,7 +185,8 @@ TEST(GeneratedCode, DeepCloneMessageMapField) { upb_Arena* arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, arena); protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(nested, 0); @@ -253,7 +262,7 @@ TEST(GeneratedCode, DeepCloneMessageExtensions) { protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect* clone = (protobuf_test_messages_proto2_TestAllTypesProto2_MessageSetCorrect*) upb_Message_DeepClone( - msg, + UPB_UPCAST(msg), &protobuf_0test_0messages__proto2__TestAllTypesProto2__MessageSetCorrect_msg_init, arena); @@ -298,18 +307,20 @@ TEST(GeneratedCode, DeepCloneMessageWithUnknowns) { char* data; upb_Arena* encode_arena = upb_Arena_New(); upb_EncodeStatus status = upb_Encode( - unknown_source, + UPB_UPCAST(unknown_source), &protobuf_0test_0messages__proto2__UnknownToTestAllTypes_msg_init, kUpb_EncodeOption_CheckRequired, encode_arena, &data, &len); ASSERT_EQ(status, kUpb_EncodeStatus_Ok); std::string unknown_data(data, len); // Add unknown data. - UPB_PRIVATE(_upb_Message_AddUnknown)(msg, data, len, source_arena); + UPB_PRIVATE(_upb_Message_AddUnknown) + (UPB_UPCAST(msg), data, len, source_arena); // Create clone. upb_Arena* clone_arena = upb_Arena_New(); protobuf_test_messages_proto2_TestAllTypesProto2* clone = (protobuf_test_messages_proto2_TestAllTypesProto2*)upb_Message_DeepClone( - msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, + UPB_UPCAST(msg), + &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init, clone_arena); upb_Arena_Free(source_arena); upb_Arena_Free(unknown_arena); @@ -317,7 +328,7 @@ TEST(GeneratedCode, DeepCloneMessageWithUnknowns) { // Read unknown data from clone and verify. size_t cloned_length; const char* cloned_unknown_data = - upb_Message_GetUnknown(clone, &cloned_length); + upb_Message_GetUnknown(UPB_UPCAST(clone), &cloned_length); EXPECT_EQ(cloned_length, len); EXPECT_EQ(memcmp(cloned_unknown_data, unknown_data.c_str(), cloned_length), 0); diff --git a/upb/message/promote_test.cc b/upb/message/promote_test.cc index fa9bb90090..59593652e1 100644 --- a/upb/message/promote_test.cc +++ b/upb/message/promote_test.cc @@ -23,6 +23,7 @@ #include "upb/base/descriptor_constants.h" #include "upb/base/status.h" #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/mem/arena.h" #include "upb/mem/arena.hpp" #include "upb/message/accessors.h" @@ -69,13 +70,13 @@ TEST(GeneratedCode, FindUnknown) { arena); upb_FindUnknownRet result = upb_Message_FindUnknown( - base_msg, + UPB_UPCAST(base_msg), upb_MiniTableExtension_Number(&upb_test_ModelExtension1_model_ext_ext), 0); EXPECT_EQ(kUpb_FindUnknown_Ok, result.status); result = upb_Message_FindUnknown( - base_msg, + UPB_UPCAST(base_msg), upb_MiniTableExtension_Number(&upb_test_ModelExtension2_model_ext_ext), 0); EXPECT_EQ(kUpb_FindUnknown_NotPresent, result.status); @@ -129,7 +130,8 @@ TEST(GeneratedCode, Extensions) { // Test known GetExtension 1 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension1_model_ext_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension1_model_ext_ext, 0, arena, + &upb_ext2); ext1 = (upb_test_ModelExtension1*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_TRUE(upb_StringView_IsEqual(upb_StringView_FromString("World"), @@ -137,35 +139,40 @@ TEST(GeneratedCode, Extensions) { // Test known GetExtension 2 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension2_model_ext_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension2_model_ext_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(5, upb_test_ModelExtension2_i(ext2)); // Test known GetExtension 3 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension2_model_ext_2_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension2_model_ext_2_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(6, upb_test_ModelExtension2_i(ext2)); // Test known GetExtension 4 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension2_model_ext_3_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension2_model_ext_3_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(7, upb_test_ModelExtension2_i(ext2)); // Test known GetExtension 5 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension2_model_ext_4_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension2_model_ext_4_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(8, upb_test_ModelExtension2_i(ext2)); // Test known GetExtension 6 promote_status = upb_MiniTable_GetOrPromoteExtension( - msg, &upb_test_ModelExtension2_model_ext_5_ext, 0, arena, &upb_ext2); + UPB_UPCAST(msg), &upb_test_ModelExtension2_model_ext_5_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(9, upb_test_ModelExtension2_i(ext2)); @@ -176,13 +183,14 @@ TEST(GeneratedCode, Extensions) { // Get unknown extension bytes before promotion. size_t start_len; - upb_Message_GetUnknown(base_msg, &start_len); + upb_Message_GetUnknown(UPB_UPCAST(base_msg), &start_len); EXPECT_GT(start_len, 0); - EXPECT_EQ(0, upb_Message_ExtensionCount(base_msg)); + EXPECT_EQ(0, upb_Message_ExtensionCount(UPB_UPCAST(base_msg))); // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension1_model_ext_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension1_model_ext_ext, 0, arena, + &upb_ext2); ext1 = (upb_test_ModelExtension1*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_TRUE(upb_StringView_IsEqual(upb_StringView_FromString("World"), @@ -190,43 +198,48 @@ TEST(GeneratedCode, Extensions) { // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension2_model_ext_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension2_model_ext_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(5, upb_test_ModelExtension2_i(ext2)); // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension2_model_ext_2_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension2_model_ext_2_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(6, upb_test_ModelExtension2_i(ext2)); // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension2_model_ext_3_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension2_model_ext_3_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(7, upb_test_ModelExtension2_i(ext2)); // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension2_model_ext_4_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension2_model_ext_4_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(8, upb_test_ModelExtension2_i(ext2)); // Test unknown GetExtension. promote_status = upb_MiniTable_GetOrPromoteExtension( - base_msg, &upb_test_ModelExtension2_model_ext_5_ext, 0, arena, &upb_ext2); + UPB_UPCAST(base_msg), &upb_test_ModelExtension2_model_ext_5_ext, 0, arena, + &upb_ext2); ext2 = (upb_test_ModelExtension2*)upb_ext2->data.ptr; EXPECT_EQ(kUpb_GetExtension_Ok, promote_status); EXPECT_EQ(9, upb_test_ModelExtension2_i(ext2)); size_t end_len; - upb_Message_GetUnknown(base_msg, &end_len); + upb_Message_GetUnknown(UPB_UPCAST(base_msg), &end_len); EXPECT_LT(end_len, start_len); - EXPECT_EQ(6, upb_Message_ExtensionCount(base_msg)); + EXPECT_EQ(6, upb_Message_ExtensionCount(UPB_UPCAST(base_msg))); upb_Arena_Free(arena); } @@ -377,7 +390,8 @@ TEST(GeneratedCode, PromoteUnknownMessage) { arena.ptr(), (upb_Message**)&promoted); EXPECT_EQ(promote_result, kUpb_DecodeStatus_Ok); EXPECT_NE(nullptr, promoted); - EXPECT_EQ(promoted, upb_Message_GetMessage(msg, submsg_field, nullptr)); + EXPECT_EQ(UPB_UPCAST(promoted), + upb_Message_GetMessage(msg, submsg_field, nullptr)); EXPECT_EQ(upb_test_ModelWithExtensions_random_int32(promoted), 12); } @@ -425,7 +439,8 @@ TEST(GeneratedCode, ReparseUnlinked) { arena.ptr(), (upb_Message**)&promoted); EXPECT_EQ(promote_result, kUpb_DecodeStatus_Ok); EXPECT_NE(nullptr, promoted); - EXPECT_EQ(promoted, upb_Message_GetMessage(msg, submsg_field, nullptr)); + EXPECT_EQ(UPB_UPCAST(promoted), + upb_Message_GetMessage(msg, submsg_field, nullptr)); // The repeated field should have two entries for the two parses. size_t repeated_size; @@ -478,7 +493,8 @@ TEST(GeneratedCode, PromoteInParser) { nullptr); EXPECT_NE(nullptr, promoted); - EXPECT_EQ(promoted, upb_Message_GetMessage(msg, submsg_field, nullptr)); + EXPECT_EQ(UPB_UPCAST(promoted), + upb_Message_GetMessage(msg, submsg_field, nullptr)); // The repeated field should have two entries for the two parses. size_t repeated_size; @@ -624,15 +640,15 @@ TEST(GeneratedCode, PromoteUnknownToMap) { upb_MessageValue val; key.int32_val = 111; EXPECT_TRUE(upb_Map_Get(map, key, &val)); - EXPECT_EQ(123, - upb_test_ModelWithExtensions_random_int32( - static_cast(val.msg_val))); + EXPECT_EQ(123, upb_test_ModelWithExtensions_random_int32( + static_cast( + (void*)(val.msg_val)))); key.int32_val = 222; EXPECT_TRUE(upb_Map_Get(map, key, &val)); - EXPECT_EQ(456, - upb_test_ModelWithExtensions_random_int32( - static_cast(val.msg_val))); + EXPECT_EQ(456, upb_test_ModelWithExtensions_random_int32( + static_cast( + (void*)(val.msg_val)))); } } // namespace diff --git a/upb/message/test.cc b/upb/message/test.cc index 97ebef0414..2bb46bdaab 100644 --- a/upb/message/test.cc +++ b/upb/message/test.cc @@ -16,6 +16,7 @@ #include "google/protobuf/test_messages_proto3.upb.h" #include "upb/base/status.hpp" #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/json/encode.h" #include "upb/mem/arena.h" @@ -72,8 +73,9 @@ TEST(MessageTest, Extensions) { } )json"; upb::Status status; - EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), ext_msg, m.ptr(), - defpool.ptr(), 0, arena.ptr(), status.ptr())) + EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), UPB_UPCAST(ext_msg), + m.ptr(), defpool.ptr(), 0, arena.ptr(), + status.ptr())) << status.error_message(); VerifyMessage(ext_msg); @@ -91,14 +93,14 @@ TEST(MessageTest, Extensions) { VerifyMessage(ext_msg2); // Test round-trip through JSON format. - size_t json_size = upb_JsonEncode(ext_msg, m.ptr(), defpool.ptr(), 0, nullptr, - 0, status.ptr()); + size_t json_size = upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), + 0, nullptr, 0, status.ptr()); char* json_buf = static_cast(upb_Arena_Malloc(arena.ptr(), json_size + 1)); - upb_JsonEncode(ext_msg, m.ptr(), defpool.ptr(), 0, json_buf, json_size + 1, - status.ptr()); + upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), 0, json_buf, + json_size + 1, status.ptr()); upb_test_TestExtensions* ext_msg3 = upb_test_TestExtensions_new(arena.ptr()); - EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, ext_msg3, m.ptr(), + EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, UPB_UPCAST(ext_msg3), m.ptr(), defpool.ptr(), 0, arena.ptr(), status.ptr())) << status.error_message(); VerifyMessage(ext_msg3); @@ -132,8 +134,9 @@ TEST(MessageTest, MessageSet) { } )json"; upb::Status status; - EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), ext_msg, m.ptr(), - defpool.ptr(), 0, arena.ptr(), status.ptr())) + EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), UPB_UPCAST(ext_msg), + m.ptr(), defpool.ptr(), 0, arena.ptr(), + status.ptr())) << status.error_message(); VerifyMessageSet(ext_msg); @@ -151,14 +154,14 @@ TEST(MessageTest, MessageSet) { VerifyMessageSet(ext_msg2); // Test round-trip through JSON format. - size_t json_size = upb_JsonEncode(ext_msg, m.ptr(), defpool.ptr(), 0, nullptr, - 0, status.ptr()); + size_t json_size = upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), + 0, nullptr, 0, status.ptr()); char* json_buf = static_cast(upb_Arena_Malloc(arena.ptr(), json_size + 1)); - upb_JsonEncode(ext_msg, m.ptr(), defpool.ptr(), 0, json_buf, json_size + 1, - status.ptr()); + upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), 0, json_buf, + json_size + 1, status.ptr()); upb_test_TestMessageSet* ext_msg3 = upb_test_TestMessageSet_new(arena.ptr()); - EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, ext_msg3, m.ptr(), + EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, UPB_UPCAST(ext_msg3), m.ptr(), defpool.ptr(), 0, arena.ptr(), status.ptr())) << status.error_message(); VerifyMessageSet(ext_msg3); @@ -311,10 +314,10 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) { EXPECT_NE(nullptr, test_msg); // Fails, because required fields are missing. - EXPECT_EQ( - kUpb_DecodeStatus_MissingRequired, - upb_Decode(nullptr, 0, test_msg, &upb_0test__TestRequiredFields_msg_init, - nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr())); + EXPECT_EQ(kUpb_DecodeStatus_MissingRequired, + upb_Decode(nullptr, 0, UPB_UPCAST(test_msg), + &upb_0test__TestRequiredFields_msg_init, nullptr, + kUpb_DecodeOption_CheckRequired, arena.ptr())); upb_test_TestRequiredFields_set_required_int32(test_msg, 1); size_t size; @@ -326,7 +329,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) { // Fails, but the code path is slightly different because the serialized // payload is not empty. EXPECT_EQ(kUpb_DecodeStatus_MissingRequired, - upb_Decode(serialized, size, test_msg, + upb_Decode(serialized, size, UPB_UPCAST(test_msg), &upb_0test__TestRequiredFields_msg_init, nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr())); @@ -336,10 +339,10 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) { upb_test_TestRequiredFields_set_required_message(test_msg, empty_msg); // Succeeds, because required fields are present (though not in the input). - EXPECT_EQ( - kUpb_DecodeStatus_Ok, - upb_Decode(nullptr, 0, test_msg, &upb_0test__TestRequiredFields_msg_init, - nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr())); + EXPECT_EQ(kUpb_DecodeStatus_Ok, + upb_Decode(nullptr, 0, UPB_UPCAST(test_msg), + &upb_0test__TestRequiredFields_msg_init, nullptr, + kUpb_DecodeOption_CheckRequired, arena.ptr())); // Serialize a complete payload. serialized = @@ -356,7 +359,7 @@ TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) { upb_test_TestRequiredFields_set_optional_message( test_msg2, upb_test_TestRequiredFields_new(arena.ptr())); EXPECT_EQ(kUpb_DecodeStatus_Ok, - upb_Decode(serialized, size, test_msg2, + upb_Decode(serialized, size, UPB_UPCAST(test_msg2), &upb_0test__TestRequiredFields_msg_init, nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr())); } @@ -450,7 +453,7 @@ TEST(MessageTest, MaxRequiredFields) { for (int i = 1; i <= 61; i++) { upb::FieldDefPtr f = m.FindFieldByNumber(i); ASSERT_TRUE(f); - upb_Message_SetFieldByDef(test_msg, f.ptr(), val, arena.ptr()); + upb_Message_SetFieldByDef(UPB_UPCAST(test_msg), f.ptr(), val, arena.ptr()); } // Fails, field 63 still isn't set. @@ -461,7 +464,7 @@ TEST(MessageTest, MaxRequiredFields) { // Succeeds, all required fields are set. upb::FieldDefPtr f = m.FindFieldByNumber(62); ASSERT_TRUE(f); - upb_Message_SetFieldByDef(test_msg, f.ptr(), val, arena.ptr()); + upb_Message_SetFieldByDef(UPB_UPCAST(test_msg), f.ptr(), val, arena.ptr()); serialized = upb_test_TestMaxRequiredFields_serialize_ex( test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size); ASSERT_TRUE(serialized != nullptr); diff --git a/upb/message/types.h b/upb/message/types.h index 3059e682c1..d20cf27dfc 100644 --- a/upb/message/types.h +++ b/upb/message/types.h @@ -10,6 +10,8 @@ // This typedef is in a leaf header to resolve a circular dependency between // messages and mini tables. -typedef void upb_Message; +typedef struct upb_Message { + int unused; // Placeholder cuz Windows won't compile an empty struct. +} upb_Message; #endif /* UPB_MESSAGE_TYPES_H_ */ diff --git a/upb/message/utf8_test.cc b/upb/message/utf8_test.cc index e5764e68cf..b900a954b3 100644 --- a/upb/message/utf8_test.cc +++ b/upb/message/utf8_test.cc @@ -9,6 +9,7 @@ #include #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/mem/arena.h" #include "upb/mem/arena.hpp" #include "upb/message/utf8_test.upb.h" @@ -46,9 +47,9 @@ TEST(Utf8Test, Proto3FieldValidates) { upb_test_TestUtf8Proto3String* msg = upb_test_TestUtf8Proto3String_new(arena.ptr()); - upb_DecodeStatus status = - upb_Decode(data, size, msg, &upb_0test__TestUtf8Proto3String_msg_init, - nullptr, 0, arena.ptr()); + upb_DecodeStatus status = upb_Decode( + data, size, UPB_UPCAST(msg), &upb_0test__TestUtf8Proto3String_msg_init, + nullptr, 0, arena.ptr()); // Parse fails, because proto3 string fields validate UTF-8. ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status); @@ -62,9 +63,10 @@ TEST(Utf8Test, RepeatedProto3FieldValidates) { upb_test_TestUtf8RepeatedProto3String* msg = upb_test_TestUtf8RepeatedProto3String_new(arena.ptr()); - upb_DecodeStatus status = upb_Decode( - data, size, msg, &upb_0test__TestUtf8RepeatedProto3String_msg_init, - nullptr, 0, arena.ptr()); + upb_DecodeStatus status = + upb_Decode(data, size, UPB_UPCAST(msg), + &upb_0test__TestUtf8RepeatedProto3String_msg_init, nullptr, 0, + arena.ptr()); // Parse fails, because proto3 string fields validate UTF-8. ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status); @@ -80,8 +82,8 @@ TEST(Utf8Test, RepeatedProto3FieldValidates) { // upb_test_TestUtf8Proto3StringMixed_new(arena.ptr()); // // upb_DecodeStatus status = upb_Decode( -// data, size, msg, &upb_0test__TestUtf8Proto3StringMixed_msg_init, nullptr, -// 0, arena.ptr()); +// 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); diff --git a/upb/reflection/BUILD b/upb/reflection/BUILD index fdd20ee1f7..c3407c93d3 100644 --- a/upb/reflection/BUILD +++ b/upb/reflection/BUILD @@ -146,6 +146,7 @@ bootstrap_cc_library( "//upb:mini_descriptor_internal", "//upb:mini_table", "//upb:port", + "//upb:wire", ], ) @@ -178,6 +179,7 @@ cc_test( deps = [ ":descriptor_upb_proto", "@com_google_googletest//:gtest_main", + "//upb:base", "//upb:hash", "//upb:mem", "//upb:port", diff --git a/upb/reflection/field_def.c b/upb/reflection/field_def.c index d81da1c098..3b6089670d 100644 --- a/upb/reflection/field_def.c +++ b/upb/reflection/field_def.c @@ -16,6 +16,7 @@ #include "upb/base/descriptor_constants.h" #include "upb/base/string_view.h" +#include "upb/base/upcast.h" #include "upb/mem/arena.h" #include "upb/message/accessors.h" #include "upb/message/value.h" @@ -607,7 +608,8 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, bool implicit = false; if (syntax != kUpb_Syntax_Editions) { - upb_Message_Clear(ctx->legacy_features, UPB_DESC_MINITABLE(FeatureSet)); + upb_Message_Clear(UPB_UPCAST(ctx->legacy_features), + UPB_DESC_MINITABLE(FeatureSet)); if (_upb_FieldDef_InferLegacyFeatures(ctx, f, field_proto, f->opts, syntax, ctx->legacy_features)) { implicit = true; diff --git a/upb/reflection/internal/def_builder.c b/upb/reflection/internal/def_builder.c index 7558c9ebe9..dcd8ee2f1d 100644 --- a/upb/reflection/internal/def_builder.c +++ b/upb/reflection/internal/def_builder.c @@ -10,6 +10,7 @@ #include #include "upb/base/internal/log2.h" +#include "upb/base/upcast.h" #include "upb/mem/alloc.h" #include "upb/message/copy.h" #include "upb/reflection/def_pool.h" @@ -17,6 +18,7 @@ #include "upb/reflection/field_def.h" #include "upb/reflection/file_def.h" #include "upb/reflection/internal/strdup2.h" +#include "upb/wire/decode.h" // Must be last. #include "upb/port/def.inc" @@ -368,8 +370,8 @@ bool _upb_DefBuilder_GetOrCreateFeatureSet(upb_DefBuilder* ctx, return false; } - *set = - upb_Message_DeepClone(parent, UPB_DESC_MINITABLE(FeatureSet), ctx->arena); + *set = (UPB_DESC(FeatureSet*))upb_Message_DeepClone( + UPB_UPCAST(parent), UPB_DESC_MINITABLE(FeatureSet), ctx->arena); if (!*set) _upb_DefBuilder_OomErr(ctx); v = upb_value_ptr(*set); @@ -406,7 +408,7 @@ const UPB_DESC(FeatureSet*) } upb_DecodeStatus dec_status = - upb_Decode(child_bytes, child_size, resolved, + upb_Decode(child_bytes, child_size, UPB_UPCAST(resolved), UPB_DESC_MINITABLE(FeatureSet), NULL, 0, ctx->arena); if (dec_status != kUpb_DecodeStatus_Ok) _upb_DefBuilder_OomErr(ctx); diff --git a/upb/reflection/stage0/google/protobuf/descriptor.upb.h b/upb/reflection/stage0/google/protobuf/descriptor.upb.h index 99caf55dc0..e94e8d6ae2 100644 --- a/upb/reflection/stage0/google/protobuf/descriptor.upb.h +++ b/upb/reflection/stage0/google/protobuf/descriptor.upb.h @@ -67,38 +67,38 @@ extern const upb_MiniTableEnum* google_protobuf_FileOptions_OptimizeMode_enum_in extern const upb_MiniTableEnum* google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init(); extern const upb_MiniTableEnum* google_protobuf_MethodOptions_IdempotencyLevel_enum_init(); -typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet; -typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto; -typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto; -typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange; -typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange; -typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions; -typedef struct google_protobuf_ExtensionRangeOptions_Declaration google_protobuf_ExtensionRangeOptions_Declaration; -typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto; -typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto; -typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto; -typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange; -typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto; -typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto; -typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto; -typedef struct google_protobuf_FileOptions google_protobuf_FileOptions; -typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions; -typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions; -typedef struct google_protobuf_FieldOptions_EditionDefault google_protobuf_FieldOptions_EditionDefault; -typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions; -typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions; -typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions; -typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions; -typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions; -typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption; -typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart; -typedef struct google_protobuf_FeatureSet google_protobuf_FeatureSet; -typedef struct google_protobuf_FeatureSetDefaults google_protobuf_FeatureSetDefaults; -typedef struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault; -typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo; -typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location; -typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo; -typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation; +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; +typedef struct google_protobuf_DescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_DescriptorProto; +typedef struct google_protobuf_DescriptorProto_ExtensionRange { upb_Message UPB_PRIVATE(base); } google_protobuf_DescriptorProto_ExtensionRange; +typedef struct google_protobuf_DescriptorProto_ReservedRange { upb_Message UPB_PRIVATE(base); } google_protobuf_DescriptorProto_ReservedRange; +typedef struct google_protobuf_ExtensionRangeOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_ExtensionRangeOptions; +typedef struct google_protobuf_ExtensionRangeOptions_Declaration { upb_Message UPB_PRIVATE(base); } google_protobuf_ExtensionRangeOptions_Declaration; +typedef struct google_protobuf_FieldDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldDescriptorProto; +typedef struct google_protobuf_OneofDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_OneofDescriptorProto; +typedef struct google_protobuf_EnumDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumDescriptorProto; +typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumDescriptorProto_EnumReservedRange; +typedef struct google_protobuf_EnumValueDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumValueDescriptorProto; +typedef struct google_protobuf_ServiceDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_ServiceDescriptorProto; +typedef struct google_protobuf_MethodDescriptorProto { upb_Message UPB_PRIVATE(base); } google_protobuf_MethodDescriptorProto; +typedef struct google_protobuf_FileOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_FileOptions; +typedef struct google_protobuf_MessageOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_MessageOptions; +typedef struct google_protobuf_FieldOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions; +typedef struct google_protobuf_FieldOptions_EditionDefault { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions_EditionDefault; +typedef struct google_protobuf_OneofOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_OneofOptions; +typedef struct google_protobuf_EnumOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumOptions; +typedef struct google_protobuf_EnumValueOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumValueOptions; +typedef struct google_protobuf_ServiceOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_ServiceOptions; +typedef struct google_protobuf_MethodOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_MethodOptions; +typedef struct google_protobuf_UninterpretedOption { upb_Message UPB_PRIVATE(base); } google_protobuf_UninterpretedOption; +typedef struct google_protobuf_UninterpretedOption_NamePart { upb_Message UPB_PRIVATE(base); } google_protobuf_UninterpretedOption_NamePart; +typedef struct google_protobuf_FeatureSet { upb_Message UPB_PRIVATE(base); } google_protobuf_FeatureSet; +typedef struct google_protobuf_FeatureSetDefaults { upb_Message UPB_PRIVATE(base); } google_protobuf_FeatureSetDefaults; +typedef struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault { upb_Message UPB_PRIVATE(base); } google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault; +typedef struct google_protobuf_SourceCodeInfo { upb_Message UPB_PRIVATE(base); } google_protobuf_SourceCodeInfo; +typedef struct google_protobuf_SourceCodeInfo_Location { upb_Message UPB_PRIVATE(base); } google_protobuf_SourceCodeInfo_Location; +typedef struct google_protobuf_GeneratedCodeInfo { upb_Message UPB_PRIVATE(base); } google_protobuf_GeneratedCodeInfo; +typedef struct google_protobuf_GeneratedCodeInfo_Annotation { upb_Message UPB_PRIVATE(base); } google_protobuf_GeneratedCodeInfo_Annotation; typedef enum { google_protobuf_EDITION_UNKNOWN = 0, @@ -241,7 +241,8 @@ UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_ UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorSet_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileDescriptorSet_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -251,30 +252,30 @@ UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_ int options, upb_Arena* arena) { google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorSet_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileDescriptorSet_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileDescriptorSet_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileDescriptorSet_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileDescriptorSet_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileDescriptorSet_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(google_protobuf_FileDescriptorSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr); @@ -285,16 +286,16 @@ UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorSet_file_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(const google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array(google_protobuf_FileDescriptorSet* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -303,7 +304,7 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorSet_file_mutable_upb_array( UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr); @@ -314,11 +315,13 @@ UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorS } UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorSet_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -338,7 +341,8 @@ UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorPr UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -348,60 +352,62 @@ UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorPr int options, upb_Arena* arena) { google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView const*)_upb_array_constptr(arr); @@ -412,16 +418,16 @@ UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency( } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -429,11 +435,11 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_dependency_mutable_up } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr); @@ -444,16 +450,16 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDes } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_message_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -461,11 +467,11 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_message_type_mutable_ } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr); @@ -476,16 +482,16 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_enum_type_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -493,11 +499,11 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_enum_type_mutable_upb } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_constptr(arr); @@ -508,16 +514,16 @@ UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_ } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_service_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -525,11 +531,11 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_service_mutable_upb_a } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr); @@ -540,16 +546,16 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_Fi } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_extension_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -557,41 +563,43 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_extension_mutable_upb } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) { const google_protobuf_FileOptions* default_val = NULL; const google_protobuf_FileOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) { const google_protobuf_SourceCodeInfo* default_val = NULL; const google_protobuf_SourceCodeInfo* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -602,16 +610,16 @@ UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency( } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -619,11 +627,11 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_public_dependency_mut } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -634,16 +642,16 @@ UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(co } UPB_INLINE const upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(const google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutable_upb_array(google_protobuf_FileDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -651,46 +659,48 @@ UPB_INLINE upb_Array* _google_protobuf_FileDescriptorProto_weak_dependency_mutab } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_clear_edition(google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FileDescriptorProto_edition(const google_protobuf_FileDescriptorProto* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_protobuf_FileDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView*)_upb_array_ptr(arr); @@ -701,11 +711,13 @@ UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependenc } UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 3); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -716,7 +728,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protob } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr); @@ -727,11 +739,13 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -744,7 +758,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescripto } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr); @@ -755,11 +769,13 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorP } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -772,7 +788,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescr } UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_ServiceDescriptorProto**)_upb_array_ptr(arr); @@ -783,11 +799,13 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescript } UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_ServiceDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 6); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -800,7 +818,7 @@ UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDe } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr); @@ -811,11 +829,13 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptor } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 7); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -828,7 +848,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDesc } UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 8); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg); @@ -840,7 +860,7 @@ UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorPro } UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 9); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg); @@ -852,7 +872,7 @@ UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptor } UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -863,11 +883,13 @@ UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependenc } UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 10); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -878,7 +900,7 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google } UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -889,11 +911,13 @@ UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency( } UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 11); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -904,11 +928,11 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_p } UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 12); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileDescriptorProto_msg_init(), 14); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.DescriptorProto */ @@ -919,7 +943,8 @@ UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new( UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -929,45 +954,46 @@ UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_pars int options, upb_Arena* arena) { google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_DescriptorProto_clear_name(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_clear_field(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr); @@ -978,16 +1004,16 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_field_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -995,11 +1021,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_field_mutable_upb_array(c } UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_DescriptorProto* const*)_upb_array_constptr(arr); @@ -1010,16 +1036,16 @@ UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_Descrip } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_nested_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1027,11 +1053,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_nested_type_mutable_upb_a } UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_constptr(arr); @@ -1042,16 +1068,16 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_Des } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_enum_type_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1059,11 +1085,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_enum_type_mutable_upb_arr } UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_constptr(arr); @@ -1074,16 +1100,16 @@ UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_p } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1091,11 +1117,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_range_mutable_u } UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_constptr(arr); @@ -1106,16 +1132,16 @@ UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_extension_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1123,26 +1149,27 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_extension_mutable_upb_arr } UPB_INLINE void google_protobuf_DescriptorProto_clear_options(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) { const google_protobuf_MessageOptions* default_val = NULL; const google_protobuf_MessageOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_constptr(arr); @@ -1153,16 +1180,16 @@ UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_De } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_oneof_decl_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1170,11 +1197,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_oneof_decl_mutable_upb_ar } UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_constptr(arr); @@ -1185,16 +1212,16 @@ UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_pr } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_range_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1202,11 +1229,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_range_mutable_up } UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(google_protobuf_DescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView const*)_upb_array_constptr(arr); @@ -1217,16 +1244,16 @@ UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(c } UPB_INLINE const upb_Array* _google_protobuf_DescriptorProto_reserved_name_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb_array(google_protobuf_DescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1235,11 +1262,11 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr); @@ -1250,11 +1277,13 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1267,7 +1296,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_DescriptorProto**)_upb_array_ptr(arr); @@ -1278,11 +1307,13 @@ UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mut } UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_DescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 3); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1295,7 +1326,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_EnumDescriptorProto**)_upb_array_ptr(arr); @@ -1306,11 +1337,13 @@ UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto } UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_EnumDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1323,7 +1356,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_Descripto } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_ptr(arr); @@ -1334,11 +1367,13 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_Desc } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_DescriptorProto_ExtensionRange**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1351,7 +1386,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobu } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FieldDescriptorProto**)_upb_array_ptr(arr); @@ -1362,11 +1397,13 @@ UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FieldDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 6); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1379,7 +1416,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 7); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg); @@ -1391,7 +1428,7 @@ UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_OneofDescriptorProto**)_upb_array_ptr(arr); @@ -1402,11 +1439,13 @@ UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProt } UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_OneofDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 8); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1419,7 +1458,7 @@ UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_Descript } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_ptr(arr); @@ -1430,11 +1469,13 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_Descr } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_DescriptorProto_ReservedRange**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 9); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1447,7 +1488,7 @@ UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf } UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView*)_upb_array_ptr(arr); @@ -1458,11 +1499,13 @@ UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name } UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto_msg_init(), 10); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -1480,7 +1523,8 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_Descr UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto__ExtensionRange_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -1490,80 +1534,83 @@ UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_Descr int options, upb_Arena* arena) { google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto__ExtensionRange_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto__ExtensionRange_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto__ExtensionRange_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) { const google_protobuf_ExtensionRangeOptions* default_val = NULL; const google_protobuf_ExtensionRangeOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ExtensionRange_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) { struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg); @@ -1582,7 +1629,8 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_Descri UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto__ReservedRange_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -1592,61 +1640,63 @@ UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_Descri int options, upb_Arena* arena) { google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__DescriptorProto__ReservedRange_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__DescriptorProto__ReservedRange_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto__ReservedRange_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto__ReservedRange_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__DescriptorProto__ReservedRange_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__DescriptorProto__ReservedRange_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(google_protobuf_DescriptorProto_ReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(google_protobuf_DescriptorProto_ReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__DescriptorProto__ReservedRange_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.ExtensionRangeOptions */ @@ -1657,7 +1707,8 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRange UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ExtensionRangeOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -1667,30 +1718,30 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRange int options, upb_Arena* arena) { google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ExtensionRangeOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ExtensionRangeOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ExtensionRangeOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_declaration(google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* google_protobuf_ExtensionRangeOptions_declaration(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_ExtensionRangeOptions_Declaration* const*)_upb_array_constptr(arr); @@ -1701,16 +1752,16 @@ UPB_INLINE const google_protobuf_ExtensionRangeOptions_Declaration* const* googl } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1718,41 +1769,43 @@ UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_declaration_mutable } UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_verification(google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_verification(const google_protobuf_ExtensionRangeOptions* msg) { int32_t default_val = 1; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_verification(const google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_features(google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_features(const google_protobuf_ExtensionRangeOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_features(const google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -1763,16 +1816,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ext } UPB_INLINE const upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ExtensionRangeOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -1781,7 +1834,7 @@ UPB_INLINE upb_Array* _google_protobuf_ExtensionRangeOptions_uninterpreted_optio UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_mutable_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_ExtensionRangeOptions_Declaration**)_upb_array_ptr(arr); @@ -1792,11 +1845,13 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_E } UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration** google_protobuf_ExtensionRangeOptions_resize_declaration(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_ExtensionRangeOptions_Declaration**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_add_declaration(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1809,11 +1864,11 @@ UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_prot } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 50); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg); @@ -1825,7 +1880,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOpti } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -1836,11 +1891,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeO } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -1860,7 +1917,8 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_Ex UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_ExtensionRangeOptions_Declaration_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -1870,118 +1928,123 @@ UPB_INLINE google_protobuf_ExtensionRangeOptions_Declaration* google_protobuf_Ex int options, upb_Arena* arena) { google_protobuf_ExtensionRangeOptions_Declaration* ret = google_protobuf_ExtensionRangeOptions_Declaration_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize(const google_protobuf_ExtensionRangeOptions_Declaration* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_ExtensionRangeOptions_Declaration_serialize_ex(const google_protobuf_ExtensionRangeOptions_Declaration* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_number(google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_ExtensionRangeOptions_Declaration_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_number(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_full_name(google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_full_name(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_type(google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_ExtensionRangeOptions_Declaration_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_type(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_reserved(google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_reserved(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_clear_repeated(google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(const google_protobuf_ExtensionRangeOptions_Declaration* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ExtensionRangeOptions__Declaration_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.FieldDescriptorProto */ @@ -1992,7 +2055,8 @@ UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptor UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2002,220 +2066,231 @@ UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptor int options, upb_Arena* arena) { google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) { int32_t default_val = 1; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) { int32_t default_val = 1; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) { const google_protobuf_FieldOptions* default_val = NULL; const google_protobuf_FieldOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 7); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 8); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg); @@ -2227,15 +2302,15 @@ UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorP } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 9); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 10); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldDescriptorProto_msg_init(), 17); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofDescriptorProto */ @@ -2246,7 +2321,8 @@ UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptor UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__OneofDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__OneofDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2256,61 +2332,63 @@ UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptor int options, upb_Arena* arena) { google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__OneofDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__OneofDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__OneofDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__OneofDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__OneofDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__OneofDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(google_protobuf_OneofDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(google_protobuf_OneofDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) { const google_protobuf_OneofOptions* default_val = NULL; const google_protobuf_OneofOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofDescriptorProto_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg); @@ -2329,7 +2407,8 @@ UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorPr UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2339,45 +2418,46 @@ UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorPr int options, upb_Arena* arena) { google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_constptr(arr); @@ -2388,16 +2468,16 @@ UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobu } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_value_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -2405,26 +2485,27 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_value_mutable_upb_arr } UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) { const google_protobuf_EnumOptions* default_val = NULL; const google_protobuf_EnumOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_constptr(arr); @@ -2435,16 +2516,16 @@ UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* g } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -2452,11 +2533,11 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_range_mutabl } UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(google_protobuf_EnumDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView const*)_upb_array_constptr(arr); @@ -2467,16 +2548,16 @@ UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_na } UPB_INLINE const upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(const google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable_upb_array(google_protobuf_EnumDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -2485,11 +2566,11 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_EnumValueDescriptorProto**)_upb_array_ptr(arr); @@ -2500,11 +2581,13 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescri } UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_EnumValueDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -2517,7 +2600,7 @@ UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_Enum } UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg); @@ -2529,7 +2612,7 @@ UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorPro } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_ptr(arr); @@ -2540,11 +2623,13 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protob } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 4); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -2557,7 +2642,7 @@ UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_ } UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView*)_upb_array_ptr(arr); @@ -2568,11 +2653,13 @@ UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_ } UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto_msg_init(), 5); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -2590,7 +2677,8 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobu UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2600,61 +2688,63 @@ UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobu int options, upb_Arena* arena) { google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.EnumValueDescriptorProto */ @@ -2665,7 +2755,8 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDe UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumValueDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumValueDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2675,80 +2766,83 @@ UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDe int options, upb_Arena* arena) { google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumValueDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumValueDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumValueDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumValueDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumValueDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumValueDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) { const google_protobuf_EnumValueOptions* default_val = NULL; const google_protobuf_EnumValueOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueDescriptorProto_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg); @@ -2767,7 +2861,8 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescri UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ServiceDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ServiceDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2777,45 +2872,46 @@ UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescri int options, upb_Arena* arena) { google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ServiceDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ServiceDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ServiceDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ServiceDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ServiceDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ServiceDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(google_protobuf_ServiceDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(google_protobuf_ServiceDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_constptr(arr); @@ -2826,16 +2922,16 @@ UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_S } UPB_INLINE const upb_Array* _google_protobuf_ServiceDescriptorProto_method_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(const google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb_array(google_protobuf_ServiceDescriptorProto* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -2843,27 +2939,28 @@ UPB_INLINE upb_Array* _google_protobuf_ServiceDescriptorProto_method_mutable_upb } UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(google_protobuf_ServiceDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) { const google_protobuf_ServiceOptions* default_val = NULL; const google_protobuf_ServiceOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_MethodDescriptorProto**)_upb_array_ptr(arr); @@ -2874,11 +2971,13 @@ UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescri } UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_MethodDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -2891,7 +2990,7 @@ UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_Service } UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceDescriptorProto_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg); @@ -2910,7 +3009,8 @@ UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescript UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MethodDescriptorProto_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MethodDescriptorProto_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -2920,129 +3020,135 @@ UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescript int options, upb_Arena* arena) { google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MethodDescriptorProto_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MethodDescriptorProto_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MethodDescriptorProto_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MethodDescriptorProto_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MethodDescriptorProto_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MethodDescriptorProto_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) { const google_protobuf_MethodOptions* default_val = NULL; const google_protobuf_MethodOptions* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg); @@ -3054,11 +3160,11 @@ UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescripto } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodDescriptorProto_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.FileOptions */ @@ -3069,7 +3175,8 @@ UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Aren UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -3079,330 +3186,366 @@ UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(con int options, upb_Arena* arena) { google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FileOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FileOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FileOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FileOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FileOptions_clear_java_package(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) { int32_t default_val = 1; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_go_package(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) { bool default_val = true; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(google_protobuf_FileOptions* msg) { + const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) { + const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_features(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FileOptions_features(const google_protobuf_FileOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FileOptions_has_features(const google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(google_protobuf_FileOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -3413,16 +3556,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fil } UPB_INLINE const upb_Array* _google_protobuf_FileOptions_uninterpreted_option_upb_array(const google_protobuf_FileOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FileOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -3431,83 +3574,87 @@ UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 8); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 9); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 10); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 11); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 16); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 17); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 18); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 20); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 23); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 27); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 31); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 36); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 37); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 39); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 40); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 41); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) { + const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 42); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 44); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 45); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 50); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg); @@ -3519,7 +3666,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -3530,11 +3677,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FileOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -3554,7 +3703,8 @@ UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(up UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MessageOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MessageOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -3564,120 +3714,126 @@ UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ int options, upb_Arena* arena) { google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MessageOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MessageOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MessageOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MessageOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MessageOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MessageOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MessageOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_features(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MessageOptions_features(const google_protobuf_MessageOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MessageOptions_has_features(const google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(google_protobuf_MessageOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -3688,16 +3844,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Mes } UPB_INLINE const upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_upb_array(const google_protobuf_MessageOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MessageOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -3706,27 +3862,27 @@ UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 7); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 11); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 12); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg); @@ -3738,7 +3894,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -3749,11 +3905,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_ } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MessageOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -3773,7 +3931,8 @@ UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Ar UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -3783,165 +3942,174 @@ UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(c int options, upb_Arena* arena) { google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_debug_redact(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_FieldOptions_debug_redact(const google_protobuf_FieldOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -3952,16 +4120,16 @@ UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_prot } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -3969,11 +4137,11 @@ UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(co } UPB_INLINE void google_protobuf_FieldOptions_clear_edition_defaults(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_protobuf_FieldOptions_edition_defaults(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FieldOptions_EditionDefault* const*)_upb_array_constptr(arr); @@ -3984,16 +4152,16 @@ UPB_INLINE const google_protobuf_FieldOptions_EditionDefault* const* google_prot } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_edition_defaults_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4001,26 +4169,27 @@ UPB_INLINE upb_Array* _google_protobuf_FieldOptions_edition_defaults_mutable_upb } UPB_INLINE void google_protobuf_FieldOptions_clear_features(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FieldOptions_features(const google_protobuf_FieldOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4031,16 +4200,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fie } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4049,43 +4218,43 @@ UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 10); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 15); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 16); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 17); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -4096,11 +4265,13 @@ UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf } UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 19); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -4111,7 +4282,7 @@ UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOp } UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_mutable_edition_defaults(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FieldOptions_EditionDefault**)_upb_array_ptr(arr); @@ -4122,11 +4293,13 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOp } UPB_INLINE google_protobuf_FieldOptions_EditionDefault** google_protobuf_FieldOptions_resize_edition_defaults(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FieldOptions_EditionDefault**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_add_edition_defaults(google_protobuf_FieldOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 20); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4139,7 +4312,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_F } UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 21); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg); @@ -4151,7 +4324,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -4162,11 +4335,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mu } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4186,7 +4361,8 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOpt UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOptions_EditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions__EditionDefault_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldOptions__EditionDefault_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4196,61 +4372,63 @@ UPB_INLINE google_protobuf_FieldOptions_EditionDefault* google_protobuf_FieldOpt int options, upb_Arena* arena) { google_protobuf_FieldOptions_EditionDefault* ret = google_protobuf_FieldOptions_EditionDefault_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FieldOptions__EditionDefault_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FieldOptions__EditionDefault_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize(const google_protobuf_FieldOptions_EditionDefault* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldOptions__EditionDefault_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldOptions__EditionDefault_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FieldOptions_EditionDefault_serialize_ex(const google_protobuf_FieldOptions_EditionDefault* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FieldOptions__EditionDefault_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FieldOptions__EditionDefault_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_value(google_protobuf_FieldOptions_EditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_FieldOptions_EditionDefault_value(const google_protobuf_FieldOptions_EditionDefault* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_value(const google_protobuf_FieldOptions_EditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_clear_edition(google_protobuf_FieldOptions_EditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_EditionDefault_edition(const google_protobuf_FieldOptions_EditionDefault* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const google_protobuf_FieldOptions_EditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FieldOptions__EditionDefault_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofOptions */ @@ -4261,7 +4439,8 @@ UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Ar UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__OneofOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__OneofOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4271,45 +4450,46 @@ UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(c int options, upb_Arena* arena) { google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__OneofOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__OneofOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__OneofOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__OneofOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__OneofOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__OneofOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_OneofOptions_clear_features(google_protobuf_OneofOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_OneofOptions_features(const google_protobuf_OneofOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_OneofOptions_has_features(const google_protobuf_OneofOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(google_protobuf_OneofOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4320,16 +4500,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_One } UPB_INLINE const upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_upb_array(const google_protobuf_OneofOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable_upb_array(google_protobuf_OneofOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4338,7 +4518,7 @@ UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg); @@ -4350,7 +4530,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutab } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -4361,11 +4541,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mu } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__OneofOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4385,7 +4567,8 @@ UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Aren UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4395,90 +4578,94 @@ UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(con int options, upb_Arena* arena) { google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_EnumOptions_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated_legacy_json_field_conflicts(const google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumOptions_clear_features(google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumOptions_features(const google_protobuf_EnumOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumOptions_has_features(const google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(google_protobuf_EnumOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4489,16 +4676,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } UPB_INLINE const upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_upb_array(const google_protobuf_EnumOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4507,19 +4694,19 @@ UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 7); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg); @@ -4531,7 +4718,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutabl } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -4542,11 +4729,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4566,7 +4755,8 @@ UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_ne UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumValueOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumValueOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4576,75 +4766,78 @@ UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_pa int options, upb_Arena* arena) { google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__EnumValueOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__EnumValueOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumValueOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumValueOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__EnumValueOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__EnumValueOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueOptions_clear_features(google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_features(const google_protobuf_EnumValueOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueOptions_has_features(const google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueOptions_clear_debug_redact(google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_EnumValueOptions_debug_redact(const google_protobuf_EnumValueOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4655,16 +4848,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4673,11 +4866,11 @@ UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mut UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg); @@ -4689,11 +4882,11 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_m } UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -4704,11 +4897,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__EnumValueOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4728,7 +4923,8 @@ UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(up UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ServiceOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ServiceOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4738,60 +4934,62 @@ UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ int options, upb_Arena* arena) { google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__ServiceOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__ServiceOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ServiceOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ServiceOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__ServiceOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__ServiceOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(google_protobuf_ServiceOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ServiceOptions_clear_features(google_protobuf_ServiceOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_ServiceOptions_features(const google_protobuf_ServiceOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_ServiceOptions_has_features(const google_protobuf_ServiceOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(google_protobuf_ServiceOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4802,16 +5000,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Ser } UPB_INLINE const upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutable_upb_array(google_protobuf_ServiceOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4820,11 +5018,11 @@ UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 33); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 34); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg); @@ -4836,7 +5034,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mut } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -4847,11 +5045,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_ } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__ServiceOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -4871,7 +5071,8 @@ UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_ UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MethodOptions_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MethodOptions_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -4881,75 +5082,78 @@ UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex int options, upb_Arena* arena) { google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__MethodOptions_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__MethodOptions_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MethodOptions_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MethodOptions_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__MethodOptions_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__MethodOptions_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodOptions_clear_features(google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_MethodOptions_features(const google_protobuf_MethodOptions* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_MethodOptions_has_features(const google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(google_protobuf_MethodOptions* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption* const*)_upb_array_constptr(arr); @@ -4960,16 +5164,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Met } UPB_INLINE const upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_upb_array(const google_protobuf_MethodOptions* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(const google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutable_upb_array(google_protobuf_MethodOptions* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -4978,15 +5182,15 @@ UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutabl UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 33); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 34); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 35); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg); @@ -4998,7 +5202,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_muta } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption**)_upb_array_ptr(arr); @@ -5009,11 +5213,13 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_m } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__MethodOptions_msg_init(), 999); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -5033,7 +5239,8 @@ UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOpt UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__UninterpretedOption_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5043,30 +5250,30 @@ UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOpt int options, upb_Arena* arena) { google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__UninterpretedOption_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__UninterpretedOption_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__UninterpretedOption_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__UninterpretedOption_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__UninterpretedOption_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_constptr(arr); @@ -5077,16 +5284,16 @@ UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_UninterpretedOption_name_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(const google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_array(google_protobuf_UninterpretedOption* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5094,98 +5301,104 @@ UPB_INLINE upb_Array* _google_protobuf_UninterpretedOption_name_mutable_upb_arra } UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) { int64_t default_val = (int64_t)0ll; int64_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) { double default_val = 0; double ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_ptr(arr); @@ -5196,11 +5409,13 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_Uninte } UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_UninterpretedOption_NamePart**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -5213,27 +5428,27 @@ UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_ } UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 7); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption_msg_init(), 8); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.UninterpretedOption.NamePart */ @@ -5244,7 +5459,8 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_Uninter UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption__NamePart_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__UninterpretedOption__NamePart_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5254,61 +5470,63 @@ UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_Uninter int options, upb_Arena* arena) { google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__UninterpretedOption__NamePart_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__UninterpretedOption__NamePart_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__UninterpretedOption__NamePart_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__UninterpretedOption__NamePart_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__UninterpretedOption__NamePart_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__UninterpretedOption__NamePart_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(google_protobuf_UninterpretedOption_NamePart* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(google_protobuf_UninterpretedOption_NamePart* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) { bool default_val = false; bool ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__UninterpretedOption__NamePart_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSet */ @@ -5319,7 +5537,8 @@ UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_new(upb_Arena* UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSet_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSet_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5329,137 +5548,143 @@ UPB_INLINE google_protobuf_FeatureSet* google_protobuf_FeatureSet_parse_ex(const int options, upb_Arena* arena) { google_protobuf_FeatureSet* ret = google_protobuf_FeatureSet_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSet_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSet_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FeatureSet_serialize(const google_protobuf_FeatureSet* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSet_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSet_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FeatureSet_serialize_ex(const google_protobuf_FeatureSet* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSet_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSet_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FeatureSet_clear_field_presence(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_field_presence(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_field_presence(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_clear_enum_type(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_enum_type(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_enum_type(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_clear_repeated_field_encoding(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_repeated_field_encoding(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_repeated_field_encoding(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_clear_utf8_validation(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_utf8_validation(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_utf8_validation(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_clear_message_encoding(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_message_encoding(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_message_encoding(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_clear_json_format(google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSet_json_format(const google_protobuf_FeatureSet* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf_FeatureSet* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSet_msg_init(), 6); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults */ @@ -5470,7 +5695,8 @@ UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefault UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefaults_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSetDefaults_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5480,30 +5706,30 @@ UPB_INLINE google_protobuf_FeatureSetDefaults* google_protobuf_FeatureSetDefault int options, upb_Arena* arena) { google_protobuf_FeatureSetDefaults* ret = google_protobuf_FeatureSetDefaults_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSetDefaults_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize(const google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSetDefaults_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FeatureSetDefaults_serialize_ex(const google_protobuf_FeatureSetDefaults* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSetDefaults_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_defaults(google_protobuf_FeatureSetDefaults* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const* google_protobuf_FeatureSetDefaults_defaults(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* const*)_upb_array_constptr(arr); @@ -5514,16 +5740,16 @@ UPB_INLINE const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* co } UPB_INLINE const upb_Array* _google_protobuf_FeatureSetDefaults_defaults_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(const google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_array(google_protobuf_FeatureSetDefaults* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5531,38 +5757,40 @@ UPB_INLINE upb_Array* _google_protobuf_FeatureSetDefaults_defaults_mutable_upb_a } UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_minimum_edition(google_protobuf_FeatureSetDefaults* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_minimum_edition(const google_protobuf_FeatureSetDefaults* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSetDefaults_clear_maximum_edition(google_protobuf_FeatureSetDefaults* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSetDefaults_has_maximum_edition(const google_protobuf_FeatureSetDefaults* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_mutable_defaults(google_protobuf_FeatureSetDefaults* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)_upb_array_ptr(arr); @@ -5573,11 +5801,13 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_ } UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault** google_protobuf_FeatureSetDefaults_resize_defaults(google_protobuf_FeatureSetDefaults* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_add_defaults(google_protobuf_FeatureSetDefaults* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -5590,11 +5820,11 @@ UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* g } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */ @@ -5605,7 +5835,8 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_p UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5615,57 +5846,59 @@ UPB_INLINE google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* google_p int options, upb_Arena* arena) { google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* ret = google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_serialize_ex(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg); @@ -5677,7 +5910,7 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults } UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.SourceCodeInfo */ @@ -5688,7 +5921,8 @@ UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(up UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__SourceCodeInfo_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5698,30 +5932,30 @@ UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ int options, upb_Arena* arena) { google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__SourceCodeInfo_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__SourceCodeInfo_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__SourceCodeInfo_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__SourceCodeInfo_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__SourceCodeInfo_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(google_protobuf_SourceCodeInfo* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_constptr(arr); @@ -5732,16 +5966,16 @@ UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_location_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(const google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array(google_protobuf_SourceCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5750,7 +5984,7 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_location_mutable_upb_array UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_SourceCodeInfo_Location**)_upb_array_ptr(arr); @@ -5761,11 +5995,13 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeI } UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_SourceCodeInfo_Location**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -5785,7 +6021,8 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeIn UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo__Location_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__SourceCodeInfo__Location_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -5795,30 +6032,30 @@ UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeIn int options, upb_Arena* arena) { google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__SourceCodeInfo__Location_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__SourceCodeInfo__Location_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__SourceCodeInfo__Location_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__SourceCodeInfo__Location_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__SourceCodeInfo__Location_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__SourceCodeInfo__Location_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -5829,16 +6066,16 @@ UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const goo } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_path_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_array(google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5846,11 +6083,11 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_path_mutable_upb_ } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -5861,16 +6098,16 @@ UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const goo } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_span_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_array(google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5878,41 +6115,43 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_span_mutable_upb_ } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView const*)_upb_array_constptr(arr); @@ -5923,16 +6162,16 @@ UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading } UPB_INLINE const upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(const google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_comments_mutable_upb_array(google_protobuf_SourceCodeInfo_Location* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -5941,7 +6180,7 @@ UPB_INLINE upb_Array* _google_protobuf_SourceCodeInfo_Location_leading_detached_ UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -5952,11 +6191,13 @@ UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_ } UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -5967,7 +6208,7 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf } UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -5978,11 +6219,13 @@ UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_ } UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 2); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -5993,15 +6236,15 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView*)_upb_array_ptr(arr); @@ -6012,11 +6255,13 @@ UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leadi } UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__SourceCodeInfo__Location_msg_init(), 6); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -6034,7 +6279,8 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_ UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__GeneratedCodeInfo_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -6044,30 +6290,30 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_ int options, upb_Arena* arena) { google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__GeneratedCodeInfo_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__GeneratedCodeInfo_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__GeneratedCodeInfo_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(google_protobuf_GeneratedCodeInfo* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_constptr(arr); @@ -6078,16 +6324,16 @@ UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_pro } UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(const google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_array(google_protobuf_GeneratedCodeInfo* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -6096,7 +6342,7 @@ UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_annotation_mutable_upb_ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_ptr(arr); @@ -6107,11 +6353,13 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_Genera } UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_GeneratedCodeInfo_Annotation**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -6131,7 +6379,8 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_Generat UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -6141,30 +6390,30 @@ UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_Generat int options, upb_Arena* arena) { google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t const*)_upb_array_constptr(arr); @@ -6175,16 +6424,16 @@ UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(cons } UPB_INLINE const upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable_upb_array(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -6192,68 +6441,72 @@ UPB_INLINE upb_Array* _google_protobuf_GeneratedCodeInfo_Annotation_path_mutable } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_semantic(google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { int32_t default_val = 0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_semantic(const google_protobuf_GeneratedCodeInfo_Annotation* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (int32_t*)_upb_array_ptr(arr); @@ -6264,11 +6517,13 @@ UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(go } UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - return (int32_t*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -6279,19 +6534,19 @@ UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_pro } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__GeneratedCodeInfo__Annotation_msg_init(), 5); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* Max size 32 is google.protobuf.FileOptions */ diff --git a/upb/test/BUILD b/upb/test/BUILD index 726dd6bdef..a447a82cc0 100644 --- a/upb/test/BUILD +++ b/upb/test/BUILD @@ -208,6 +208,7 @@ cc_test( ":timestamp_upb_proto", ":timestamp_upb_proto_reflection", "@com_google_googletest//:gtest_main", + "//upb:base", "//upb:json", "//upb:port", "//upb:reflection", diff --git a/upb/test/test_cpp.cc b/upb/test/test_cpp.cc index a2d1c4c456..6f917150d5 100644 --- a/upb/test/test_cpp.cc +++ b/upb/test/test_cpp.cc @@ -17,6 +17,7 @@ #include "google/protobuf/timestamp.upb.h" #include "google/protobuf/timestamp.upbdefs.h" #include +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/json/encode.h" #include "upb/reflection/def.h" @@ -57,7 +58,8 @@ TEST(Cpp, Default) { upb::Arena arena; upb::MessageDefPtr md(upb_test_TestMessage_getmsgdef(defpool.ptr())); upb_test_TestMessage* msg = upb_test_TestMessage_new(arena.ptr()); - size_t size = upb_JsonEncode(msg, md.ptr(), nullptr, 0, nullptr, 0, nullptr); + size_t size = upb_JsonEncode(UPB_UPCAST(msg), md.ptr(), nullptr, 0, nullptr, + 0, nullptr); EXPECT_EQ(2, size); // "{}" } @@ -95,10 +97,10 @@ TEST(Cpp, TimestampEncoder) { google_protobuf_Timestamp_set_seconds(timestamp_upb, timestamp); char json[128]; - size_t size = upb_JsonEncode(timestamp_upb, md.ptr(), nullptr, 0, json, - sizeof(json), nullptr); - bool result = upb_JsonDecode(json, size, timestamp_upb_decoded, md.ptr(), - nullptr, 0, arena.ptr(), nullptr); + size_t size = upb_JsonEncode(UPB_UPCAST(timestamp_upb), md.ptr(), nullptr, + 0, json, sizeof(json), nullptr); + bool result = upb_JsonDecode(json, size, UPB_UPCAST(timestamp_upb_decoded), + md.ptr(), nullptr, 0, arena.ptr(), nullptr); const int64_t timestamp_decoded = google_protobuf_Timestamp_seconds(timestamp_upb_decoded); diff --git a/upb/util/def_to_proto_test.cc b/upb/util/def_to_proto_test.cc index cad9abf535..523efd2708 100644 --- a/upb/util/def_to_proto_test.cc +++ b/upb/util/def_to_proto_test.cc @@ -75,9 +75,9 @@ MATCHER_P2(EqualsUpbProto, proto, msgdef_func, AddMessageDescriptor(msgdef, &pool); EXPECT_TRUE(desc != nullptr); std::unique_ptr m1( - ToProto(proto, msgdef.ptr(), desc, &factory)); + ToProto(UPB_UPCAST(proto), msgdef.ptr(), desc, &factory)); std::unique_ptr m2( - ToProto(arg, msgdef.ptr(), desc, &factory)); + ToProto((upb_Message*)arg, msgdef.ptr(), desc, &factory)); std::string differences; google::protobuf::util::MessageDifferencer differencer; differencer.ReportDifferencesToString(&differences); diff --git a/upb/util/required_fields_test.cc b/upb/util/required_fields_test.cc index 396c3aa997..7698cfb3b8 100644 --- a/upb/util/required_fields_test.cc +++ b/upb/util/required_fields_test.cc @@ -12,6 +12,7 @@ #include #include "absl/strings/string_view.h" #include "upb/base/status.hpp" +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/mem/arena.h" #include "upb/mem/arena.hpp" @@ -53,13 +54,14 @@ class RequiredFieldsTest : public testing::Test { auto* test_msg = T::NewMessage(arena.ptr()); upb::MessageDefPtr m = T::GetMessageDef(defpool.ptr()); upb::Status status; - EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), test_msg, m.ptr(), - defpool.ptr(), 0, arena.ptr(), status.ptr())) + EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), UPB_UPCAST(test_msg), + m.ptr(), defpool.ptr(), 0, arena.ptr(), + status.ptr())) << status.error_message(); upb_FieldPathEntry* entries = nullptr; - EXPECT_EQ( - !missing.empty(), - upb_util_HasUnsetRequired(test_msg, m.ptr(), defpool.ptr(), &entries)); + EXPECT_EQ(!missing.empty(), + upb_util_HasUnsetRequired(UPB_UPCAST(test_msg), m.ptr(), + defpool.ptr(), &entries)); if (entries) { EXPECT_EQ(missing, PathsToText(entries)); free(entries); @@ -67,8 +69,9 @@ class RequiredFieldsTest : public testing::Test { // Verify that we can pass a NULL pointer to entries when we don't care // about them. - EXPECT_EQ(!missing.empty(), upb_util_HasUnsetRequired( - test_msg, m.ptr(), defpool.ptr(), nullptr)); + EXPECT_EQ(!missing.empty(), + upb_util_HasUnsetRequired(UPB_UPCAST(test_msg), m.ptr(), + defpool.ptr(), nullptr)); } }; diff --git a/upb/wire/decode.c b/upb/wire/decode.c index 044cae261e..f6bb42768b 100644 --- a/upb/wire/decode.c +++ b/upb/wire/decode.c @@ -647,18 +647,18 @@ static const char* _upb_Decoder_DecodeToMap(upb_Decoder* d, const char* ptr, ent.data.v.val = upb_value_uintptr(msg); } - ptr = - _upb_Decoder_DecodeSubMessage(d, ptr, &ent.data, subs, field, val->size); + ptr = _upb_Decoder_DecodeSubMessage(d, ptr, (upb_Message*)&ent.data, subs, + field, val->size); // check if ent had any unknown fields size_t size; - upb_Message_GetUnknown(&ent.data, &size); + upb_Message_GetUnknown((upb_Message*)&ent.data, &size); if (size != 0) { char* buf; size_t size; uint32_t tag = ((uint32_t)field->UPB_PRIVATE(number) << 3) | kUpb_WireType_Delimited; upb_EncodeStatus status = - upb_Encode(&ent.data, entry, 0, &d->arena, &buf, &size); + upb_Encode((upb_Message*)&ent.data, entry, 0, &d->arena, &buf, &size); if (status != kUpb_EncodeStatus_Ok) { _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory); } @@ -1160,7 +1160,7 @@ static const char* _upb_Decoder_DecodeKnownField( _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory); } d->unknown_msg = msg; - msg = &ext->data; + msg = (upb_Message*)&ext->data; subs = &ext->ext->UPB_PRIVATE(sub); } @@ -1351,7 +1351,7 @@ static upb_DecodeStatus upb_Decoder_Decode(upb_Decoder* const decoder, return decoder->status; } -upb_DecodeStatus upb_Decode(const char* buf, size_t size, void* msg, +upb_DecodeStatus upb_Decode(const char* buf, size_t size, upb_Message* msg, const upb_MiniTable* l, const upb_ExtensionRegistry* extreg, int options, upb_Arena* arena) { diff --git a/upb/wire/encode.c b/upb/wire/encode.c index 2e4f2e4812..ae2be7f734 100644 --- a/upb/wire/encode.c +++ b/upb/wire/encode.c @@ -535,7 +535,7 @@ static void encode_ext(upb_encstate* e, const upb_Extension* ext, if (UPB_UNLIKELY(is_message_set)) { encode_msgset_item(e, ext); } else { - encode_field(e, &ext->data, &ext->ext->UPB_PRIVATE(sub), + encode_field(e, (upb_Message*)&ext->data, &ext->ext->UPB_PRIVATE(sub), &ext->ext->UPB_PRIVATE(field)); } } @@ -603,7 +603,7 @@ static void encode_message(upb_encstate* e, const upb_Message* msg, } static upb_EncodeStatus upb_Encoder_Encode(upb_encstate* const encoder, - const void* const msg, + const upb_Message* const msg, const upb_MiniTable* const l, char** const buf, size_t* const size) { @@ -631,7 +631,7 @@ static upb_EncodeStatus upb_Encoder_Encode(upb_encstate* const encoder, return encoder->status; } -upb_EncodeStatus upb_Encode(const void* msg, const upb_MiniTable* l, +upb_EncodeStatus upb_Encode(const upb_Message* msg, const upb_MiniTable* l, int options, upb_Arena* arena, char** buf, size_t* size) { upb_encstate e; diff --git a/upb/wire/encode.h b/upb/wire/encode.h index 6fb5553143..fdccaf963e 100644 --- a/upb/wire/encode.h +++ b/upb/wire/encode.h @@ -63,9 +63,9 @@ UPB_INLINE int upb_Encode_LimitDepth(uint32_t encode_options, uint32_t limit) { return upb_EncodeOptions_MaxDepth(max_depth) | (encode_options & 0xffff); } -UPB_API upb_EncodeStatus upb_Encode(const void* msg, const upb_MiniTable* l, - int options, upb_Arena* arena, char** buf, - size_t* size); +UPB_API upb_EncodeStatus upb_Encode(const upb_Message* msg, + const upb_MiniTable* l, int options, + upb_Arena* arena, char** buf, size_t* size); #ifdef __cplusplus } /* extern "C" */ diff --git a/upb_generator/protoc-gen-upb.cc b/upb_generator/protoc-gen-upb.cc index 8a7e213f54..b5d3e2c487 100644 --- a/upb_generator/protoc-gen-upb.cc +++ b/upb_generator/protoc-gen-upb.cc @@ -260,7 +260,7 @@ void GenerateExtensionInHeader(const DefPoolPair& pools, upb::FieldDefPtr ext, output( R"cc( UPB_INLINE bool $0_has_$1(const struct $2* msg) { - return _upb_Message_HasExtensionField(msg, &$3); + return _upb_Message_HasExtensionField((upb_Message*)msg, &$3); } )cc", ExtensionIdentBase(ext), ext.name(), MessageName(ext.containing_type()), @@ -269,7 +269,7 @@ void GenerateExtensionInHeader(const DefPoolPair& pools, upb::FieldDefPtr ext, output( R"cc( UPB_INLINE void $0_clear_$1(struct $2* msg) { - _upb_Message_ClearExtensionField(msg, &$3); + _upb_Message_ClearExtensionField((upb_Message*)msg, &$3); } )cc", ExtensionIdentBase(ext), ext.name(), MessageName(ext.containing_type()), @@ -287,7 +287,7 @@ void GenerateExtensionInHeader(const DefPoolPair& pools, upb::FieldDefPtr ext, &ext->UPB_PRIVATE(field)) == $5); $0 default_val = $6; $0 ret; - _upb_Message_GetExtensionField(msg, ext, &default_val, &ret); + _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); return ret; } )cc", @@ -301,7 +301,7 @@ void GenerateExtensionInHeader(const DefPoolPair& pools, upb::FieldDefPtr ext, UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == $5); - bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena); + bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } )cc", @@ -323,7 +323,8 @@ void GenerateMessageFunctionsInHeader(upb::MessageDefPtr message, UPB_INLINE $0* $0_parse(const char* buf, size_t size, upb_Arena* arena) { $0* ret = $0_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, $1, NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), $1, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -333,21 +334,21 @@ void GenerateMessageFunctionsInHeader(upb::MessageDefPtr message, int options, upb_Arena* arena) { $0* ret = $0_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, $1, extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), $1, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* $0_serialize(const $0* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, $1, 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), $1, 0, arena, &ptr, len); return ptr; } UPB_INLINE char* $0_serialize_ex(const $0* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, $1, options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), $1, options, arena, &ptr, len); return ptr; } )cc", @@ -371,7 +372,8 @@ void GenerateOneofInHeader(upb::OneofDefPtr oneof, const DefPoolPair& pools, R"cc( UPB_INLINE $0_oneofcases $1_$2_case(const $1* msg) { const upb_MiniTableField field = $3; - return ($0_oneofcases)upb_Message_WhichOneofFieldNumber(msg, &field); + return ($0_oneofcases)upb_Message_WhichOneofFieldNumber( + UPB_UPCAST(msg), &field); } )cc", fullname, msg_name, oneof.name(), @@ -388,7 +390,7 @@ void GenerateHazzer(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE bool $0_has_$1(const $0* msg) { const upb_MiniTableField field = $2; - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } )cc", msg_name, resolved_name, FieldInitializer(pools, field, options)); @@ -409,7 +411,7 @@ void GenerateClear(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE void $0_clear_$1($0* msg) { const upb_MiniTableField field = $2; - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } )cc", msg_name, resolved_name, FieldInitializer(pools, field, options)); @@ -424,7 +426,7 @@ void GenerateMapGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE size_t $0_$1_size(const $0* msg) { const upb_MiniTableField field = $2; - const upb_Map* map = upb_Message_GetMap(msg, &field); + const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); return map ? _upb_Map_Size(map) : 0; } )cc", @@ -433,7 +435,7 @@ void GenerateMapGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE bool $0_$1_get(const $0* msg, $2 key, $3* val) { const upb_MiniTableField field = $4; - const upb_Map* map = upb_Message_GetMap(msg, &field); + const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &key, $5, val, $6); } @@ -445,7 +447,7 @@ void GenerateMapGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE $0 $1_$2_next(const $1* msg, size_t* iter) { const upb_MiniTableField field = $3; - const upb_Map* map = upb_Message_GetMap(msg, &field); + const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return ($0)_upb_map_next(map, iter); } @@ -462,11 +464,11 @@ void GenerateMapGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE const upb_Map* _$0_$1_$2($0* msg) { const upb_MiniTableField field = $4; - return upb_Message_GetMap(msg, &field); + return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _$0_$1_$3($0* msg, upb_Arena* a) { const upb_MiniTableField field = $4; - return _upb_Message_GetOrCreateMutableMap(msg, &field, $5, $6, a); + return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, $5, $6, a); } )cc", msg_name, resolved_name, kMapGetterPostfix, kMutableMapGetterPostfix, @@ -501,7 +503,7 @@ void GenerateRepeatedGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE $0 const* $1_$2(const $1* msg, size_t* size) { const upb_MiniTableField field = $3; - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return ($0 const*)_upb_array_constptr(arr); @@ -526,16 +528,16 @@ void GenerateRepeatedGetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE const upb_Array* _$1_$2_$4(const $1* msg, size_t* size) { const upb_MiniTableField field = $3; - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } - UPB_INLINE upb_Array* _$1_$2_$5(const $1* msg, size_t* size, upb_Arena* arena) { + UPB_INLINE upb_Array* _$1_$2_$5($1* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = $3; - upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -562,7 +564,8 @@ void GenerateScalarGetters(upb::FieldDefPtr field, const DefPoolPair& pools, $0 default_val = $3; $0 ret; const upb_MiniTableField field = $4; - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } )cc", @@ -596,7 +599,7 @@ void GenerateMapSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE void $0_$1_clear($0* msg) { const upb_MiniTableField field = $2; - upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field); + upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return; _upb_Map_Clear(map); } @@ -606,7 +609,8 @@ void GenerateMapSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE bool $0_$1_set($0* msg, $2 key, $3 val, upb_Arena* a) { const upb_MiniTableField field = $4; - upb_Map* map = _upb_Message_GetOrCreateMutableMap(msg, &field, $5, $6, a); + upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), + &field, $5, $6, a); return _upb_Map_Insert(map, &key, $5, &val, $6, a) != kUpb_MapInsertStatus_OutOfMemory; } @@ -618,7 +622,7 @@ void GenerateMapSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE bool $0_$1_delete($0* msg, $2 key) { const upb_MiniTableField field = $3; - upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field); + upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Delete(map, &key, $4, NULL); } @@ -629,7 +633,7 @@ void GenerateMapSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE $0 $1_$2_nextmutable($1* msg, size_t* iter) { const upb_MiniTableField field = $3; - upb_Map* map = (upb_Map*)upb_Message_GetMap(msg, &field); + upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return ($0)_upb_map_next(map, iter); } @@ -647,7 +651,7 @@ void GenerateRepeatedSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE $0* $1_mutable_$2($1* msg, size_t* size) { upb_MiniTableField field = $3; - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return ($0*)_upb_array_ptr(arr); @@ -663,7 +667,8 @@ void GenerateRepeatedSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE $0* $1_resize_$2($1* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = $3; - return ($0*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return ($0*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } )cc", CType(field), msg_name, resolved_name, @@ -673,7 +678,8 @@ void GenerateRepeatedSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE struct $0* $1_add_$2($1* msg, upb_Arena* arena) { upb_MiniTableField field = $4; - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -693,7 +699,8 @@ void GenerateRepeatedSetters(upb::FieldDefPtr field, const DefPoolPair& pools, R"cc( UPB_INLINE bool $1_add_$2($1* msg, $0 val, upb_Arena* arena) { upb_MiniTableField field = $3; - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -733,7 +740,7 @@ void GenerateNonRepeatedSetters(upb::FieldDefPtr field, output(R"cc( UPB_INLINE void $0_set_$1($0 *msg, $2 value) { const upb_MiniTableField field = $3; - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } )cc", msg_name, field_name, CType(field), @@ -892,7 +899,8 @@ void WriteHeader(const DefPoolPair& pools, upb::FileDefPtr file, // Forward-declare types defined in this file. for (auto message : this_file_messages) { - output("typedef struct $0 $0;\n", ToCIdent(message.full_name())); + output("typedef struct $0 { upb_Message UPB_PRIVATE(base); } $0;\n", + ToCIdent(message.full_name())); } // Forward-declare types not in this file, but used as submessages. diff --git a/upb_generator/stage0/google/protobuf/compiler/plugin.upb.h b/upb_generator/stage0/google/protobuf/compiler/plugin.upb.h index b354a86aab..f987de7a5c 100644 --- a/upb_generator/stage0/google/protobuf/compiler/plugin.upb.h +++ b/upb_generator/stage0/google/protobuf/compiler/plugin.upb.h @@ -25,10 +25,10 @@ extern const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init(); extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init(); extern const upb_MiniTableEnum* google_protobuf_compiler_CodeGeneratorResponse_Feature_enum_init(); -typedef struct google_protobuf_compiler_Version google_protobuf_compiler_Version; -typedef struct google_protobuf_compiler_CodeGeneratorRequest google_protobuf_compiler_CodeGeneratorRequest; -typedef struct google_protobuf_compiler_CodeGeneratorResponse google_protobuf_compiler_CodeGeneratorResponse; -typedef struct google_protobuf_compiler_CodeGeneratorResponse_File google_protobuf_compiler_CodeGeneratorResponse_File; +typedef struct google_protobuf_compiler_Version { upb_Message UPB_PRIVATE(base); } google_protobuf_compiler_Version; +typedef struct google_protobuf_compiler_CodeGeneratorRequest { upb_Message UPB_PRIVATE(base); } google_protobuf_compiler_CodeGeneratorRequest; +typedef struct google_protobuf_compiler_CodeGeneratorResponse { upb_Message UPB_PRIVATE(base); } google_protobuf_compiler_CodeGeneratorResponse; +typedef struct google_protobuf_compiler_CodeGeneratorResponse_File { upb_Message UPB_PRIVATE(base); } google_protobuf_compiler_CodeGeneratorResponse_File; struct google_protobuf_FileDescriptorProto; struct google_protobuf_GeneratedCodeInfo; @@ -48,7 +48,8 @@ UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_ne UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_compiler_Version* ret = google_protobuf_compiler_Version_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__Version_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__Version_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -58,99 +59,103 @@ UPB_INLINE google_protobuf_compiler_Version* google_protobuf_compiler_Version_pa int options, upb_Arena* arena) { google_protobuf_compiler_Version* ret = google_protobuf_compiler_Version_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__Version_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__Version_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_compiler_Version_serialize(const google_protobuf_compiler_Version* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__Version_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__Version_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_compiler_Version_serialize_ex(const google_protobuf_compiler_Version* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__Version_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__Version_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_compiler_Version_clear_major(google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_compiler_Version_major(const google_protobuf_compiler_Version* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_Version_has_major(const google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_Version_clear_minor(google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_compiler_Version_minor(const google_protobuf_compiler_Version* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_Version_has_minor(const google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_Version_clear_patch(google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_compiler_Version_patch(const google_protobuf_compiler_Version* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_Version_has_patch(const google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_Version_clear_suffix(google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_Version_suffix(const google_protobuf_compiler_Version* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_Version_has_suffix(const google_protobuf_compiler_Version* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_Version_set_major(google_protobuf_compiler_Version *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_Version_set_minor(google_protobuf_compiler_Version *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_Version_set_patch(google_protobuf_compiler_Version *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_Version_set_suffix(google_protobuf_compiler_Version *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__Version_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } /* google.protobuf.compiler.CodeGeneratorRequest */ @@ -161,7 +166,8 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compil UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compiler_CodeGeneratorRequest_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorRequest* ret = google_protobuf_compiler_CodeGeneratorRequest_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorRequest_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorRequest_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -171,30 +177,30 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorRequest* google_protobuf_compil int options, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorRequest* ret = google_protobuf_compiler_CodeGeneratorRequest_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorRequest_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorRequest_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorRequest_serialize(const google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorRequest_serialize_ex(const google_protobuf_compiler_CodeGeneratorRequest* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorRequest_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorRequest_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* google_protobuf_compiler_CodeGeneratorRequest_file_to_generate(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView const*)_upb_array_constptr(arr); @@ -205,16 +211,16 @@ UPB_INLINE upb_StringView const* google_protobuf_compiler_CodeGeneratorRequest_f } UPB_INLINE const upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_file_to_generate_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_file_to_generate_mutable_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_file_to_generate_mutable_upb_array(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -222,41 +228,43 @@ UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_file_to_gen } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_parameter(google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorRequest_parameter(const google_protobuf_compiler_CodeGeneratorRequest* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_parameter(const google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_compiler_version(google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_compiler_Version* google_protobuf_compiler_CodeGeneratorRequest_compiler_version(const google_protobuf_compiler_CodeGeneratorRequest* msg) { const google_protobuf_compiler_Version* default_val = NULL; const google_protobuf_compiler_Version* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_has_compiler_version(const google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_FileDescriptorProto* const* google_protobuf_compiler_CodeGeneratorRequest_proto_file(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const struct google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr); @@ -267,16 +275,16 @@ UPB_INLINE const struct google_protobuf_FileDescriptorProto* const* google_proto } UPB_INLINE const upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_proto_file_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_proto_file_mutable_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_proto_file_mutable_upb_array(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -284,11 +292,11 @@ UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_proto_file_ } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_clear_source_file_descriptors(google_protobuf_compiler_CodeGeneratorRequest* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_FileDescriptorProto* const* google_protobuf_compiler_CodeGeneratorRequest_source_file_descriptors(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const struct google_protobuf_FileDescriptorProto* const*)_upb_array_constptr(arr); @@ -299,16 +307,16 @@ UPB_INLINE const struct google_protobuf_FileDescriptorProto* const* google_proto } UPB_INLINE const upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_source_file_descriptors_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_source_file_descriptors_mutable_upb_array(const google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_source_file_descriptors_mutable_upb_array(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -317,7 +325,7 @@ UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorRequest_source_file UPB_INLINE upb_StringView* google_protobuf_compiler_CodeGeneratorRequest_mutable_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (upb_StringView*)_upb_array_ptr(arr); @@ -328,11 +336,13 @@ UPB_INLINE upb_StringView* google_protobuf_compiler_CodeGeneratorRequest_mutable } UPB_INLINE upb_StringView* google_protobuf_compiler_CodeGeneratorRequest_resize_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - return (upb_StringView*)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_add_file_to_generate(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_StringView val, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 1); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return false; @@ -343,11 +353,11 @@ UPB_INLINE bool google_protobuf_compiler_CodeGeneratorRequest_add_file_to_genera } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_set_parameter(google_protobuf_compiler_CodeGeneratorRequest *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorRequest_set_compiler_version(google_protobuf_compiler_CodeGeneratorRequest *msg, google_protobuf_compiler_Version* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_compiler_Version* google_protobuf_compiler_CodeGeneratorRequest_mutable_compiler_version(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena) { struct google_protobuf_compiler_Version* sub = (struct google_protobuf_compiler_Version*)google_protobuf_compiler_CodeGeneratorRequest_compiler_version(msg); @@ -359,7 +369,7 @@ UPB_INLINE struct google_protobuf_compiler_Version* google_protobuf_compiler_Cod } UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_mutable_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (struct google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr); @@ -370,11 +380,13 @@ UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler } UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_resize_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - return (struct google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (struct google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_compiler_CodeGeneratorRequest_add_proto_file(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 15); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -387,7 +399,7 @@ UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_compiler_ } UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_mutable_source_file_descriptors(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (struct google_protobuf_FileDescriptorProto**)_upb_array_ptr(arr); @@ -398,11 +410,13 @@ UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler } UPB_INLINE struct google_protobuf_FileDescriptorProto** google_protobuf_compiler_CodeGeneratorRequest_resize_source_file_descriptors(google_protobuf_compiler_CodeGeneratorRequest* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - return (struct google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (struct google_protobuf_FileDescriptorProto**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_compiler_CodeGeneratorRequest_add_source_file_descriptors(google_protobuf_compiler_CodeGeneratorRequest* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorRequest_msg_init(), 17); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -422,7 +436,8 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compi UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compiler_CodeGeneratorResponse_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorResponse* ret = google_protobuf_compiler_CodeGeneratorResponse_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorResponse_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorResponse_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -432,90 +447,94 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse* google_protobuf_compi int options, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorResponse* ret = google_protobuf_compiler_CodeGeneratorResponse_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorResponse_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorResponse_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_serialize(const google_protobuf_compiler_CodeGeneratorResponse* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_serialize_ex(const google_protobuf_compiler_CodeGeneratorResponse* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorResponse_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorResponse_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_error(google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_error(const google_protobuf_compiler_CodeGeneratorResponse* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_error(const google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_supported_features(google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t google_protobuf_compiler_CodeGeneratorResponse_supported_features(const google_protobuf_compiler_CodeGeneratorResponse* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_supported_features(const google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_minimum_edition(google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 3); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_compiler_CodeGeneratorResponse_minimum_edition(const google_protobuf_compiler_CodeGeneratorResponse* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 3); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_minimum_edition(const google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 3); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_maximum_edition(google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 4); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_compiler_CodeGeneratorResponse_maximum_edition(const google_protobuf_compiler_CodeGeneratorResponse* msg) { int32_t default_val = (int32_t)0; int32_t ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 4); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_has_maximum_edition(const google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 4); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_clear_file(google_protobuf_compiler_CodeGeneratorResponse* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_compiler_CodeGeneratorResponse_File* const* google_protobuf_compiler_CodeGeneratorResponse_file(const google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (const google_protobuf_compiler_CodeGeneratorResponse_File* const*)_upb_array_constptr(arr); @@ -526,16 +545,16 @@ UPB_INLINE const google_protobuf_compiler_CodeGeneratorResponse_File* const* goo } UPB_INLINE const upb_Array* _google_protobuf_compiler_CodeGeneratorResponse_file_upb_array(const google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - const upb_Array* arr = upb_Message_GetArray(msg, &field); + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } return arr; } -UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorResponse_file_mutable_upb_array(const google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size, upb_Arena* arena) { +UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorResponse_file_mutable_upb_array(google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size, upb_Arena* arena) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); upb_Array* arr = upb_Message_GetOrCreateMutableArray( - (upb_Message*)msg, &field, arena); + UPB_UPCAST(msg), &field, arena); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; } @@ -544,23 +563,23 @@ UPB_INLINE upb_Array* _google_protobuf_compiler_CodeGeneratorResponse_file_mutab UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_error(google_protobuf_compiler_CodeGeneratorResponse *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_supported_features(google_protobuf_compiler_CodeGeneratorResponse *msg, uint64_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_minimum_edition(google_protobuf_compiler_CodeGeneratorResponse *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 3); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_set_maximum_edition(google_protobuf_compiler_CodeGeneratorResponse *msg, int32_t value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 4); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File** google_protobuf_compiler_CodeGeneratorResponse_mutable_file(google_protobuf_compiler_CodeGeneratorResponse* msg, size_t* size) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - upb_Array* arr = upb_Message_GetMutableArray(msg, &field); + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); return (google_protobuf_compiler_CodeGeneratorResponse_File**)_upb_array_ptr(arr); @@ -571,11 +590,13 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File** google_protobuf } UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File** google_protobuf_compiler_CodeGeneratorResponse_resize_file(google_protobuf_compiler_CodeGeneratorResponse* msg, size_t size, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - return (google_protobuf_compiler_CodeGeneratorResponse_File**)upb_Message_ResizeArrayUninitialized(msg, &field, size, arena); + return (google_protobuf_compiler_CodeGeneratorResponse_File**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); } UPB_INLINE struct google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_add_file(google_protobuf_compiler_CodeGeneratorResponse* msg, upb_Arena* arena) { upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse_msg_init(), 15); - upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); if (!arr || !_upb_Array_ResizeUninitialized( arr, arr->UPB_PRIVATE(size) + 1, arena)) { return NULL; @@ -595,7 +616,8 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_compiler_CodeGeneratorResponse_File_parse(const char* buf, size_t size, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorResponse_File* ret = google_protobuf_compiler_CodeGeneratorResponse_File_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { return NULL; } return ret; @@ -605,99 +627,103 @@ UPB_INLINE google_protobuf_compiler_CodeGeneratorResponse_File* google_protobuf_ int options, upb_Arena* arena) { google_protobuf_compiler_CodeGeneratorResponse_File* ret = google_protobuf_compiler_CodeGeneratorResponse_File_new(arena); if (!ret) return NULL; - if (upb_Decode(buf, size, ret, google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), extreg, options, arena) != - kUpb_DecodeStatus_Ok) { + if (upb_Decode(buf, size, UPB_UPCAST(ret), google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), extreg, options, + arena) != kUpb_DecodeStatus_Ok) { return NULL; } return ret; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_File_serialize(const google_protobuf_compiler_CodeGeneratorResponse_File* msg, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 0, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 0, arena, &ptr, len); return ptr; } UPB_INLINE char* google_protobuf_compiler_CodeGeneratorResponse_File_serialize_ex(const google_protobuf_compiler_CodeGeneratorResponse_File* msg, int options, upb_Arena* arena, size_t* len) { char* ptr; - (void)upb_Encode(msg, google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), options, arena, &ptr, len); + (void)upb_Encode(UPB_UPCAST(msg), google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), options, arena, &ptr, len); return ptr; } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_name(google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 1); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_name(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 1); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_name(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 1); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_insertion_point(google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 2); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_insertion_point(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 2); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_insertion_point(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 2); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_content(google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 15); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView google_protobuf_compiler_CodeGeneratorResponse_File_content(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 15); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_content(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 15); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_clear_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 16); - _upb_Message_ClearNonExtensionField(msg, &field); + _upb_Message_ClearNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_GeneratedCodeInfo* google_protobuf_compiler_CodeGeneratorResponse_File_generated_code_info(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const struct google_protobuf_GeneratedCodeInfo* default_val = NULL; const struct google_protobuf_GeneratedCodeInfo* ret; const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 16); - _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_compiler_CodeGeneratorResponse_File_has_generated_code_info(const google_protobuf_compiler_CodeGeneratorResponse_File* msg) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 16); - return _upb_Message_HasNonExtensionField(msg, &field); + return _upb_Message_HasNonExtensionField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_name(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 1); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_insertion_point(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 2); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_content(google_protobuf_compiler_CodeGeneratorResponse_File *msg, upb_StringView value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 15); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_compiler_CodeGeneratorResponse_File_set_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File *msg, struct google_protobuf_GeneratedCodeInfo* value) { const upb_MiniTableField field = *upb_MiniTable_FindFieldByNumber(google__protobuf__compiler__CodeGeneratorResponse__File_msg_init(), 16); - _upb_Message_SetNonExtensionField(msg, &field, &value); + _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_GeneratedCodeInfo* google_protobuf_compiler_CodeGeneratorResponse_File_mutable_generated_code_info(google_protobuf_compiler_CodeGeneratorResponse_File* msg, upb_Arena* arena) { struct google_protobuf_GeneratedCodeInfo* sub = (struct google_protobuf_GeneratedCodeInfo*)google_protobuf_compiler_CodeGeneratorResponse_File_generated_code_info(msg); diff --git a/upb_generator/upbdev.c b/upb_generator/upbdev.c index 3de46e5c27..ab67bf461d 100644 --- a/upb_generator/upbdev.c +++ b/upb_generator/upbdev.c @@ -19,6 +19,7 @@ #include "google/protobuf/compiler/plugin.upb.h" #include "google/protobuf/compiler/plugin.upbdefs.h" #include "upb/base/status.h" +#include "upb/base/upcast.h" #include "upb/json/decode.h" #include "upb/json/encode.h" #include "upb/mem/arena.h" @@ -34,7 +35,8 @@ static google_protobuf_compiler_CodeGeneratorResponse* upbc_JsonDecode( upb_DefPool* s = upb_DefPool_New(); const upb_MessageDef* m = google_protobuf_compiler_CodeGeneratorResponse_getmsgdef(s); - (void)upb_JsonDecode(data, size, response, m, s, 0, arena, status); + (void)upb_JsonDecode(data, size, UPB_UPCAST(response), m, s, 0, arena, + status); if (!upb_Status_IsOk(status)) return NULL; upb_DefPool_Free(s); @@ -50,12 +52,14 @@ static upb_StringView upbc_JsonEncode(const upb_CodeGeneratorRequest* request, const upb_MessageDef* m = upb_CodeGeneratorRequest_getmsgdef(s); const int options = upb_JsonEncode_FormatEnumsAsIntegers; - out.size = upb_JsonEncode(request, m, s, options, NULL, 0, status); + out.size = + upb_JsonEncode(UPB_UPCAST(request), m, s, options, NULL, 0, status); if (!upb_Status_IsOk(status)) goto done; char* data = (char*)upb_Arena_Malloc(arena, out.size + 1); - (void)upb_JsonEncode(request, m, s, options, data, out.size + 1, status); + (void)upb_JsonEncode(UPB_UPCAST(request), m, s, options, data, out.size + 1, + status); if (!upb_Status_IsOk(status)) goto done; out.data = (const char*)data;