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

Move the `mutable` keyword into `CachedSize` to avoid spreading it all over.

Browse Source 
Makes the abstraction simpler to use.

It has no effect in compiled code.

PiperOrigin-RevId: 653655703
pull/17515/head
Protobuf Team Bot 4 months ago committed by Copybara-Service
parent a6a0680e95
commit 22863e1dfd
15 changed files with 65 additions and 69 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. 2
      src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
  2. 2
      src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
  3. 4
      src/google/protobuf/compiler/cpp/message.cc
  4. 2
      src/google/protobuf/compiler/java/java_features.pb.h
  5. 8
      src/google/protobuf/compiler/plugin.pb.h
  6. 2
      src/google/protobuf/cpp_features.pb.h
  7. 72
      src/google/protobuf/descriptor.pb.h
  8. 2
      src/google/protobuf/dynamic_message.cc
  9. 2
      src/google/protobuf/generated_message_bases.h
  10. 2
      src/google/protobuf/implicit_weak_message.h
  11. 2
      src/google/protobuf/map_entry.h
  12. 4
      src/google/protobuf/message.cc
  13. 8
      src/google/protobuf/message.h
  14. 8
      src/google/protobuf/message_lite.cc
  15. 14
      src/google/protobuf/message_lite.h

2
src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
Unescape View File

@ -241,7 +241,7 @@ class RepeatedEnum : public FieldGeneratorBase {
if (has_cached_size_) {
p->Emit(R"cc(
mutable $pbi$::CachedSize $cached_size_name$;
$pbi$::CachedSize $cached_size_name$;
)cc");
}
}

2
src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
Unescape View File

@ -437,7 +437,7 @@ void RepeatedPrimitive::GeneratePrivateMembers(io::Printer* p) const {
if (HasCachedSize()) {
p->Emit({{"_cached_size_", MakeVarintCachedSizeName(field_)}},
R"cc(
mutable $pbi$::CachedSize $_cached_size_$;
$pbi$::CachedSize $_cached_size_$;
)cc");
}
}

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

@ -1367,7 +1367,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) {
)cc");
if (need_to_emit_cached_size) {
p->Emit(R"cc(
mutable ::$proto_ns$::internal::CachedSize _cached_size_;
::$proto_ns$::internal::CachedSize _cached_size_;
)cc");
need_to_emit_cached_size = false;
}
@ -1437,7 +1437,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) {
need_to_emit_cached_size = false;
p->Emit(R"cc(
mutable ::$proto_ns$::internal::CachedSize _cached_size_;
::$proto_ns$::internal::CachedSize _cached_size_;
)cc");
}},
{"oneof_case",

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

@ -309,7 +309,7 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message
::google::protobuf::Arena* arena, const Impl_& from,
const JavaFeatures& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
bool legacy_closed_enum_;
int utf8_validation_;
PROTOBUF_TSAN_DECLARE_MEMBER

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

@ -336,7 +336,7 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message
::google::protobuf::Arena* arena, const Impl_& from,
const Version& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr suffix_;
::int32_t major_;
::int32_t minor_;
@ -585,7 +585,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf
::google::protobuf::Arena* arena, const Impl_& from,
const CodeGeneratorResponse_File& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::internal::ArenaStringPtr insertion_point_;
::google::protobuf::internal::ArenaStringPtr content_;
@ -857,7 +857,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes
::google::protobuf::Arena* arena, const Impl_& from,
const CodeGeneratorResponse& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::compiler::CodeGeneratorResponse_File > file_;
::google::protobuf::internal::ArenaStringPtr error_;
::uint64_t supported_features_;
@ -1135,7 +1135,7 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess
::google::protobuf::Arena* arena, const Impl_& from,
const CodeGeneratorRequest& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField<std::string> file_to_generate_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > proto_file_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > source_file_descriptors_;

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

@ -311,7 +311,7 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message
::google::protobuf::Arena* arena, const Impl_& from,
const CppFeatures& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
bool legacy_closed_enum_;
int string_type_;
PROTOBUF_TSAN_DECLARE_MEMBER

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

@ -903,7 +903,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot
::google::protobuf::Arena* arena, const Impl_& from,
const UninterpretedOption_NamePart& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_part_;
bool is_extension_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -1177,11 +1177,11 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf:
::google::protobuf::Arena* arena, const Impl_& from,
const SourceCodeInfo_Location& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedField<::int32_t> path_;
mutable ::google::protobuf::internal::CachedSize _path_cached_byte_size_;
::google::protobuf::internal::CachedSize _path_cached_byte_size_;
::google::protobuf::RepeatedField<::int32_t> span_;
mutable ::google::protobuf::internal::CachedSize _span_cached_byte_size_;
::google::protobuf::internal::CachedSize _span_cached_byte_size_;
::google::protobuf::RepeatedPtrField<std::string> leading_detached_comments_;
::google::protobuf::internal::ArenaStringPtr leading_comments_;
::google::protobuf::internal::ArenaStringPtr trailing_comments_;
@ -1452,9 +1452,9 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot
::google::protobuf::Arena* arena, const Impl_& from,
const GeneratedCodeInfo_Annotation& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedField<::int32_t> path_;
mutable ::google::protobuf::internal::CachedSize _path_cached_byte_size_;
::google::protobuf::internal::CachedSize _path_cached_byte_size_;
::google::protobuf::internal::ArenaStringPtr source_file_;
::int32_t begin_;
::int32_t end_;
@ -1687,7 +1687,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto
::google::protobuf::Arena* arena, const Impl_& from,
const FieldOptions_FeatureSupport& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr deprecation_warning_;
int edition_introduced_;
int edition_deprecated_;
@ -1896,7 +1896,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto
::google::protobuf::Arena* arena, const Impl_& from,
const FieldOptions_EditionDefault& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr value_;
int edition_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -2451,7 +2451,7 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message
const FeatureSet& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
int field_presence_;
int enum_type_;
int repeated_field_encoding_;
@ -2704,7 +2704,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google:
::google::protobuf::Arena* arena, const Impl_& from,
const ExtensionRangeOptions_Declaration& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr full_name_;
::google::protobuf::internal::ArenaStringPtr type_;
::int32_t number_;
@ -2908,7 +2908,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo
::google::protobuf::Arena* arena, const Impl_& from,
const EnumDescriptorProto_EnumReservedRange& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::int32_t start_;
::int32_t end_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -3109,7 +3109,7 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro
::google::protobuf::Arena* arena, const Impl_& from,
const DescriptorProto_ReservedRange& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::int32_t start_;
::int32_t end_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -3400,7 +3400,7 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes
::google::protobuf::Arena* arena, const Impl_& from,
const UninterpretedOption& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart > name_;
::google::protobuf::internal::ArenaStringPtr identifier_value_;
::google::protobuf::internal::ArenaStringPtr string_value_;
@ -3601,7 +3601,7 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message
::google::protobuf::Arena* arena, const Impl_& from,
const SourceCodeInfo& from_msg);
::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location > location_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
PROTOBUF_TSAN_DECLARE_MEMBER
};
union { Impl_ _impl_; };
@ -3795,7 +3795,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa
::google::protobuf::Arena* arena, const Impl_& from,
const GeneratedCodeInfo& from_msg);
::google::protobuf::RepeatedPtrField< ::google::protobuf::GeneratedCodeInfo_Annotation > annotation_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
PROTOBUF_TSAN_DECLARE_MEMBER
};
union { Impl_ _impl_; };
@ -4019,7 +4019,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public
::google::protobuf::Arena* arena, const Impl_& from,
const FeatureSetDefaults_FeatureSetEditionDefault& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::FeatureSet* overridable_features_;
::google::protobuf::FeatureSet* fixed_features_;
int edition_;
@ -4428,7 +4428,7 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message
const ServiceOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
bool deprecated_;
@ -4825,7 +4825,7 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message
const OneofOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -5265,7 +5265,7 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message
const MethodOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
bool deprecated_;
@ -5723,7 +5723,7 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message
const MessageOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
bool message_set_wire_format_;
@ -6432,7 +6432,7 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message
const FileOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::internal::ArenaStringPtr java_package_;
::google::protobuf::internal::ArenaStringPtr java_outer_classname_;
@ -7098,7 +7098,7 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message
const FieldOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedField<int> targets_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldOptions_EditionDefault > edition_defaults_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
@ -7335,7 +7335,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess
::google::protobuf::Arena* arena, const Impl_& from,
const FeatureSetDefaults& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::FeatureSetDefaults_FeatureSetEditionDefault > defaults_;
int minimum_edition_;
int maximum_edition_;
@ -7782,7 +7782,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M
const ExtensionRangeOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::ExtensionRangeOptions_Declaration > declaration_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
@ -8220,7 +8220,7 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag
const EnumValueOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
::google::protobuf::FieldOptions_FeatureSupport* feature_support_;
@ -8655,7 +8655,7 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message
const EnumOptions& from_msg);
::google::protobuf::internal::ExtensionSet _extensions_;
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
::google::protobuf::FeatureSet* features_;
bool allow_alias_;
@ -8874,7 +8874,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me
::google::protobuf::Arena* arena, const Impl_& from,
const OneofDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::OneofOptions* options_;
PROTOBUF_TSAN_DECLARE_MEMBER
@ -9150,7 +9150,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M
::google::protobuf::Arena* arena, const Impl_& from,
const MethodDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::internal::ArenaStringPtr input_type_;
::google::protobuf::internal::ArenaStringPtr output_type_;
@ -9557,7 +9557,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me
::google::protobuf::Arena* arena, const Impl_& from,
const FieldDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::internal::ArenaStringPtr extendee_;
::google::protobuf::internal::ArenaStringPtr type_name_;
@ -9794,7 +9794,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf
::google::protobuf::Arena* arena, const Impl_& from,
const EnumValueDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::EnumValueOptions* options_;
::int32_t number_;
@ -10017,7 +10017,7 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr
::google::protobuf::Arena* arena, const Impl_& from,
const DescriptorProto_ExtensionRange& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::ExtensionRangeOptions* options_;
::int32_t start_;
::int32_t end_;
@ -10252,7 +10252,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf::
::google::protobuf::Arena* arena, const Impl_& from,
const ServiceDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;
::google::protobuf::internal::ArenaStringPtr name_;
::google::protobuf::ServiceOptions* options_;
@ -10529,7 +10529,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes
::google::protobuf::Arena* arena, const Impl_& from,
const EnumDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto_EnumReservedRange > reserved_range_;
::google::protobuf::RepeatedPtrField<std::string> reserved_name_;
@ -10899,7 +10899,7 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message
::google::protobuf::Arena* arena, const Impl_& from,
const DescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > field_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto > nested_type_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
@ -11320,7 +11320,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes
::google::protobuf::Arena* arena, const Impl_& from,
const FileDescriptorProto& from_msg);
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::RepeatedPtrField<std::string> dependency_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto > message_type_;
::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
@ -11531,7 +11531,7 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa
::google::protobuf::Arena* arena, const Impl_& from,
const FileDescriptorSet& from_msg);
::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::internal::CachedSize _cached_size_;
PROTOBUF_TSAN_DECLARE_MEMBER
};
union { Impl_ _impl_; };

2
src/google/protobuf/dynamic_message.cc
Unescape View File

@ -246,7 +246,7 @@ class DynamicMessage final : public Message {
void* MutableOneofFieldRaw(const FieldDescriptor* f);
const DynamicMessageFactory::TypeInfo* type_info_;
mutable internal::CachedSize cached_byte_size_;
internal::CachedSize cached_byte_size_;
};
struct DynamicMessageFactory::TypeInfo {

2
src/google/protobuf/generated_message_bases.h
Unescape View File

@ -51,7 +51,7 @@ class PROTOBUF_EXPORT ZeroFieldsBase : public Message {
io::EpsCopyOutputStream* stream);
struct {
mutable internal::CachedSize _cached_size_;
internal::CachedSize _cached_size_;
} _impl_;
};

2
src/google/protobuf/implicit_weak_message.h
Unescape View File

@ -110,7 +110,7 @@ class PROTOBUF_EXPORT ImplicitWeakMessage final : public MessageLite {
// the default instance can be constant-initialized. In the const methods, we
// have to handle the possibility of data_ being null.
std::string* data_;
mutable google::protobuf::internal::CachedSize cached_size_{};
google::protobuf::internal::CachedSize cached_size_{};
};
struct ImplicitWeakMessageDefaultType;

2
src/google/protobuf/map_entry.h
Unescape View File

@ -116,7 +116,7 @@ class MapEntry : public Message {
// sharing easier.
struct {
HasBits<1> _has_bits_{};
mutable CachedSize _cached_size_{};
CachedSize _cached_size_{};
KeyOnMemory key_{KeyTypeHandler::Constinit()};
ValueOnMemory value_{ValueTypeHandler::Constinit()};

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

@ -185,7 +185,7 @@ size_t Message::ByteSizeLong() const {
#endif // !PROTOBUF_CUSTOM_VTABLE
size_t Message::ComputeUnknownFieldsSize(
size_t total_size, internal::CachedSize* cached_size) const {
size_t total_size, const internal::CachedSize* cached_size) const {
total_size += WireFormat::ComputeUnknownFieldsSize(
_internal_metadata_.unknown_fields<UnknownFieldSet>(
UnknownFieldSet::default_instance));
@ -194,7 +194,7 @@ size_t Message::ComputeUnknownFieldsSize(
}
size_t Message::MaybeComputeUnknownFieldsSize(
size_t total_size, internal::CachedSize* cached_size) const {
size_t total_size, const internal::CachedSize* cached_size) const {
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
return ComputeUnknownFieldsSize(total_size, cached_size);
}

8
src/google/protobuf/message.h
Unescape View File

@ -383,10 +383,10 @@ class PROTOBUF_EXPORT Message : public MessageLite {
// For CODE_SIZE types
static bool IsInitializedImpl(const MessageLite&);
size_t ComputeUnknownFieldsSize(size_t total_size,
internal::CachedSize* cached_size) const;
size_t MaybeComputeUnknownFieldsSize(size_t total_size,
internal::CachedSize* cached_size) const;
size_t ComputeUnknownFieldsSize(
size_t total_size, const internal::CachedSize* cached_size) const;
size_t MaybeComputeUnknownFieldsSize(
size_t total_size, const internal::CachedSize* cached_size) const;
// Reflection based version for reflection based types.
static absl::string_view GetTypeNameImpl(const ClassData* data);

8
src/google/protobuf/message_lite.cc
Unescape View File

@ -139,14 +139,6 @@ std::string MessageLite::DebugString() const {
int MessageLite::GetCachedSize() const { return AccessCachedSize().Get(); }
internal::CachedSize& MessageLite::AccessCachedSize() const {
auto* data = GetClassData();
ABSL_DCHECK(data != nullptr);
ABSL_DCHECK(data->cached_size_offset != 0);
return *reinterpret_cast<internal::CachedSize*>(const_cast<char*>(
reinterpret_cast<const char*>(this) + data->cached_size_offset));
}
namespace {
// When serializing, we first compute the byte size, then serialize the message.

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

@ -95,7 +95,7 @@ class PROTOBUF_EXPORT CachedSize {
return __atomic_load_n(&atom_, __ATOMIC_RELAXED);
}
void Set(Scalar desired) noexcept {
void Set(Scalar desired) const noexcept {
__atomic_store_n(&atom_, desired, __ATOMIC_RELAXED);
}
#else
@ -109,16 +109,16 @@ class PROTOBUF_EXPORT CachedSize {
return atom_.load(std::memory_order_relaxed);
}
void Set(Scalar desired) noexcept {
void Set(Scalar desired) const noexcept {
atom_.store(desired, std::memory_order_relaxed);
}
#endif
private:
#if PROTOBUF_BUILTIN_ATOMIC
Scalar atom_;
mutable Scalar atom_;
#else
std::atomic<Scalar> atom_;
mutable std::atomic<Scalar> atom_;
#endif
};
@ -770,7 +770,11 @@ class PROTOBUF_EXPORT MessageLite {
// Return the cached size object as described by
// ClassData::cached_size_offset.
internal::CachedSize& AccessCachedSize() const;
const internal::CachedSize& AccessCachedSize() const {
return *reinterpret_cast<const internal::CachedSize*>(
reinterpret_cast<const char*>(this) +
GetClassData()->cached_size_offset);
}
public:
enum ParseFlags {

Write Preview
Loading…
Cancel
Save