Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix inconsistency issues with ALWAYS_INLINE macros.

Browse Source 
Some uses put the `inline` keyword before the attribute, some put it after the
attribute, some didn't put it at all.
Clang is very permissive and it allowed code to work where it breaks in other
compilers. GCC doesn't like if you don't put the keyword, MSVC doesn't like if
the keyword is in the wrong place.

By moving the keyword into the macro we prevent this issue altogether.

PiperOrigin-RevId: 693469310
pull/19133/head
Protobuf Team Bot 3 months ago committed by Copybara-Service
parent 6a6f4a0437
commit 8a33e2b5bc
23 changed files with 350 additions and 423 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
  2. 4
      src/google/protobuf/arena.h
  3. 14
      src/google/protobuf/arena_align.h
  4. 15
      src/google/protobuf/arenastring.h
  5. 58
      src/google/protobuf/compiler/cpp/field_generators/string_field.cc
  6. 38
      src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc
  7. 4
      src/google/protobuf/compiler/cpp/message.cc
  8. 2
      src/google/protobuf/compiler/java/java_features.pb.cc
  9. 16
      src/google/protobuf/compiler/plugin.pb.cc
  10. 42
      src/google/protobuf/compiler/plugin.pb.h
  11. 2
      src/google/protobuf/cpp_features.pb.cc
  12. 128
      src/google/protobuf/descriptor.pb.cc
  13. 259
      src/google/protobuf/descriptor.pb.h
  14. 4
      src/google/protobuf/generated_enum_util.h
  15. 10
      src/google/protobuf/generated_message_tctable_impl.h
  16. 61
      src/google/protobuf/generated_message_tctable_lite.cc
  17. 4
      src/google/protobuf/inlined_string_field.h
  18. 4
      src/google/protobuf/message_lite.h
  19. 34
      src/google/protobuf/parse_context.h
  20. 25
      src/google/protobuf/port.h
  21. 10
      src/google/protobuf/port_def.inc
  22. 9
      src/google/protobuf/serial_arena.h
  23. 13
      src/google/protobuf/varint_shuffle.h

17
csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
Unescape View File

@ -1,17 +0,0 @@
#region Copyright notice and license
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. 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
#endregion
namespace Google.Protobuf.Reflection;
internal sealed partial class FeatureSetDescriptor
{
// Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
private const string DefaultsBase64 =
"ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
}

4
src/google/protobuf/arena.h
Unescape View File

@ -445,9 +445,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
return new (ptr) T(static_cast<Args&&>(args)...);
}
static inline PROTOBUF_ALWAYS_INLINE T* New() {
return new T(nullptr);
}
static PROTOBUF_ALWAYS_INLINE T* New() { return new T(nullptr); }
friend class Arena;
friend class TestUtil::ReflectionTester;

14
src/google/protobuf/arena_align.h
Unescape View File

@ -72,37 +72,37 @@ struct ArenaAlignDefault {
static constexpr bool IsAligned(size_t n) { return (n & (align - 1)) == 0U; }
template <typename T>
static inline PROTOBUF_ALWAYS_INLINE bool IsAligned(T* ptr) {
static PROTOBUF_ALWAYS_INLINE bool IsAligned(T* ptr) {
return (reinterpret_cast<uintptr_t>(ptr) & (align - 1)) == 0U;
}
static inline PROTOBUF_ALWAYS_INLINE constexpr size_t Ceil(size_t n) {
static PROTOBUF_ALWAYS_INLINE constexpr size_t Ceil(size_t n) {
return (n + align - 1) & ~(align - 1);
}
static inline PROTOBUF_ALWAYS_INLINE constexpr size_t Floor(size_t n) {
static PROTOBUF_ALWAYS_INLINE constexpr size_t Floor(size_t n) {
return (n & ~(align - 1));
}
static inline PROTOBUF_ALWAYS_INLINE size_t Padded(size_t n) {
static PROTOBUF_ALWAYS_INLINE size_t Padded(size_t n) {
ABSL_ASSERT(IsAligned(n));
return n;
}
template <typename T>
static inline PROTOBUF_ALWAYS_INLINE T* Ceil(T* ptr) {
static PROTOBUF_ALWAYS_INLINE T* Ceil(T* ptr) {
uintptr_t intptr = reinterpret_cast<uintptr_t>(ptr);
return reinterpret_cast<T*>((intptr + align - 1) & ~(align - 1));
}
template <typename T>
static inline PROTOBUF_ALWAYS_INLINE T* CeilDefaultAligned(T* ptr) {
static PROTOBUF_ALWAYS_INLINE T* CeilDefaultAligned(T* ptr) {
ABSL_ASSERT(IsAligned(ptr));
return ptr;
}
// Address sanitizer enabled alignment check
template <typename T>
static inline PROTOBUF_ALWAYS_INLINE T* CheckAligned(T* ptr) {
static PROTOBUF_ALWAYS_INLINE T* CheckAligned(T* ptr) {
ABSL_ASSERT(IsAligned(ptr));
return ptr;
}

15
src/google/protobuf/arenastring.h
Unescape View File

@ -372,9 +372,9 @@ struct PROTOBUF_EXPORT ArenaStringPtr {
// Swaps internal pointers. Arena-safety semantics: this is guarded by the
// logic in Swap()/UnsafeArenaSwap() at the message level, so this method is
// 'unsafe' if called directly.
inline PROTOBUF_NDEBUG_INLINE static void InternalSwap(ArenaStringPtr* rhs,
ArenaStringPtr* lhs,
Arena* arena);
PROTOBUF_NDEBUG_INLINE static void InternalSwap(ArenaStringPtr* rhs,
ArenaStringPtr* lhs,
Arena* arena);
// Internal setter used only at parse time to directly set a donated string
// value.
@ -405,8 +405,8 @@ struct PROTOBUF_EXPORT ArenaStringPtr {
// Swaps tagged pointer without debug hardening. This is to allow python
// protobuf to maintain pointer stability even in DEBUG builds.
inline PROTOBUF_NDEBUG_INLINE static void UnsafeShallowSwap(
ArenaStringPtr* rhs, ArenaStringPtr* lhs) {
PROTOBUF_NDEBUG_INLINE static void UnsafeShallowSwap(ArenaStringPtr* rhs,
ArenaStringPtr* lhs) {
std::swap(lhs->tagged_ptr_, rhs->tagged_ptr_);
}
@ -494,8 +494,9 @@ inline void ArenaStringPtr::SetBytes(const void* p, size_t n, Arena* arena) {
Set(absl::string_view{static_cast<const char*>(p), n}, arena);
}
inline PROTOBUF_NDEBUG_INLINE void ArenaStringPtr::InternalSwap(
ArenaStringPtr* rhs, ArenaStringPtr* lhs, Arena* arena) {
PROTOBUF_NDEBUG_INLINE void ArenaStringPtr::InternalSwap(ArenaStringPtr* rhs,
ArenaStringPtr* lhs,
Arena* arena) {
// Silence unused variable warnings in release buildls.
(void)arena;
std::swap(lhs->tagged_ptr_, rhs->tagged_ptr_);

58
src/google/protobuf/compiler/cpp/field_generators/string_field.cc
Unescape View File

@ -254,35 +254,33 @@ void SingularString::GenerateAccessorDeclarations(io::Printer* p) const {
auto v3 = p->WithVars(
AnnotatedAccessors(field_, {"mutable_"}, AnnotationCollector::kAlias));
p->Emit(
{{"donated",
[&] {
if (!is_inlined()) return;
p->Emit(R"cc(
inline PROTOBUF_ALWAYS_INLINE bool _internal_$name$_donated() const;
p->Emit({{"donated",
[&] {
if (!is_inlined()) return;
p->Emit(R"cc(
PROTOBUF_ALWAYS_INLINE bool _internal_$name$_donated() const;
)cc");
}}},
R"cc(
$DEPRECATED$ const std::string& $name$() const;
//~ Using `Arg_ = const std::string&` will make the type of `arg`
//~ default to `const std::string&`, due to reference collapse. This
//~ is necessary because there are a handful of users that rely on
//~ this default.
template <typename Arg_ = const std::string&, typename... Args_>
$DEPRECATED$ void $set_name$(Arg_&& arg, Args_... args);
$DEPRECATED$ std::string* $mutable_name$();
$DEPRECATED$ PROTOBUF_NODISCARD std::string* $release_name$();
$DEPRECATED$ void $set_allocated_name$(std::string* value);
private:
const std::string& _internal_$name$() const;
PROTOBUF_ALWAYS_INLINE void _internal_set_$name$(const std::string& value);
std::string* _internal_mutable_$name$();
$donated$;
public:
)cc");
}}},
R"cc(
$DEPRECATED$ const std::string& $name$() const;
//~ Using `Arg_ = const std::string&` will make the type of `arg`
//~ default to `const std::string&`, due to reference collapse. This is
//~ necessary because there are a handful of users that rely on this
//~ default.
template <typename Arg_ = const std::string&, typename... Args_>
$DEPRECATED$ void $set_name$(Arg_&& arg, Args_... args);
$DEPRECATED$ std::string* $mutable_name$();
$DEPRECATED$ PROTOBUF_NODISCARD std::string* $release_name$();
$DEPRECATED$ void $set_allocated_name$(std::string* value);
private:
const std::string& _internal_$name$() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_$name$(
const std::string& value);
std::string* _internal_mutable_$name$();
$donated$;
public:
)cc");
}
void UpdateHasbitSet(io::Printer* p, bool is_oneof) {
@ -450,8 +448,8 @@ void SingularString::GenerateInlineAccessorDefinitions(io::Printer* p) const {
return _internal_$name_internal$();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void $Msg$::set_$name$(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void $Msg$::set_$name$(Arg_&& arg,
Args_... args) {
$WeakDescriptorSelfPin$;
$TsanDetectConcurrentMutation$;
$PrepareSplitMessageForWrite$;

38
src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc
Unescape View File

@ -220,27 +220,25 @@ void SingularStringView::GenerateAccessorDeclarations(io::Printer* p) const {
auto v2 = p->WithVars(
AnnotatedAccessors(field_, {"set_"}, AnnotationCollector::kSet));
p->Emit(
{{"donated",
[&] {
if (!is_inlined()) return;
p->Emit(R"cc(
inline PROTOBUF_ALWAYS_INLINE bool _internal_$name$_donated() const;
)cc");
}}},
R"cc(
$DEPRECATED$ absl::string_view $name$() const;
template <typename Arg_ = std::string&&>
$DEPRECATED$ void $set_name$(Arg_&& arg);
p->Emit({{"donated",
[&] {
if (!is_inlined()) return;
p->Emit(R"cc(
PROTOBUF_ALWAYS_INLINE bool _internal_$name$_donated() const;
)cc");
}}},
R"cc(
$DEPRECATED$ absl::string_view $name$() const;
template <typename Arg_ = std::string&&>
$DEPRECATED$ void $set_name$(Arg_&& arg);
private:
const std::string& _internal_$name$() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_$name$(
absl::string_view value);
$donated$;
private:
const std::string& _internal_$name$() const;
PROTOBUF_ALWAYS_INLINE void _internal_set_$name$(absl::string_view value);
$donated$;
public:
)cc");
public:
)cc");
}
void UpdateHasbitSet(io::Printer* p, bool is_oneof) {
@ -306,7 +304,7 @@ void SingularStringView::GenerateInlineAccessorDefinitions(
return _internal_$name_internal$();
}
template <typename Arg_>
inline PROTOBUF_ALWAYS_INLINE void $Msg$::set_$name$(Arg_&& arg) {
PROTOBUF_ALWAYS_INLINE void $Msg$::set_$name$(Arg_&& arg) {
$WeakDescriptorSelfPin$;
$TsanDetectConcurrentMutation$;
$PrepareSplitMessageForWrite$;

4
src/google/protobuf/compiler/cpp/message.cc
Unescape View File

@ -2918,7 +2918,7 @@ void MessageGenerator::GenerateSharedConstructorCode(io::Printer* p) {
p->Emit({{"init_impl", [&] { GenerateImplMemberInit(p, InitType::kArena); }},
{"zero_init", [&] { GenerateZeroInitFields(p); }}},
R"cc(
inline PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_(
$pbi$::InternalVisibility visibility,
::$proto_ns$::Arena* arena)
//~
@ -3327,7 +3327,7 @@ void MessageGenerator::GenerateArenaEnabledCopyConstructor(io::Printer* p) {
p->Emit(
{{"init", [&] { GenerateImplMemberInit(p, InitType::kArenaCopy); }}},
R"cc(
inline PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_(
$pbi$::InternalVisibility visibility, ::$proto_ns$::Arena* arena,
const Impl_& from, const $classtype$& from_msg)
//~

2
src/google/protobuf/compiler/java/java_features.pb.cc
Unescape View File

@ -169,7 +169,7 @@ JavaFeatures::JavaFeatures(
_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
from._internal_metadata_);
}
inline PROTOBUF_NDEBUG_INLINE JavaFeatures::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE JavaFeatures::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}

16
src/google/protobuf/compiler/plugin.pb.cc
Unescape View File

@ -324,7 +324,7 @@ Version::Version(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.Version)
}
inline PROTOBUF_NDEBUG_INLINE Version::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE Version::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::compiler::Version& from_msg)
: _has_bits_{from._has_bits_},
@ -354,7 +354,7 @@ Version::Version(
// @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.Version)
}
inline PROTOBUF_NDEBUG_INLINE Version::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE Version::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -673,7 +673,7 @@ CodeGeneratorRequest::CodeGeneratorRequest(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorRequest)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorRequest::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorRequest::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::compiler::CodeGeneratorRequest& from_msg)
: _has_bits_{from._has_bits_},
@ -703,7 +703,7 @@ CodeGeneratorRequest::CodeGeneratorRequest(
// @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorRequest)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorRequest::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorRequest::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -1096,7 +1096,7 @@ CodeGeneratorResponse_File::CodeGeneratorResponse_File(::google::protobuf::Arena
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse.File)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse_File::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse_File::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::compiler::CodeGeneratorResponse_File& from_msg)
: _has_bits_{from._has_bits_},
@ -1125,7 +1125,7 @@ CodeGeneratorResponse_File::CodeGeneratorResponse_File(
// @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorResponse.File)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse_File::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse_File::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -1451,7 +1451,7 @@ CodeGeneratorResponse::CodeGeneratorResponse(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::compiler::CodeGeneratorResponse& from_msg)
: _has_bits_{from._has_bits_},
@ -1482,7 +1482,7 @@ CodeGeneratorResponse::CodeGeneratorResponse(
// @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorResponse)
}
inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},

42
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -294,8 +294,7 @@ class PROTOC_EXPORT Version final
private:
const std::string& _internal_suffix() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_suffix(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_suffix(const std::string& value);
std::string* _internal_mutable_suffix();
public:
@ -535,8 +534,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -552,8 +550,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final
private:
const std::string& _internal_insertion_point() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_insertion_point(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_insertion_point(const std::string& value);
std::string* _internal_mutable_insertion_point();
public:
@ -569,8 +566,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final
private:
const std::string& _internal_content() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_content(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_content(const std::string& value);
std::string* _internal_mutable_content();
public:
@ -831,8 +827,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final
private:
const std::string& _internal_error() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_error(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_error(const std::string& value);
std::string* _internal_mutable_error();
public:
@ -1135,8 +1130,7 @@ class PROTOC_EXPORT CodeGeneratorRequest final
private:
const std::string& _internal_parameter() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_parameter(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_parameter(const std::string& value);
std::string* _internal_mutable_parameter();
public:
@ -1309,8 +1303,8 @@ inline const std::string& Version::suffix() const
return _internal_suffix();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void Version::set_suffix(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void Version::set_suffix(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.suffix_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -1446,8 +1440,8 @@ inline const std::string& CodeGeneratorRequest::parameter() const
return _internal_parameter();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorRequest::set_parameter(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void CodeGeneratorRequest::set_parameter(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.parameter_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -1705,8 +1699,8 @@ inline const std::string& CodeGeneratorResponse_File::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -1774,8 +1768,8 @@ inline const std::string& CodeGeneratorResponse_File::insertion_point() const
return _internal_insertion_point();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_insertion_point(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_insertion_point(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.insertion_point_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -1843,8 +1837,8 @@ inline const std::string& CodeGeneratorResponse_File::content() const
return _internal_content();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_content(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_content(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.content_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -2007,8 +2001,8 @@ inline const std::string& CodeGeneratorResponse::error() const
return _internal_error();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse::set_error(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse::set_error(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.error_.Set(static_cast<Arg_&&>(arg), args..., GetArena());

2
src/google/protobuf/cpp_features.pb.cc
Unescape View File

@ -163,7 +163,7 @@ CppFeatures::CppFeatures(
_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
from._internal_metadata_);
}
inline PROTOBUF_NDEBUG_INLINE CppFeatures::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE CppFeatures::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}

128
src/google/protobuf/descriptor.pb.cc
Unescape View File

@ -2401,7 +2401,7 @@ FileDescriptorSet::FileDescriptorSet(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorSet)
}
inline PROTOBUF_NDEBUG_INLINE FileDescriptorSet::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileDescriptorSet::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FileDescriptorSet& from_msg)
: _extensions_{visibility, arena},
@ -2425,7 +2425,7 @@ FileDescriptorSet::FileDescriptorSet(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet)
}
inline PROTOBUF_NDEBUG_INLINE FileDescriptorSet::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileDescriptorSet::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -2676,7 +2676,7 @@ FileDescriptorProto::FileDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE FileDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FileDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -2716,7 +2716,7 @@ FileDescriptorProto::FileDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE FileDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -3365,7 +3365,7 @@ DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(::google::protobu
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto.ExtensionRange)
}
inline PROTOBUF_NDEBUG_INLINE DescriptorProto_ExtensionRange::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE DescriptorProto_ExtensionRange::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::DescriptorProto_ExtensionRange& from_msg)
: _has_bits_{from._has_bits_},
@ -3398,7 +3398,7 @@ DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(
// @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange)
}
inline PROTOBUF_NDEBUG_INLINE DescriptorProto_ExtensionRange::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE DescriptorProto_ExtensionRange::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}
@ -3707,7 +3707,7 @@ DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(
_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
from._internal_metadata_);
}
inline PROTOBUF_NDEBUG_INLINE DescriptorProto_ReservedRange::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE DescriptorProto_ReservedRange::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}
@ -3963,7 +3963,7 @@ DescriptorProto::DescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE DescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE DescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::DescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -3998,7 +3998,7 @@ DescriptorProto::DescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE DescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE DescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -4571,7 +4571,7 @@ ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration(::google::p
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.ExtensionRangeOptions.Declaration)
}
inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions_Declaration::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions_Declaration::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::ExtensionRangeOptions_Declaration& from_msg)
: _has_bits_{from._has_bits_},
@ -4602,7 +4602,7 @@ ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration(
// @@protoc_insertion_point(copy_constructor:google.protobuf.ExtensionRangeOptions.Declaration)
}
inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions_Declaration::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions_Declaration::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -4944,7 +4944,7 @@ ExtensionRangeOptions::ExtensionRangeOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.ExtensionRangeOptions)
}
inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::ExtensionRangeOptions& from_msg)
: _extensions_{visibility, arena},
@ -4975,7 +4975,7 @@ ExtensionRangeOptions::ExtensionRangeOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.ExtensionRangeOptions)
}
inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -5346,7 +5346,7 @@ FieldDescriptorProto::FieldDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FieldDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE FieldDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FieldDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -5384,7 +5384,7 @@ FieldDescriptorProto::FieldDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE FieldDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -5910,7 +5910,7 @@ OneofDescriptorProto::OneofDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.OneofDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE OneofDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE OneofDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::OneofDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -5937,7 +5937,7 @@ OneofDescriptorProto::OneofDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.OneofDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE OneofDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE OneofDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -6223,7 +6223,7 @@ EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(
_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
from._internal_metadata_);
}
inline PROTOBUF_NDEBUG_INLINE EnumDescriptorProto_EnumReservedRange::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumDescriptorProto_EnumReservedRange::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}
@ -6479,7 +6479,7 @@ EnumDescriptorProto::EnumDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.EnumDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE EnumDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::EnumDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -6509,7 +6509,7 @@ EnumDescriptorProto::EnumDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE EnumDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -6899,7 +6899,7 @@ EnumValueDescriptorProto::EnumValueDescriptorProto(::google::protobuf::Arena* ar
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE EnumValueDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumValueDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::EnumValueDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -6927,7 +6927,7 @@ EnumValueDescriptorProto::EnumValueDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE EnumValueDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumValueDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -7235,7 +7235,7 @@ ServiceDescriptorProto::ServiceDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE ServiceDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ServiceDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::ServiceDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -7263,7 +7263,7 @@ ServiceDescriptorProto::ServiceDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE ServiceDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ServiceDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -7585,7 +7585,7 @@ MethodDescriptorProto::MethodDescriptorProto(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.MethodDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE MethodDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MethodDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::MethodDescriptorProto& from_msg)
: _has_bits_{from._has_bits_},
@ -7621,7 +7621,7 @@ MethodDescriptorProto::MethodDescriptorProto(
// @@protoc_insertion_point(copy_constructor:google.protobuf.MethodDescriptorProto)
}
inline PROTOBUF_NDEBUG_INLINE MethodDescriptorProto::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MethodDescriptorProto::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -8009,7 +8009,7 @@ FileOptions::FileOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FileOptions)
}
inline PROTOBUF_NDEBUG_INLINE FileOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FileOptions& from_msg)
: _extensions_{visibility, arena},
@ -8055,7 +8055,7 @@ FileOptions::FileOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FileOptions)
}
inline PROTOBUF_NDEBUG_INLINE FileOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FileOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -8874,7 +8874,7 @@ MessageOptions::MessageOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.MessageOptions)
}
inline PROTOBUF_NDEBUG_INLINE MessageOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MessageOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::MessageOptions& from_msg)
: _extensions_{visibility, arena},
@ -8910,7 +8910,7 @@ MessageOptions::MessageOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions)
}
inline PROTOBUF_NDEBUG_INLINE MessageOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MessageOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -9325,7 +9325,7 @@ FieldOptions_EditionDefault::FieldOptions_EditionDefault(::google::protobuf::Are
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions.EditionDefault)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions_EditionDefault::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions_EditionDefault::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FieldOptions_EditionDefault& from_msg)
: _has_bits_{from._has_bits_},
@ -9349,7 +9349,7 @@ FieldOptions_EditionDefault::FieldOptions_EditionDefault(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions.EditionDefault)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions_EditionDefault::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions_EditionDefault::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -9603,7 +9603,7 @@ FieldOptions_FeatureSupport::FieldOptions_FeatureSupport(::google::protobuf::Are
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions.FeatureSupport)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions_FeatureSupport::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions_FeatureSupport::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FieldOptions_FeatureSupport& from_msg)
: _has_bits_{from._has_bits_},
@ -9633,7 +9633,7 @@ FieldOptions_FeatureSupport::FieldOptions_FeatureSupport(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions.FeatureSupport)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions_FeatureSupport::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions_FeatureSupport::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -9945,7 +9945,7 @@ FieldOptions::FieldOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FieldOptions& from_msg)
: _extensions_{visibility, arena},
@ -9986,7 +9986,7 @@ FieldOptions::FieldOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions)
}
inline PROTOBUF_NDEBUG_INLINE FieldOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FieldOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -10593,7 +10593,7 @@ OneofOptions::OneofOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.OneofOptions)
}
inline PROTOBUF_NDEBUG_INLINE OneofOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE OneofOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::OneofOptions& from_msg)
: _extensions_{visibility, arena},
@ -10622,7 +10622,7 @@ OneofOptions::OneofOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.OneofOptions)
}
inline PROTOBUF_NDEBUG_INLINE OneofOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE OneofOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -10925,7 +10925,7 @@ EnumOptions::EnumOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.EnumOptions)
}
inline PROTOBUF_NDEBUG_INLINE EnumOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::EnumOptions& from_msg)
: _extensions_{visibility, arena},
@ -10961,7 +10961,7 @@ EnumOptions::EnumOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions)
}
inline PROTOBUF_NDEBUG_INLINE EnumOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -11338,7 +11338,7 @@ EnumValueOptions::EnumValueOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueOptions)
}
inline PROTOBUF_NDEBUG_INLINE EnumValueOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumValueOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::EnumValueOptions& from_msg)
: _extensions_{visibility, arena},
@ -11377,7 +11377,7 @@ EnumValueOptions::EnumValueOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions)
}
inline PROTOBUF_NDEBUG_INLINE EnumValueOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE EnumValueOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -11771,7 +11771,7 @@ ServiceOptions::ServiceOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceOptions)
}
inline PROTOBUF_NDEBUG_INLINE ServiceOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ServiceOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::ServiceOptions& from_msg)
: _extensions_{visibility, arena},
@ -11801,7 +11801,7 @@ ServiceOptions::ServiceOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions)
}
inline PROTOBUF_NDEBUG_INLINE ServiceOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE ServiceOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -12137,7 +12137,7 @@ MethodOptions::MethodOptions(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.MethodOptions)
}
inline PROTOBUF_NDEBUG_INLINE MethodOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MethodOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::MethodOptions& from_msg)
: _extensions_{visibility, arena},
@ -12173,7 +12173,7 @@ MethodOptions::MethodOptions(
// @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions)
}
inline PROTOBUF_NDEBUG_INLINE MethodOptions::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE MethodOptions::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -12541,7 +12541,7 @@ UninterpretedOption_NamePart::UninterpretedOption_NamePart(::google::protobuf::A
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption.NamePart)
}
inline PROTOBUF_NDEBUG_INLINE UninterpretedOption_NamePart::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE UninterpretedOption_NamePart::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::UninterpretedOption_NamePart& from_msg)
: _has_bits_{from._has_bits_},
@ -12565,7 +12565,7 @@ UninterpretedOption_NamePart::UninterpretedOption_NamePart(
// @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart)
}
inline PROTOBUF_NDEBUG_INLINE UninterpretedOption_NamePart::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE UninterpretedOption_NamePart::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -12826,7 +12826,7 @@ UninterpretedOption::UninterpretedOption(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption)
}
inline PROTOBUF_NDEBUG_INLINE UninterpretedOption::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE UninterpretedOption::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::UninterpretedOption& from_msg)
: _has_bits_{from._has_bits_},
@ -12859,7 +12859,7 @@ UninterpretedOption::UninterpretedOption(
// @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption)
}
inline PROTOBUF_NDEBUG_INLINE UninterpretedOption::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE UninterpretedOption::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -13276,7 +13276,7 @@ FeatureSet::FeatureSet(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSet)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSet::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSet::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FeatureSet& from_msg)
: _extensions_{visibility, arena},
@ -13307,7 +13307,7 @@ FeatureSet::FeatureSet(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FeatureSet)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSet::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSet::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -13682,7 +13682,7 @@ FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditio
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults_FeatureSetEditionDefault::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSetDefaults_FeatureSetEditionDefault::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FeatureSetDefaults_FeatureSetEditionDefault& from_msg)
: _has_bits_{from._has_bits_},
@ -13712,7 +13712,7 @@ FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditio
// @@protoc_insertion_point(copy_constructor:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults_FeatureSetEditionDefault::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSetDefaults_FeatureSetEditionDefault::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0} {}
@ -14024,7 +14024,7 @@ FeatureSetDefaults::FeatureSetDefaults(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSetDefaults)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSetDefaults::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::FeatureSetDefaults& from_msg)
: _has_bits_{from._has_bits_},
@ -14054,7 +14054,7 @@ FeatureSetDefaults::FeatureSetDefaults(
// @@protoc_insertion_point(copy_constructor:google.protobuf.FeatureSetDefaults)
}
inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE FeatureSetDefaults::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -14359,7 +14359,7 @@ SourceCodeInfo_Location::SourceCodeInfo_Location(::google::protobuf::Arena* aren
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo.Location)
}
inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo_Location::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE SourceCodeInfo_Location::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::SourceCodeInfo_Location& from_msg)
: _has_bits_{from._has_bits_},
@ -14388,7 +14388,7 @@ SourceCodeInfo_Location::SourceCodeInfo_Location(
// @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location)
}
inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo_Location::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE SourceCodeInfo_Location::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -14752,7 +14752,7 @@ SourceCodeInfo::SourceCodeInfo(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo)
}
inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE SourceCodeInfo::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::SourceCodeInfo& from_msg)
: _extensions_{visibility, arena},
@ -14776,7 +14776,7 @@ SourceCodeInfo::SourceCodeInfo(
// @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo)
}
inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE SourceCodeInfo::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _extensions_{visibility, arena},
@ -15025,7 +15025,7 @@ GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(::google::protobuf::A
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo.Annotation)
}
inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo_Annotation::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo_Annotation::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::GeneratedCodeInfo_Annotation& from_msg)
: _has_bits_{from._has_bits_},
@ -15057,7 +15057,7 @@ GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(
// @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo.Annotation)
}
inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo_Annotation::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo_Annotation::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: _cached_size_{0},
@ -15407,7 +15407,7 @@ GeneratedCodeInfo::GeneratedCodeInfo(::google::protobuf::Arena* arena)
SharedCtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo)
}
inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
const Impl_& from, const ::google::protobuf::GeneratedCodeInfo& from_msg)
: annotation_{visibility, arena, from.annotation_},
@ -15429,7 +15429,7 @@ GeneratedCodeInfo::GeneratedCodeInfo(
// @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo)
}
inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo::Impl_::Impl_(
PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo::Impl_::Impl_(
::google::protobuf::internal::InternalVisibility visibility,
::google::protobuf::Arena* arena)
: annotation_{visibility, arena},

259
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -1040,8 +1040,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final
private:
const std::string& _internal_name_part() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name_part(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name_part(const std::string& value);
std::string* _internal_mutable_name_part();
public:
@ -1316,8 +1315,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final
private:
const std::string& _internal_leading_comments() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_leading_comments(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_leading_comments(const std::string& value);
std::string* _internal_mutable_leading_comments();
public:
@ -1333,8 +1331,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final
private:
const std::string& _internal_trailing_comments() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_trailing_comments(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_trailing_comments(const std::string& value);
std::string* _internal_mutable_trailing_comments();
public:
@ -1583,8 +1580,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final
private:
const std::string& _internal_source_file() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_source_file(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_source_file(const std::string& value);
std::string* _internal_mutable_source_file();
public:
@ -1826,8 +1822,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final
private:
const std::string& _internal_deprecation_warning() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_deprecation_warning(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_deprecation_warning(const std::string& value);
std::string* _internal_mutable_deprecation_warning();
public:
@ -2065,8 +2060,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final
private:
const std::string& _internal_value() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value);
std::string* _internal_mutable_value();
public:
@ -2850,8 +2844,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final
private:
const std::string& _internal_full_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_full_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_full_name(const std::string& value);
std::string* _internal_mutable_full_name();
public:
@ -2867,8 +2860,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final
private:
const std::string& _internal_type() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_type(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_type(const std::string& value);
std::string* _internal_mutable_type();
public:
@ -3553,8 +3545,7 @@ class PROTOBUF_EXPORT UninterpretedOption final
private:
const std::string& _internal_identifier_value() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_identifier_value(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_identifier_value(const std::string& value);
std::string* _internal_mutable_identifier_value();
public:
@ -3570,8 +3561,7 @@ class PROTOBUF_EXPORT UninterpretedOption final
private:
const std::string& _internal_string_value() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(const std::string& value);
std::string* _internal_mutable_string_value();
public:
@ -3587,8 +3577,7 @@ class PROTOBUF_EXPORT UninterpretedOption final
private:
const std::string& _internal_aggregate_value() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_aggregate_value(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_aggregate_value(const std::string& value);
std::string* _internal_mutable_aggregate_value();
public:
@ -6454,8 +6443,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_java_package() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_java_package(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_java_package(const std::string& value);
std::string* _internal_mutable_java_package();
public:
@ -6471,8 +6459,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_java_outer_classname() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_java_outer_classname(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_java_outer_classname(const std::string& value);
std::string* _internal_mutable_java_outer_classname();
public:
@ -6488,8 +6475,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_go_package() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_go_package(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_go_package(const std::string& value);
std::string* _internal_mutable_go_package();
public:
@ -6505,8 +6491,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_objc_class_prefix() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_objc_class_prefix(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_objc_class_prefix(const std::string& value);
std::string* _internal_mutable_objc_class_prefix();
public:
@ -6522,8 +6507,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_csharp_namespace() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_csharp_namespace(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_csharp_namespace(const std::string& value);
std::string* _internal_mutable_csharp_namespace();
public:
@ -6539,8 +6523,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_swift_prefix() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_swift_prefix(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_swift_prefix(const std::string& value);
std::string* _internal_mutable_swift_prefix();
public:
@ -6556,8 +6539,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_php_class_prefix() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_class_prefix(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_php_class_prefix(const std::string& value);
std::string* _internal_mutable_php_class_prefix();
public:
@ -6573,8 +6555,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_php_namespace() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_namespace(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_php_namespace(const std::string& value);
std::string* _internal_mutable_php_namespace();
public:
@ -6590,8 +6571,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_php_metadata_namespace() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_metadata_namespace(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_php_metadata_namespace(const std::string& value);
std::string* _internal_mutable_php_metadata_namespace();
public:
@ -6607,8 +6587,7 @@ class PROTOBUF_EXPORT FileOptions final
private:
const std::string& _internal_ruby_package() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_ruby_package(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_ruby_package(const std::string& value);
std::string* _internal_mutable_ruby_package();
public:
@ -9376,8 +9355,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -9604,8 +9582,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -9621,8 +9598,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final
private:
const std::string& _internal_input_type() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_input_type(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_input_type(const std::string& value);
std::string* _internal_mutable_input_type();
public:
@ -9638,8 +9614,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final
private:
const std::string& _internal_output_type() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_output_type(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_output_type(const std::string& value);
std::string* _internal_mutable_output_type();
public:
@ -9952,8 +9927,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -9969,8 +9943,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
private:
const std::string& _internal_extendee() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_extendee(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_extendee(const std::string& value);
std::string* _internal_mutable_extendee();
public:
@ -9986,8 +9959,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
private:
const std::string& _internal_type_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_type_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_type_name(const std::string& value);
std::string* _internal_mutable_type_name();
public:
@ -10003,8 +9975,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
private:
const std::string& _internal_default_value() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_default_value(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_default_value(const std::string& value);
std::string* _internal_mutable_default_value();
public:
@ -10020,8 +9991,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
private:
const std::string& _internal_json_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_json_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_json_name(const std::string& value);
std::string* _internal_mutable_json_name();
public:
@ -10309,8 +10279,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -10794,8 +10763,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -11079,8 +11047,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -11457,8 +11424,7 @@ class PROTOBUF_EXPORT DescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -11826,8 +11792,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final
private:
const std::string& _internal_name() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
std::string* _internal_mutable_name();
public:
@ -11843,8 +11808,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final
private:
const std::string& _internal_package() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_package(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_package(const std::string& value);
std::string* _internal_mutable_package();
public:
@ -11860,8 +11824,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final
private:
const std::string& _internal_syntax() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_syntax(
const std::string& value);
PROTOBUF_ALWAYS_INLINE void _internal_set_syntax(const std::string& value);
std::string* _internal_mutable_syntax();
public:
@ -12423,8 +12386,8 @@ inline const std::string& FileDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -12492,8 +12455,8 @@ inline const std::string& FileDescriptorProto::package() const
return _internal_package();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_package(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_package(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.package_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -13103,8 +13066,8 @@ inline const std::string& FileDescriptorProto::syntax() const
return _internal_syntax();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_syntax(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_syntax(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.syntax_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -13421,8 +13384,8 @@ inline const std::string& DescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void DescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void DescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14025,8 +13988,8 @@ inline const std::string& ExtensionRangeOptions_Declaration::full_name() const
return _internal_full_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_full_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_full_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.full_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14094,8 +14057,8 @@ inline const std::string& ExtensionRangeOptions_Declaration::type() const
return _internal_type();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_type(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_type(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14450,8 +14413,8 @@ inline const std::string& FieldDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14605,8 +14568,8 @@ inline const std::string& FieldDescriptorProto::type_name() const
return _internal_type_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_type_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_type_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.type_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14674,8 +14637,8 @@ inline const std::string& FieldDescriptorProto::extendee() const
return _internal_extendee();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_extendee(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_extendee(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.extendee_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14743,8 +14706,8 @@ inline const std::string& FieldDescriptorProto::default_value() const
return _internal_default_value();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_default_value(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_default_value(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000008u;
_impl_.default_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -14840,8 +14803,8 @@ inline const std::string& FieldDescriptorProto::json_name() const
return _internal_json_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_json_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_json_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000010u;
_impl_.json_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -15037,8 +15000,8 @@ inline const std::string& OneofDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void OneofDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void OneofDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -15266,8 +15229,8 @@ inline const std::string& EnumDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void EnumDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void EnumDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -15597,8 +15560,8 @@ inline const std::string& EnumValueDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void EnumValueDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void EnumValueDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -15794,8 +15757,8 @@ inline const std::string& ServiceDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void ServiceDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void ServiceDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16012,8 +15975,8 @@ inline const std::string& MethodDescriptorProto::name() const
return _internal_name();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_name(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16081,8 +16044,8 @@ inline const std::string& MethodDescriptorProto::input_type() const
return _internal_input_type();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_input_type(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_input_type(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.input_type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16150,8 +16113,8 @@ inline const std::string& MethodDescriptorProto::output_type() const
return _internal_output_type();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_output_type(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_output_type(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.output_type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16375,8 +16338,8 @@ inline const std::string& FileOptions::java_package() const
return _internal_java_package();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_package(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_package(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.java_package_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16444,8 +16407,8 @@ inline const std::string& FileOptions::java_outer_classname() const
return _internal_java_outer_classname();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_outer_classname(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_outer_classname(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.java_outer_classname_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16626,8 +16589,8 @@ inline const std::string& FileOptions::go_package() const
return _internal_go_package();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_go_package(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_go_package(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.go_package_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16835,8 +16798,8 @@ inline const std::string& FileOptions::objc_class_prefix() const
return _internal_objc_class_prefix();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_objc_class_prefix(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_objc_class_prefix(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000008u;
_impl_.objc_class_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16904,8 +16867,8 @@ inline const std::string& FileOptions::csharp_namespace() const
return _internal_csharp_namespace();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_csharp_namespace(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_csharp_namespace(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000010u;
_impl_.csharp_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -16973,8 +16936,8 @@ inline const std::string& FileOptions::swift_prefix() const
return _internal_swift_prefix();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_swift_prefix(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_swift_prefix(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000020u;
_impl_.swift_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17042,8 +17005,8 @@ inline const std::string& FileOptions::php_class_prefix() const
return _internal_php_class_prefix();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_class_prefix(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_class_prefix(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000040u;
_impl_.php_class_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17111,8 +17074,8 @@ inline const std::string& FileOptions::php_namespace() const
return _internal_php_namespace();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_namespace(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_namespace(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000080u;
_impl_.php_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17180,8 +17143,8 @@ inline const std::string& FileOptions::php_metadata_namespace() const
return _internal_php_metadata_namespace();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_metadata_namespace(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_metadata_namespace(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000100u;
_impl_.php_metadata_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17249,8 +17212,8 @@ inline const std::string& FileOptions::ruby_package() const
return _internal_ruby_package();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_ruby_package(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FileOptions::set_ruby_package(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000200u;
_impl_.ruby_package_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17785,8 +17748,8 @@ inline const std::string& FieldOptions_EditionDefault::value() const
return _internal_value();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldOptions_EditionDefault::set_value(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldOptions_EditionDefault::set_value(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -17916,8 +17879,8 @@ inline const std::string& FieldOptions_FeatureSupport::deprecation_warning() con
return _internal_deprecation_warning();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void FieldOptions_FeatureSupport::set_deprecation_warning(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void FieldOptions_FeatureSupport::set_deprecation_warning(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.deprecation_warning_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -19680,8 +19643,8 @@ inline const std::string& UninterpretedOption_NamePart::name_part() const
return _internal_name_part();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption_NamePart::set_name_part(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void UninterpretedOption_NamePart::set_name_part(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.name_part_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -19830,8 +19793,8 @@ inline const std::string& UninterpretedOption::identifier_value() const
return _internal_identifier_value();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_identifier_value(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_identifier_value(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.identifier_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -19983,8 +19946,8 @@ inline const std::string& UninterpretedOption::string_value() const
return _internal_string_value();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_string_value(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_string_value(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.string_value_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
@ -20052,8 +20015,8 @@ inline const std::string& UninterpretedOption::aggregate_value() const
return _internal_aggregate_value();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_aggregate_value(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_aggregate_value(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000004u;
_impl_.aggregate_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -20729,8 +20692,8 @@ inline const std::string& SourceCodeInfo_Location::leading_comments() const
return _internal_leading_comments();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_leading_comments(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_leading_comments(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.leading_comments_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -20798,8 +20761,8 @@ inline const std::string& SourceCodeInfo_Location::trailing_comments() const
return _internal_trailing_comments();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_trailing_comments(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_trailing_comments(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000002u;
_impl_.trailing_comments_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
@ -21033,8 +20996,8 @@ inline const std::string& GeneratedCodeInfo_Annotation::source_file() const
return _internal_source_file();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void GeneratedCodeInfo_Annotation::set_source_file(Arg_&& arg,
Args_... args) {
PROTOBUF_ALWAYS_INLINE void GeneratedCodeInfo_Annotation::set_source_file(Arg_&& arg,
Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
_impl_._has_bits_[0] |= 0x00000001u;
_impl_.source_file_.Set(static_cast<Arg_&&>(arg), args..., GetArena());

4
src/google/protobuf/generated_enum_util.h
Unescape View File

@ -75,8 +75,8 @@ PROTOBUF_EXPORT bool ValidateEnum(int value, const uint32_t* data);
PROTOBUF_EXPORT std::vector<uint32_t> GenerateEnumData(
absl::Span<const int32_t> values);
inline PROTOBUF_ALWAYS_INLINE bool ValidateEnumInlined(int value,
const uint32_t* data) {
PROTOBUF_ALWAYS_INLINE bool ValidateEnumInlined(int value,
const uint32_t* data) {
const int16_t min_seq = static_cast<int16_t>(data[0] & 0xFFFF);
const uint16_t length_seq = static_cast<uint16_t>(data[0] >> 16);
uint64_t adjusted =

10
src/google/protobuf/generated_message_tctable_impl.h
Unescape View File

@ -859,7 +859,7 @@ class PROTOBUF_EXPORT TcParser final {
template <typename TagType>
PROTOBUF_CC static const char* FastEndGroupImpl(PROTOBUF_TC_PARAM_DECL);
static inline PROTOBUF_ALWAYS_INLINE void SyncHasbits(
static PROTOBUF_ALWAYS_INLINE void SyncHasbits(
MessageLite* msg, uint64_t hasbits, const TcParseTableBase* table) {
const uint32_t has_bits_offset = table->has_bits_offset;
if (has_bits_offset) {
@ -1099,7 +1099,7 @@ class PROTOBUF_EXPORT TcParser final {
};
// Dispatch to the designated parse function
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::TagDispatch(
PROTOBUF_ALWAYS_INLINE const char* TcParser::TagDispatch(
PROTOBUF_TC_PARAM_NO_DATA_DECL) {
const auto coded_tag = UnalignedLoad<uint16_t>(ptr);
const size_t idx = coded_tag & table->fast_idx_mask;
@ -1115,7 +1115,7 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::TagDispatch(
// reliably do this optimization in opt mode, but do not perform this in debug
// mode. Luckily the structure of the algorithm is such that it's always
// possible to just return and use the enclosing parse loop as a trampoline.
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ToTagDispatch(
PROTOBUF_ALWAYS_INLINE const char* TcParser::ToTagDispatch(
PROTOBUF_TC_PARAM_NO_DATA_DECL) {
constexpr bool always_return = !PROTOBUF_TAILCALL;
if (always_return || !ctx->DataAvailable(ptr)) {
@ -1124,14 +1124,14 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ToTagDispatch(
PROTOBUF_MUSTTAIL return TagDispatch(PROTOBUF_TC_PARAM_NO_DATA_PASS);
}
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ToParseLoop(
PROTOBUF_ALWAYS_INLINE const char* TcParser::ToParseLoop(
PROTOBUF_TC_PARAM_NO_DATA_DECL) {
(void)ctx;
SyncHasbits(msg, hasbits, table);
return ptr;
}
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ParseLoop(
PROTOBUF_ALWAYS_INLINE const char* TcParser::ParseLoop(
MessageLite* msg, const char* ptr, ParseContext* ctx,
const TcParseTableBase* table) {
// Note: TagDispatch uses a dispatch table at "&table->fast_entries".

61
src/google/protobuf/generated_message_tctable_lite.cc
Unescape View File

@ -390,8 +390,7 @@ PROTOBUF_NOINLINE const char* TcParser::Error(PROTOBUF_TC_PARAM_NO_DATA_DECL) {
}
template <bool export_called_function>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::MiniParse(
PROTOBUF_TC_PARAM_DECL) {
PROTOBUF_ALWAYS_INLINE const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) {
TestMiniParseResult* test_out;
if (export_called_function) {
test_out = reinterpret_cast<TestMiniParseResult*>(
@ -511,7 +510,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastEndG2(PROTOBUF_TC_PARAM_DECL) {
// Message fields
//////////////////////////////////////////////////////////////////////////////
inline PROTOBUF_ALWAYS_INLINE MessageLite* TcParser::NewMessage(
PROTOBUF_ALWAYS_INLINE MessageLite* TcParser::NewMessage(
const TcParseTableBase* table, Arena* arena) {
return table->class_data->New(arena);
}
@ -523,7 +522,7 @@ MessageLite* TcParser::AddMessage(const TcParseTableBase* table,
}
template <typename TagType, bool group_coding, bool aux_is_table>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl(
PROTOBUF_TC_PARAM_DECL) {
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 192);
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 256);
@ -605,7 +604,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastMlS2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, bool group_coding, bool aux_is_table>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedParseMessageAuxImpl(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedParseMessageAuxImpl(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -681,7 +680,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastGtR2(PROTOBUF_TC_PARAM_DECL) {
//////////////////////////////////////////////////////////////////////////////
template <typename LayoutType, typename TagType>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularFixed(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularFixed(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -711,7 +710,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastF64S2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename LayoutType, typename TagType>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedFixed(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedFixed(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -746,7 +745,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastF64R2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename LayoutType, typename TagType>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedFixed(
PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedFixed(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -786,8 +785,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastF64P2(PROTOBUF_TC_PARAM_DECL) {
namespace {
template <typename Type>
inline PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p,
Type* value) {
PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p, Type* value) {
static_assert(sizeof(Type) == 4 || sizeof(Type) == 8,
"Only [u]int32_t and [u]int64_t please");
#ifdef __aarch64__
@ -807,8 +805,7 @@ inline PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p,
// This overload is specifically for handling bool, because bools have very
// different requirements and performance opportunities than ints.
inline PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p,
bool* value) {
PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p, bool* value) {
unsigned char byte = static_cast<unsigned char>(*p++);
if (PROTOBUF_PREDICT_TRUE(byte == 0 || byte == 1)) {
// This is the code path almost always taken,
@ -877,8 +874,8 @@ inline int64_t ZigZagDecodeHelper<int64_t, true>(int64_t value) {
// Prefetch the enum data, if necessary.
// We can issue the prefetch before we start parsing the ints.
inline PROTOBUF_ALWAYS_INLINE void PrefetchEnumData(
uint16_t xform_val, TcParseTableBase::FieldAux aux) {
PROTOBUF_ALWAYS_INLINE void PrefetchEnumData(uint16_t xform_val,
TcParseTableBase::FieldAux aux) {
}
// When `xform_val` is a constant, we want to inline `ValidateEnum` because it
@ -889,8 +886,8 @@ inline PROTOBUF_ALWAYS_INLINE void PrefetchEnumData(
// way more common than the kTvEnum cases. It is also called from places that
// already have out-of-line functions (like MpVarint) so an extra out-of-line
// call to `ValidateEnum` does not affect much.
inline PROTOBUF_ALWAYS_INLINE bool EnumIsValidAux(
int32_t val, uint16_t xform_val, TcParseTableBase::FieldAux aux) {
PROTOBUF_ALWAYS_INLINE bool EnumIsValidAux(int32_t val, uint16_t xform_val,
TcParseTableBase::FieldAux aux) {
if (xform_val == field_layout::kTvRange) {
auto lo = aux.enum_range.start;
return lo <= val && val < (lo + aux.enum_range.length);
@ -905,7 +902,7 @@ inline PROTOBUF_ALWAYS_INLINE bool EnumIsValidAux(
} // namespace
template <typename FieldType, typename TagType, bool zigzag>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularVarint(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularVarint(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -966,7 +963,7 @@ PROTOBUF_NOINLINE const char* TcParser::SingularVarBigint(
}
template <typename FieldType>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::FastVarintS1(
PROTOBUF_ALWAYS_INLINE const char* TcParser::FastVarintS1(
PROTOBUF_TC_PARAM_DECL) {
using TagType = uint8_t;
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
@ -1049,7 +1046,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastZ64S2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename FieldType, typename TagType, bool zigzag>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedVarint(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedVarint(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1114,7 +1111,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastZ64R2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename FieldType, typename TagType, bool zigzag>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedVarint(
PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedVarint(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1216,7 +1213,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpUnknownEnumFallback(
}
template <typename TagType, uint16_t xform_val>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularEnum(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularEnum(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1258,7 +1255,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastEvS2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, uint16_t xform_val>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedEnum(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedEnum(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1310,7 +1307,7 @@ PROTOBUF_NOINLINE void TcParser::AddUnknownEnum(MessageLite* msg,
}
template <typename TagType, uint16_t xform_val>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedEnum(
PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedEnum(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1367,7 +1364,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastEvP2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, uint8_t min>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularEnumSmallRange(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularEnumSmallRange(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1405,7 +1402,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastEr1S2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, uint8_t min>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedEnumSmallRange(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedEnumSmallRange(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1447,7 +1444,7 @@ PROTOBUF_NOINLINE const char* TcParser::FastEr1R2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, uint8_t min>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedEnumSmallRange(
PROTOBUF_ALWAYS_INLINE const char* TcParser::PackedEnumSmallRange(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1537,7 +1534,7 @@ namespace {
// Here are overloads of ReadStringIntoArena, ReadStringNoArena and IsValidUTF8
// for every string class for which we provide fast-table parser support.
PROTOBUF_ALWAYS_INLINE inline const char* ReadStringIntoArena(
PROTOBUF_ALWAYS_INLINE const char* ReadStringIntoArena(
MessageLite* /*msg*/, const char* ptr, ParseContext* ctx,
uint32_t /*aux_idx*/, const TcParseTableBase* /*table*/,
ArenaStringPtr& field, Arena* arena) {
@ -1554,7 +1551,7 @@ const char* ReadStringNoArena(MessageLite* /*msg*/, const char* ptr,
return ctx->ReadString(ptr, size, field.MutableNoCopy(nullptr));
}
PROTOBUF_ALWAYS_INLINE inline bool IsValidUTF8(ArenaStringPtr& field) {
PROTOBUF_ALWAYS_INLINE bool IsValidUTF8(ArenaStringPtr& field) {
return utf8_range::IsStructurallyValid(field.Get());
}
@ -1575,7 +1572,7 @@ PROTOBUF_UNUSED void EnsureArenaStringIsNotDefault(const MessageLite* msg,
} // namespace
template <typename TagType, typename FieldType, TcParser::Utf8Type utf8>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularString(
PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularString(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -1684,7 +1681,7 @@ const char* TcParser::FastUcS2(PROTOBUF_TC_PARAM_DECL) {
}
template <typename TagType, typename FieldType, TcParser::Utf8Type utf8>
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedString(
PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedString(
PROTOBUF_TC_PARAM_DECL) {
if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_NO_DATA_PASS);
@ -2387,7 +2384,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpString(PROTOBUF_TC_PARAM_DECL) {
PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_NO_DATA_PASS);
}
inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ParseRepeatedStringOnce(
PROTOBUF_ALWAYS_INLINE const char* TcParser::ParseRepeatedStringOnce(
const char* ptr, SerialArena* serial_arena, ParseContext* ctx,
RepeatedPtrField<std::string>& field) {
int size = ReadSize(&ptr);
@ -2685,7 +2682,7 @@ void TcParser::WriteMapEntryAsUnknown(MessageLite* msg,
GetUnknownFieldOps(table).write_length_delimited(msg, tag >> 3, serialized);
}
PROTOBUF_ALWAYS_INLINE inline void TcParser::InitializeMapNodeEntry(
PROTOBUF_ALWAYS_INLINE void TcParser::InitializeMapNodeEntry(
void* obj, MapTypeCard type_card, UntypedMapBase& map,
const TcParseTableBase::FieldAux* aux, bool is_key) {
(void)is_key;

4
src/google/protobuf/inlined_string_field.h
Unescape View File

@ -312,7 +312,7 @@ class PROTOBUF_EXPORT InlinedStringField {
// Arena-safety semantics: this is guarded by the logic in
// Swap()/UnsafeArenaSwap() at the message level, so this method is
// 'unsafe' if called directly.
inline PROTOBUF_NDEBUG_INLINE static void InternalSwap(
PROTOBUF_NDEBUG_INLINE static void InternalSwap(
InlinedStringField* lhs, bool lhs_arena_dtor_registered,
MessageLite* lhs_msg, //
InlinedStringField* rhs, bool rhs_arena_dtor_registered,
@ -436,7 +436,7 @@ inline void InlinedStringField::SetNoArena(std::string&& value) {
get_mutable()->assign(std::move(value));
}
inline PROTOBUF_NDEBUG_INLINE void InlinedStringField::InternalSwap(
PROTOBUF_NDEBUG_INLINE void InlinedStringField::InternalSwap(
InlinedStringField* lhs, bool lhs_arena_dtor_registered,
MessageLite* lhs_msg, //
InlinedStringField* rhs, bool rhs_arena_dtor_registered,

4
src/google/protobuf/message_lite.h
Unescape View File

@ -1206,7 +1206,7 @@ inline void AssertDownCast(const MessageLite& from, const MessageLite& to) {
}
template <bool test_call, typename MessageLite>
PROTOBUF_ALWAYS_INLINE inline MessageLite* MessageCreator::PlacementNew(
PROTOBUF_ALWAYS_INLINE MessageLite* MessageCreator::PlacementNew(
const MessageLite* prototype_for_func,
const MessageLite* prototype_for_copy, void* mem, Arena* arena) const {
ABSL_DCHECK_EQ(reinterpret_cast<uintptr_t>(mem) % alignment_, 0u);
@ -1307,7 +1307,7 @@ PROTOBUF_ALWAYS_INLINE inline MessageLite* MessageCreator::PlacementNew(
}
template <bool test_call, typename MessageLite>
PROTOBUF_ALWAYS_INLINE inline MessageLite* MessageCreator::New(
PROTOBUF_ALWAYS_INLINE MessageLite* MessageCreator::New(
const MessageLite* prototype_for_func,
const MessageLite* prototype_for_copy, Arena* arena) const {
return PlacementNew<test_call>(prototype_for_func, prototype_for_copy,

34
src/google/protobuf/parse_context.h
Unescape View File

@ -731,26 +731,24 @@ inline const char* VarintParseSlow(const char* p, uint32_t res, uint64_t* out) {
// Falsely indicate that the specific value is modified at this location. This
// prevents code which depends on this value from being scheduled earlier.
template <typename V1Type>
PROTOBUF_ALWAYS_INLINE inline V1Type ValueBarrier(V1Type value1) {
PROTOBUF_ALWAYS_INLINE V1Type ValueBarrier(V1Type value1) {
asm("" : "+r"(value1));
return value1;
}
template <typename V1Type, typename V2Type>
PROTOBUF_ALWAYS_INLINE inline V1Type ValueBarrier(V1Type value1,
V2Type value2) {
PROTOBUF_ALWAYS_INLINE V1Type ValueBarrier(V1Type value1, V2Type value2) {
asm("" : "+r"(value1) : "r"(value2));
return value1;
}
// Performs a 7 bit UBFX (Unsigned Bit Extract) starting at the indicated bit.
static PROTOBUF_ALWAYS_INLINE inline uint64_t Ubfx7(uint64_t data,
uint64_t start) {
static PROTOBUF_ALWAYS_INLINE uint64_t Ubfx7(uint64_t data, uint64_t start) {
return ValueBarrier((data >> start) & 0x7f);
}
PROTOBUF_ALWAYS_INLINE inline uint64_t ExtractAndMergeTwoChunks(
uint64_t data, uint64_t first_byte) {
PROTOBUF_ALWAYS_INLINE uint64_t ExtractAndMergeTwoChunks(uint64_t data,
uint64_t first_byte) {
ABSL_DCHECK_LE(first_byte, 6U);
uint64_t first = Ubfx7(data, first_byte * 8);
uint64_t second = Ubfx7(data, (first_byte + 1) * 8);
@ -768,8 +766,8 @@ struct SlowPathEncodedInfo {
// Performs multiple actions which are identical between 32 and 64 bit Varints
// in order to compute the length of the encoded Varint and compute the new
// of p.
PROTOBUF_ALWAYS_INLINE inline SlowPathEncodedInfo ComputeLengthAndUpdateP(
const char* p) {
PROTOBUF_ALWAYS_INLINE SlowPathEncodedInfo
ComputeLengthAndUpdateP(const char* p) {
SlowPathEncodedInfo result;
// Load the last two bytes of the encoded Varint.
std::memcpy(&result.last8, p + 2, sizeof(result.last8));
@ -793,8 +791,8 @@ PROTOBUF_ALWAYS_INLINE inline SlowPathEncodedInfo ComputeLengthAndUpdateP(
return result;
}
inline PROTOBUF_ALWAYS_INLINE std::pair<const char*, uint64_t>
VarintParseSlowArm64(const char* p, uint64_t first8) {
PROTOBUF_ALWAYS_INLINE std::pair<const char*, uint64_t> VarintParseSlowArm64(
const char* p, uint64_t first8) {
constexpr uint64_t kResultMaskUnshifted = 0xffffffffffffc000ULL;
constexpr uint64_t kFirstResultBitChunk2 = 2 * 7;
constexpr uint64_t kFirstResultBitChunk4 = 4 * 7;
@ -835,8 +833,8 @@ VarintParseSlowArm64(const char* p, uint64_t first8) {
// See comments in VarintParseSlowArm64 for a description of the algorithm.
// Differences in the 32 bit version are noted below.
inline PROTOBUF_ALWAYS_INLINE std::pair<const char*, uint32_t>
VarintParseSlowArm32(const char* p, uint64_t first8) {
PROTOBUF_ALWAYS_INLINE std::pair<const char*, uint32_t> VarintParseSlowArm32(
const char* p, uint64_t first8) {
constexpr uint64_t kResultMaskUnshifted = 0xffffffffffffc000ULL;
constexpr uint64_t kFirstResultBitChunk1 = 1 * 7;
constexpr uint64_t kFirstResultBitChunk3 = 3 * 7;
@ -947,7 +945,7 @@ PROTOBUF_NODISCARD PROTOBUF_ALWAYS_INLINE constexpr T RotateLeft(
static_cast<T>(x >> ((-s) & (std::numeric_limits<T>::digits - 1)));
}
PROTOBUF_NODISCARD inline PROTOBUF_ALWAYS_INLINE uint64_t
PROTOBUF_NODISCARD PROTOBUF_ALWAYS_INLINE uint64_t
RotRight7AndReplaceLowByte(uint64_t res, const char& byte) {
// TODO: remove the inline assembly
#if defined(__x86_64__) && defined(__GNUC__)
@ -970,8 +968,8 @@ RotRight7AndReplaceLowByte(uint64_t res, const char& byte) {
return res;
}
inline PROTOBUF_ALWAYS_INLINE const char* ReadTagInlined(const char* ptr,
uint32_t* out) {
PROTOBUF_ALWAYS_INLINE const char* ReadTagInlined(const char* ptr,
uint32_t* out) {
uint64_t res = 0xFF & ptr[0];
if (PROTOBUF_PREDICT_FALSE(res >= 128)) {
res = RotRight7AndReplaceLowByte(res, ptr[1]);
@ -1106,7 +1104,7 @@ inline int32_t ReadVarintZigZag32(const char** p) {
}
template <typename Func>
PROTOBUF_NODISCARD inline PROTOBUF_ALWAYS_INLINE const char*
PROTOBUF_NODISCARD PROTOBUF_ALWAYS_INLINE const char*
ParseContext::ParseLengthDelimitedInlined(const char* ptr, const Func& func) {
LimitToken old;
ptr = ReadSizeAndPushLimitAndDepthInlined(ptr, &old);
@ -1120,7 +1118,7 @@ ParseContext::ParseLengthDelimitedInlined(const char* ptr, const Func& func) {
}
template <typename Func>
PROTOBUF_NODISCARD inline PROTOBUF_ALWAYS_INLINE const char*
PROTOBUF_NODISCARD PROTOBUF_ALWAYS_INLINE const char*
ParseContext::ParseGroupInlined(const char* ptr, uint32_t start_tag,
const Func& func) {
if (--depth_ < 0) return nullptr;

25
src/google/protobuf/port.h
Unescape View File

@ -43,7 +43,7 @@ namespace internal {
struct MessageTraitsImpl;
template <typename T>
inline PROTOBUF_ALWAYS_INLINE void StrongPointer(T* var) {
PROTOBUF_ALWAYS_INLINE void StrongPointer(T* var) {
#if defined(__GNUC__)
asm("" : : "r"(var));
#else
@ -57,14 +57,14 @@ inline PROTOBUF_ALWAYS_INLINE void StrongPointer(T* var) {
// Optimized implementation for clang where we can generate a relocation without
// adding runtime instructions.
template <typename T, T ptr>
inline PROTOBUF_ALWAYS_INLINE void StrongPointer() {
PROTOBUF_ALWAYS_INLINE void StrongPointer() {
// This injects a relocation in the code path without having to run code, but
// we can only do it with a newer clang.
asm(".reloc ., BFD_RELOC_NONE, %p0" ::"Ws"(ptr));
}
template <typename T, typename TraitsImpl = MessageTraitsImpl>
inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
static constexpr auto ptr =
decltype(TraitsImpl::template value<T>)::StrongPointer();
// This is identical to the implementation of StrongPointer() above, but it
@ -76,12 +76,12 @@ inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
// Portable fallback. It usually generates a single LEA instruction or
// equivalent.
template <typename T, T ptr>
inline PROTOBUF_ALWAYS_INLINE void StrongPointer() {
PROTOBUF_ALWAYS_INLINE void StrongPointer() {
StrongPointer(ptr);
}
template <typename T, typename TraitsImpl = MessageTraitsImpl>
inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() {
return StrongPointer(
decltype(TraitsImpl::template value<T>)::StrongPointer());
}
@ -323,7 +323,7 @@ inline constexpr bool IsLazyParsingSupported() {
// past the end of message/valid memory, however we are doing this
// inside inline asm block, since computing the invalid pointer
// is a potential UB. Only insert prefetch once per function,
inline PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom7Lines(const void* ptr) {
PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom7Lines(const void* ptr) {
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 448);
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 512);
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 576);
@ -332,7 +332,7 @@ inline PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom7Lines(const void* ptr) {
}
// Prefetch 5 64-byte cache lines starting from 1 cache-line ahead.
inline PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom1Line(const void* ptr) {
PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom1Line(const void* ptr) {
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 64);
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 128);
PROTOBUF_PREFETCH_WITH_OFFSET(ptr, 192);
@ -341,8 +341,7 @@ inline PROTOBUF_ALWAYS_INLINE void Prefetch5LinesFrom1Line(const void* ptr) {
}
#if defined(NDEBUG) && ABSL_HAVE_BUILTIN(__builtin_unreachable)
[[noreturn]] ABSL_ATTRIBUTE_COLD PROTOBUF_ALWAYS_INLINE inline void
Unreachable() {
[[noreturn]] ABSL_ATTRIBUTE_COLD PROTOBUF_ALWAYS_INLINE void Unreachable() {
__builtin_unreachable();
}
#elif ABSL_HAVE_BUILTIN(__builtin_FILE) && ABSL_HAVE_BUILTIN(__builtin_LINE)
@ -360,7 +359,7 @@ Unreachable() {
// TODO: it would be preferable to use __tsan_external_read/
// __tsan_external_write, but they can cause dlopen issues.
template <typename T>
inline PROTOBUF_ALWAYS_INLINE void TSanRead(const T* impl) {
PROTOBUF_ALWAYS_INLINE void TSanRead(const T* impl) {
char protobuf_tsan_dummy =
*reinterpret_cast<const char*>(&impl->_tsan_detect_race);
asm volatile("" : "+r"(protobuf_tsan_dummy));
@ -370,12 +369,12 @@ inline PROTOBUF_ALWAYS_INLINE void TSanRead(const T* impl) {
// member is not important. We can unconditionally write to it without affecting
// correctness of the rest of the class.
template <typename T>
inline PROTOBUF_ALWAYS_INLINE void TSanWrite(T* impl) {
PROTOBUF_ALWAYS_INLINE void TSanWrite(T* impl) {
*reinterpret_cast<char*>(&impl->_tsan_detect_race) = 0;
}
#else
inline PROTOBUF_ALWAYS_INLINE void TSanRead(const void*) {}
inline PROTOBUF_ALWAYS_INLINE void TSanWrite(const void*) {}
PROTOBUF_ALWAYS_INLINE void TSanRead(const void*) {}
PROTOBUF_ALWAYS_INLINE void TSanWrite(const void*) {}
#endif
// This trampoline allows calling from codegen without needing a #include to

10
src/google/protobuf/port_def.inc
Unescape View File

@ -162,13 +162,13 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#endif
// For functions we want to force inline.
#if defined(PROTOBUF_NO_INLINE)
# define PROTOBUF_ALWAYS_INLINE
#define PROTOBUF_ALWAYS_INLINE inline
#elif defined(__GNUC__)
# define PROTOBUF_ALWAYS_INLINE __attribute__((always_inline))
#define PROTOBUF_ALWAYS_INLINE inline __attribute__((always_inline))
#elif defined(_MSC_VER)
# define PROTOBUF_ALWAYS_INLINE __forceinline
#define PROTOBUF_ALWAYS_INLINE inline __forceinline
#else
# define PROTOBUF_ALWAYS_INLINE
#define PROTOBUF_ALWAYS_INLINE inline
#endif
#ifdef PROTOBUF_ALWAYS_INLINE_CALL
@ -196,7 +196,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#if defined(NDEBUG) || (defined(_MSC_VER) && !defined(_DEBUG))
# define PROTOBUF_NDEBUG_INLINE PROTOBUF_ALWAYS_INLINE
#else
# define PROTOBUF_NDEBUG_INLINE
#define PROTOBUF_NDEBUG_INLINE inline
#endif
// Note that PROTOBUF_NOINLINE is an attribute applied to functions, to prevent

9
src/google/protobuf/serial_arena.h
Unescape View File

@ -131,8 +131,7 @@ class PROTOBUF_EXPORT SerialArena {
}
private:
static inline PROTOBUF_ALWAYS_INLINE constexpr size_t AlignUpTo(size_t n,
size_t a) {
static PROTOBUF_ALWAYS_INLINE constexpr size_t AlignUpTo(size_t n, size_t a) {
// We are wasting space by over allocating align - 8 bytes. Compared to a
// dedicated function that takes current alignment in consideration. Such a
// scheme would only waste (align - 8)/2 bytes on average, but requires a
@ -141,7 +140,7 @@ class PROTOBUF_EXPORT SerialArena {
return a <= 8 ? ArenaAlignDefault::Ceil(n) : ArenaAlignAs(a).Padded(n);
}
static inline PROTOBUF_ALWAYS_INLINE void* AlignTo(void* p, size_t a) {
static PROTOBUF_ALWAYS_INLINE void* AlignTo(void* p, size_t a) {
return (a <= ArenaAlignDefault::align)
? ArenaAlignDefault::CeilDefaultAligned(p)
: ArenaAlignAs(a).CeilDefaultAligned(p);
@ -409,7 +408,7 @@ class PROTOBUF_EXPORT SerialArena {
CachedBlock** cached_blocks_ = nullptr;
};
inline PROTOBUF_ALWAYS_INLINE bool SerialArena::MaybeAllocateString(void*& p) {
PROTOBUF_ALWAYS_INLINE bool SerialArena::MaybeAllocateString(void*& p) {
// Check how many unused instances are in the current block.
size_t unused_bytes = string_block_unused_.load(std::memory_order_relaxed);
if (PROTOBUF_PREDICT_TRUE(unused_bytes != 0)) {
@ -421,7 +420,7 @@ inline PROTOBUF_ALWAYS_INLINE bool SerialArena::MaybeAllocateString(void*& p) {
return false;
}
ABSL_ATTRIBUTE_RETURNS_NONNULL inline PROTOBUF_ALWAYS_INLINE void*
ABSL_ATTRIBUTE_RETURNS_NONNULL PROTOBUF_ALWAYS_INLINE void*
SerialArena::AllocateFromStringBlock() {
void* p;
if (ABSL_PREDICT_TRUE(MaybeAllocateString(p))) return p;

13
src/google/protobuf/varint_shuffle.h
Unescape View File

@ -23,7 +23,7 @@ namespace internal {
// Shifts "byte" left by n * 7 bits, filling vacated bits from `ones`.
template <int n>
inline PROTOBUF_ALWAYS_INLINE int64_t VarintShlByte(int8_t byte, int64_t ones) {
PROTOBUF_ALWAYS_INLINE int64_t VarintShlByte(int8_t byte, int64_t ones) {
return static_cast<int64_t>((static_cast<uint64_t>(byte) << n * 7) |
(static_cast<uint64_t>(ones) >> (64 - n * 7)));
}
@ -32,8 +32,8 @@ inline PROTOBUF_ALWAYS_INLINE int64_t VarintShlByte(int8_t byte, int64_t ones) {
// bitwise ANDs the resulting value into the input/output `res` parameter.
// Returns true if the result was not negative.
template <int n>
inline PROTOBUF_ALWAYS_INLINE bool VarintShlAnd(int8_t byte, int64_t ones,
int64_t& res) {
PROTOBUF_ALWAYS_INLINE bool VarintShlAnd(int8_t byte, int64_t ones,
int64_t& res) {
res &= VarintShlByte<n>(byte, ones);
return res >= 0;
}
@ -42,15 +42,14 @@ inline PROTOBUF_ALWAYS_INLINE bool VarintShlAnd(int8_t byte, int64_t ones,
// puts the new value in the output only parameter `res`.
// Returns true if the result was not negative.
template <int n>
inline PROTOBUF_ALWAYS_INLINE bool VarintShl(int8_t byte, int64_t ones,
int64_t& res) {
PROTOBUF_ALWAYS_INLINE bool VarintShl(int8_t byte, int64_t ones, int64_t& res) {
res = VarintShlByte<n>(byte, ones);
return res >= 0;
}
template <typename VarintType, int limit = 10>
inline PROTOBUF_ALWAYS_INLINE const char* ShiftMixParseVarint(const char* p,
int64_t& res1) {
PROTOBUF_ALWAYS_INLINE const char* ShiftMixParseVarint(const char* p,
int64_t& res1) {
using Signed = std::make_signed_t<VarintType>;
constexpr bool kIs64BitVarint = std::is_same<Signed, int64_t>::value;
constexpr bool kIs32BitVarint = std::is_same<Signed, int32_t>::value;

Write Preview
Loading…
Cancel
Save