From 9d0821319d2be8b65357b58d0e0c821c93dc43d9 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Wed, 18 Jan 2023 23:37:08 +0000
Subject: [PATCH] Auto-generate files after cl/502994391

---
 src/google/protobuf/api.pb.cc       |  28 ++++---
 src/google/protobuf/api.pb.h        |  34 ++++----
 src/google/protobuf/duration.pb.cc  |  24 ++++--
 src/google/protobuf/duration.pb.h   |  34 ++++----
 src/google/protobuf/struct.pb.cc    |  10 ++-
 src/google/protobuf/struct.pb.h     |  38 +++++----
 src/google/protobuf/timestamp.pb.cc |  24 ++++--
 src/google/protobuf/timestamp.pb.h  |  34 ++++----
 src/google/protobuf/type.pb.cc      |  60 +++++++++-----
 src/google/protobuf/type.pb.h       |  68 +++++++++-------
 src/google/protobuf/wrappers.pb.cc  |  88 +++++++++++++-------
 src/google/protobuf/wrappers.pb.h   | 119 ++++++++++++++++------------
 12 files changed, 348 insertions(+), 213 deletions(-)

diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index 06420a760c..38a62ec102 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -45,8 +45,10 @@ PROTOBUF_CONSTEXPR Method::Method(
   , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.request_type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.response_type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.request_streaming_)*/false
-  , /*decltype(_impl_.response_streaming_)*/false
+  , /* ._impl_.request_streaming_ = */ false
+
+  , /* ._impl_.response_streaming_ = */ false
+
   , /*decltype(_impl_.syntax_)*/0
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct MethodDefaultTypeInternal {
@@ -664,8 +666,10 @@ Method::Method(const Method& from)
     , decltype(_impl_.name_){}
     , decltype(_impl_.request_type_url_){}
     , decltype(_impl_.response_type_url_){}
-    , decltype(_impl_.request_streaming_){}
-    , decltype(_impl_.response_streaming_){}
+    , decltype(_impl_.request_streaming_) {}
+
+    , decltype(_impl_.response_streaming_) {}
+
     , decltype(_impl_.syntax_){}
     , /*decltype(_impl_._cached_size_)*/{}};
 
@@ -707,8 +711,10 @@ inline void Method::SharedCtor(::_pb::Arena* arena) {
     , decltype(_impl_.name_){}
     , decltype(_impl_.request_type_url_){}
     , decltype(_impl_.response_type_url_){}
-    , decltype(_impl_.request_streaming_){false}
-    , decltype(_impl_.response_streaming_){false}
+    , decltype(_impl_.request_streaming_) { false }
+
+    , decltype(_impl_.response_streaming_) { false }
+
     , decltype(_impl_.syntax_){0}
     , /*decltype(_impl_._cached_size_)*/{}
   };
@@ -896,7 +902,8 @@ failure:
   // bool request_streaming = 3;
   if (this->_internal_request_streaming() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_request_streaming(), target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        3, this->_internal_request_streaming(), target);
   }
 
   // string response_type_url = 4;
@@ -912,7 +919,8 @@ failure:
   // bool response_streaming = 5;
   if (this->_internal_response_streaming() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(5, this->_internal_response_streaming(), target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        5, this->_internal_response_streaming(), target);
   }
 
   // repeated .google.protobuf.Option options = 6;
@@ -976,12 +984,12 @@ failure:
 
   // bool request_streaming = 3;
   if (this->_internal_request_streaming() != 0) {
-    total_size += 1 + 1;
+    total_size += 2;
   }
 
   // bool response_streaming = 5;
   if (this->_internal_response_streaming() != 0) {
-    total_size += 1 + 1;
+    total_size += 2;
   }
 
   // .google.protobuf.Syntax syntax = 7;
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 0a0e725d21..b350aef610 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -521,17 +521,21 @@ class PROTOBUF_EXPORT Method final :
   void clear_request_streaming() ;
   bool request_streaming() const;
   void set_request_streaming(bool value);
+
   private:
   bool _internal_request_streaming() const;
   void _internal_set_request_streaming(bool value);
+
   public:
   // bool response_streaming = 5;
   void clear_response_streaming() ;
   bool response_streaming() const;
   void set_response_streaming(bool value);
+
   private:
   bool _internal_response_streaming() const;
   void _internal_set_response_streaming(bool value);
+
   public:
   // .google.protobuf.Syntax syntax = 7;
   void clear_syntax() ;
@@ -1148,21 +1152,22 @@ inline void Method::set_allocated_request_type_url(std::string* request_type_url
 inline void Method::clear_request_streaming() {
   _impl_.request_streaming_ = false;
 }
-inline bool Method::_internal_request_streaming() const {
-  return _impl_.request_streaming_;
-}
 inline bool Method::request_streaming() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Method.request_streaming)
   return _internal_request_streaming();
 }
-inline void Method::_internal_set_request_streaming(bool value) {
-
-  _impl_.request_streaming_ = value;
-}
 inline void Method::set_request_streaming(bool value) {
+  ;
   _internal_set_request_streaming(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Method.request_streaming)
 }
+inline bool Method::_internal_request_streaming() const {
+  return _impl_.request_streaming_;
+}
+inline void Method::_internal_set_request_streaming(bool value) {
+  ;
+  _impl_.request_streaming_ = value;
+}
 
 // string response_type_url = 4;
 inline void Method::clear_response_type_url() {
@@ -1213,21 +1218,22 @@ inline void Method::set_allocated_response_type_url(std::string* response_type_u
 inline void Method::clear_response_streaming() {
   _impl_.response_streaming_ = false;
 }
-inline bool Method::_internal_response_streaming() const {
-  return _impl_.response_streaming_;
-}
 inline bool Method::response_streaming() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Method.response_streaming)
   return _internal_response_streaming();
 }
-inline void Method::_internal_set_response_streaming(bool value) {
-
-  _impl_.response_streaming_ = value;
-}
 inline void Method::set_response_streaming(bool value) {
+  ;
   _internal_set_response_streaming(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Method.response_streaming)
 }
+inline bool Method::_internal_response_streaming() const {
+  return _impl_.response_streaming_;
+}
+inline void Method::_internal_set_response_streaming(bool value) {
+  ;
+  _impl_.response_streaming_ = value;
+}
 
 // repeated .google.protobuf.Option options = 6;
 inline int Method::_internal_options_size() const {
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
index a6c0856d6a..5056c175bb 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -21,8 +21,10 @@ namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal;
 PROTOBUF_NAMESPACE_OPEN
 PROTOBUF_CONSTEXPR Duration::Duration(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.seconds_)*/::int64_t{0}
-  , /*decltype(_impl_.nanos_)*/0
+    /* ._impl_.seconds_ = */ ::int64_t{0}
+
+  , /* ._impl_.nanos_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct DurationDefaultTypeInternal {
   PROTOBUF_CONSTEXPR DurationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -128,8 +130,10 @@ Duration::Duration(const Duration& from)
 inline void Duration::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){::int64_t{0}}
-    , decltype(_impl_.nanos_){0}
+      decltype(_impl_.seconds_) { ::int64_t{0} }
+
+    , decltype(_impl_.nanos_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -219,13 +223,15 @@ failure:
   // int64 seconds = 1;
   if (this->_internal_seconds() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target);
+    target = ::_pbi::WireFormatLite::WriteInt64ToArray(
+        1, this->_internal_seconds(), target);
   }
 
   // int32 nanos = 2;
   if (this->_internal_nanos() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_nanos(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        2, this->_internal_nanos(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -246,12 +252,14 @@ failure:
 
   // int64 seconds = 1;
   if (this->_internal_seconds() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_seconds());
+    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
+        this->_internal_seconds());
   }
 
   // int32 nanos = 2;
   if (this->_internal_nanos() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_nanos());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_nanos());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index d156480f3c..3ff89a87e7 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -192,17 +192,21 @@ class PROTOBUF_EXPORT Duration final :
   void clear_seconds() ;
   ::int64_t seconds() const;
   void set_seconds(::int64_t value);
+
   private:
   ::int64_t _internal_seconds() const;
   void _internal_set_seconds(::int64_t value);
+
   public:
   // int32 nanos = 2;
   void clear_nanos() ;
   ::int32_t nanos() const;
   void set_nanos(::int32_t value);
+
   private:
   ::int32_t _internal_nanos() const;
   void _internal_set_nanos(::int32_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.Duration)
  private:
@@ -240,41 +244,43 @@ class PROTOBUF_EXPORT Duration final :
 inline void Duration::clear_seconds() {
   _impl_.seconds_ = ::int64_t{0};
 }
-inline ::int64_t Duration::_internal_seconds() const {
-  return _impl_.seconds_;
-}
 inline ::int64_t Duration::seconds() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Duration.seconds)
   return _internal_seconds();
 }
-inline void Duration::_internal_set_seconds(::int64_t value) {
-
-  _impl_.seconds_ = value;
-}
 inline void Duration::set_seconds(::int64_t value) {
+  ;
   _internal_set_seconds(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Duration.seconds)
 }
+inline ::int64_t Duration::_internal_seconds() const {
+  return _impl_.seconds_;
+}
+inline void Duration::_internal_set_seconds(::int64_t value) {
+  ;
+  _impl_.seconds_ = value;
+}
 
 // int32 nanos = 2;
 inline void Duration::clear_nanos() {
   _impl_.nanos_ = 0;
 }
-inline ::int32_t Duration::_internal_nanos() const {
-  return _impl_.nanos_;
-}
 inline ::int32_t Duration::nanos() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Duration.nanos)
   return _internal_nanos();
 }
-inline void Duration::_internal_set_nanos(::int32_t value) {
-
-  _impl_.nanos_ = value;
-}
 inline void Duration::set_nanos(::int32_t value) {
+  ;
   _internal_set_nanos(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Duration.nanos)
 }
+inline ::int32_t Duration::_internal_nanos() const {
+  return _impl_.nanos_;
+}
+inline void Duration::_internal_set_nanos(::int32_t value) {
+  ;
+  _impl_.nanos_ = value;
+}
 
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index aa8c40f2bf..f0870f7370 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -712,7 +712,8 @@ failure:
   // double number_value = 2;
   if (kind_case() == kNumberValue) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_number_value(), target);
+    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
+        2, this->_internal_number_value(), target);
   }
 
   // string string_value = 3;
@@ -728,7 +729,8 @@ failure:
   // bool bool_value = 4;
   if (kind_case() == kBoolValue) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(4, this->_internal_bool_value(), target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        4, this->_internal_bool_value(), target);
   }
 
   // .google.protobuf.Struct struct_value = 5;
@@ -770,7 +772,7 @@ failure:
     }
     // double number_value = 2;
     case kNumberValue: {
-      total_size += 1 + 8;
+      total_size += 9;
       break;
     }
     // string string_value = 3;
@@ -782,7 +784,7 @@ failure:
     }
     // bool bool_value = 4;
     case kBoolValue: {
-      total_size += 1 + 1;
+      total_size += 2;
       break;
     }
     // .google.protobuf.Struct struct_value = 5;
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 8f587f9e21..7458048e94 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -452,9 +452,11 @@ class PROTOBUF_EXPORT Value final :
   void clear_number_value() ;
   double number_value() const;
   void set_number_value(double value);
+
   private:
   double _internal_number_value() const;
   void _internal_set_number_value(double value);
+
   public:
   // string string_value = 3;
   bool has_string_value() const;
@@ -475,9 +477,11 @@ class PROTOBUF_EXPORT Value final :
   void clear_bool_value() ;
   bool bool_value() const;
   void set_bool_value(bool value);
+
   private:
   bool _internal_bool_value() const;
   void _internal_set_bool_value(bool value);
+
   public:
   // .google.protobuf.Struct struct_value = 5;
   bool has_struct_value() const;
@@ -806,6 +810,15 @@ inline void Value::clear_number_value() {
     clear_has_kind();
   }
 }
+inline double Value::number_value() const {
+  // @@protoc_insertion_point(field_get:google.protobuf.Value.number_value)
+  return _internal_number_value();
+}
+inline void Value::set_number_value(double value) {
+  ;
+  _internal_set_number_value(value);
+  // @@protoc_insertion_point(field_set:google.protobuf.Value.number_value)
+}
 inline double Value::_internal_number_value() const {
   if (kind_case() == kNumberValue) {
     return _impl_.kind_.number_value_;
@@ -819,14 +832,6 @@ inline void Value::_internal_set_number_value(double value) {
   }
   _impl_.kind_.number_value_ = value;
 }
-inline double Value::number_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.number_value)
-  return _internal_number_value();
-}
-inline void Value::set_number_value(double value) {
-  _internal_set_number_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.number_value)
-}
 
 // string string_value = 3;
 inline bool Value::has_string_value() const {
@@ -915,6 +920,15 @@ inline void Value::clear_bool_value() {
     clear_has_kind();
   }
 }
+inline bool Value::bool_value() const {
+  // @@protoc_insertion_point(field_get:google.protobuf.Value.bool_value)
+  return _internal_bool_value();
+}
+inline void Value::set_bool_value(bool value) {
+  ;
+  _internal_set_bool_value(value);
+  // @@protoc_insertion_point(field_set:google.protobuf.Value.bool_value)
+}
 inline bool Value::_internal_bool_value() const {
   if (kind_case() == kBoolValue) {
     return _impl_.kind_.bool_value_;
@@ -928,14 +942,6 @@ inline void Value::_internal_set_bool_value(bool value) {
   }
   _impl_.kind_.bool_value_ = value;
 }
-inline bool Value::bool_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.bool_value)
-  return _internal_bool_value();
-}
-inline void Value::set_bool_value(bool value) {
-  _internal_set_bool_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.bool_value)
-}
 
 // .google.protobuf.Struct struct_value = 5;
 inline bool Value::has_struct_value() const {
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index cc85173b7e..3708b86226 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -21,8 +21,10 @@ namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal;
 PROTOBUF_NAMESPACE_OPEN
 PROTOBUF_CONSTEXPR Timestamp::Timestamp(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.seconds_)*/::int64_t{0}
-  , /*decltype(_impl_.nanos_)*/0
+    /* ._impl_.seconds_ = */ ::int64_t{0}
+
+  , /* ._impl_.nanos_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct TimestampDefaultTypeInternal {
   PROTOBUF_CONSTEXPR TimestampDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -128,8 +130,10 @@ Timestamp::Timestamp(const Timestamp& from)
 inline void Timestamp::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){::int64_t{0}}
-    , decltype(_impl_.nanos_){0}
+      decltype(_impl_.seconds_) { ::int64_t{0} }
+
+    , decltype(_impl_.nanos_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -219,13 +223,15 @@ failure:
   // int64 seconds = 1;
   if (this->_internal_seconds() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target);
+    target = ::_pbi::WireFormatLite::WriteInt64ToArray(
+        1, this->_internal_seconds(), target);
   }
 
   // int32 nanos = 2;
   if (this->_internal_nanos() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_nanos(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        2, this->_internal_nanos(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -246,12 +252,14 @@ failure:
 
   // int64 seconds = 1;
   if (this->_internal_seconds() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_seconds());
+    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
+        this->_internal_seconds());
   }
 
   // int32 nanos = 2;
   if (this->_internal_nanos() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_nanos());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_nanos());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index 2f2a425a93..35585b114d 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -192,17 +192,21 @@ class PROTOBUF_EXPORT Timestamp final :
   void clear_seconds() ;
   ::int64_t seconds() const;
   void set_seconds(::int64_t value);
+
   private:
   ::int64_t _internal_seconds() const;
   void _internal_set_seconds(::int64_t value);
+
   public:
   // int32 nanos = 2;
   void clear_nanos() ;
   ::int32_t nanos() const;
   void set_nanos(::int32_t value);
+
   private:
   ::int32_t _internal_nanos() const;
   void _internal_set_nanos(::int32_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.Timestamp)
  private:
@@ -240,41 +244,43 @@ class PROTOBUF_EXPORT Timestamp final :
 inline void Timestamp::clear_seconds() {
   _impl_.seconds_ = ::int64_t{0};
 }
-inline ::int64_t Timestamp::_internal_seconds() const {
-  return _impl_.seconds_;
-}
 inline ::int64_t Timestamp::seconds() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.seconds)
   return _internal_seconds();
 }
-inline void Timestamp::_internal_set_seconds(::int64_t value) {
-
-  _impl_.seconds_ = value;
-}
 inline void Timestamp::set_seconds(::int64_t value) {
+  ;
   _internal_set_seconds(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.seconds)
 }
+inline ::int64_t Timestamp::_internal_seconds() const {
+  return _impl_.seconds_;
+}
+inline void Timestamp::_internal_set_seconds(::int64_t value) {
+  ;
+  _impl_.seconds_ = value;
+}
 
 // int32 nanos = 2;
 inline void Timestamp::clear_nanos() {
   _impl_.nanos_ = 0;
 }
-inline ::int32_t Timestamp::_internal_nanos() const {
-  return _impl_.nanos_;
-}
 inline ::int32_t Timestamp::nanos() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.nanos)
   return _internal_nanos();
 }
-inline void Timestamp::_internal_set_nanos(::int32_t value) {
-
-  _impl_.nanos_ = value;
-}
 inline void Timestamp::set_nanos(::int32_t value) {
+  ;
   _internal_set_nanos(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.nanos)
 }
+inline ::int32_t Timestamp::_internal_nanos() const {
+  return _impl_.nanos_;
+}
+inline void Timestamp::_internal_set_nanos(::int32_t value) {
+  ;
+  _impl_.nanos_ = value;
+}
 
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index db71a2f546..3b89f3bc8f 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -47,9 +47,12 @@ PROTOBUF_CONSTEXPR Field::Field(
   , /*decltype(_impl_.default_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
   , /*decltype(_impl_.kind_)*/0
   , /*decltype(_impl_.cardinality_)*/0
-  , /*decltype(_impl_.number_)*/0
-  , /*decltype(_impl_.oneof_index_)*/0
-  , /*decltype(_impl_.packed_)*/false
+  , /* ._impl_.number_ = */ 0
+
+  , /* ._impl_.oneof_index_ = */ 0
+
+  , /* ._impl_.packed_ = */ false
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct FieldDefaultTypeInternal {
   PROTOBUF_CONSTEXPR FieldDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -83,7 +86,8 @@ PROTOBUF_CONSTEXPR EnumValue::EnumValue(
     ::_pbi::ConstantInitialized): _impl_{
     /*decltype(_impl_.options_)*/{}
   , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.number_)*/0
+  , /* ._impl_.number_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct EnumValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR EnumValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -800,9 +804,12 @@ Field::Field(const Field& from)
     , decltype(_impl_.default_value_){}
     , decltype(_impl_.kind_){}
     , decltype(_impl_.cardinality_){}
-    , decltype(_impl_.number_){}
-    , decltype(_impl_.oneof_index_){}
-    , decltype(_impl_.packed_){}
+    , decltype(_impl_.number_) {}
+
+    , decltype(_impl_.oneof_index_) {}
+
+    , decltype(_impl_.packed_) {}
+
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -854,9 +861,12 @@ inline void Field::SharedCtor(::_pb::Arena* arena) {
     , decltype(_impl_.default_value_){}
     , decltype(_impl_.kind_){0}
     , decltype(_impl_.cardinality_){0}
-    , decltype(_impl_.number_){0}
-    , decltype(_impl_.oneof_index_){0}
-    , decltype(_impl_.packed_){false}
+    , decltype(_impl_.number_) { 0 }
+
+    , decltype(_impl_.oneof_index_) { 0 }
+
+    , decltype(_impl_.packed_) { false }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.name_.InitDefault();
@@ -1073,7 +1083,8 @@ failure:
   // int32 number = 3;
   if (this->_internal_number() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_number(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        3, this->_internal_number(), target);
   }
 
   // string name = 4;
@@ -1099,13 +1110,15 @@ failure:
   // int32 oneof_index = 7;
   if (this->_internal_oneof_index() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(7, this->_internal_oneof_index(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        7, this->_internal_oneof_index(), target);
   }
 
   // bool packed = 8;
   if (this->_internal_packed() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(8, this->_internal_packed(), target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        8, this->_internal_packed(), target);
   }
 
   // repeated .google.protobuf.Option options = 9;
@@ -1201,17 +1214,19 @@ failure:
 
   // int32 number = 3;
   if (this->_internal_number() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_number());
   }
 
   // int32 oneof_index = 7;
   if (this->_internal_oneof_index() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_oneof_index());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_oneof_index());
   }
 
   // bool packed = 8;
   if (this->_internal_packed() != 0) {
-    total_size += 1 + 1;
+    total_size += 2;
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1680,7 +1695,8 @@ EnumValue::EnumValue(const EnumValue& from)
   new (&_impl_) Impl_{
       decltype(_impl_.options_){from._impl_.options_}
     , decltype(_impl_.name_){}
-    , decltype(_impl_.number_){}
+    , decltype(_impl_.number_) {}
+
     , /*decltype(_impl_._cached_size_)*/{}};
 
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -1701,7 +1717,8 @@ inline void EnumValue::SharedCtor(::_pb::Arena* arena) {
   new (&_impl_) Impl_{
       decltype(_impl_.options_){arena}
     , decltype(_impl_.name_){}
-    , decltype(_impl_.number_){0}
+    , decltype(_impl_.number_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
   _impl_.name_.InitDefault();
@@ -1823,7 +1840,8 @@ failure:
   // int32 number = 2;
   if (this->_internal_number() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_number(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        2, this->_internal_number(), target);
   }
 
   // repeated .google.protobuf.Option options = 3;
@@ -1866,7 +1884,8 @@ failure:
 
   // int32 number = 2;
   if (this->_internal_number() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_number());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1918,6 +1937,7 @@ void EnumValue::InternalSwap(EnumValue* other) {
       &_impl_.name_, lhs_arena,
       &other->_impl_.name_, rhs_arena
   );
+
   swap(_impl_.number_, other->_impl_.number_);
 }
 
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index fabe2bf02f..32552fb715 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -731,25 +731,31 @@ class PROTOBUF_EXPORT Field final :
   void clear_number() ;
   ::int32_t number() const;
   void set_number(::int32_t value);
+
   private:
   ::int32_t _internal_number() const;
   void _internal_set_number(::int32_t value);
+
   public:
   // int32 oneof_index = 7;
   void clear_oneof_index() ;
   ::int32_t oneof_index() const;
   void set_oneof_index(::int32_t value);
+
   private:
   ::int32_t _internal_oneof_index() const;
   void _internal_set_oneof_index(::int32_t value);
+
   public:
   // bool packed = 8;
   void clear_packed() ;
   bool packed() const;
   void set_packed(bool value);
+
   private:
   bool _internal_packed() const;
   void _internal_set_packed(bool value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.Field)
  private:
@@ -1154,9 +1160,11 @@ class PROTOBUF_EXPORT EnumValue final :
   void clear_number() ;
   ::int32_t number() const;
   void set_number(::int32_t value);
+
   private:
   ::int32_t _internal_number() const;
   void _internal_set_number(::int32_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.EnumValue)
  private:
@@ -1715,21 +1723,22 @@ inline void Field::set_cardinality(::PROTOBUF_NAMESPACE_ID::Field_Cardinality va
 inline void Field::clear_number() {
   _impl_.number_ = 0;
 }
-inline ::int32_t Field::_internal_number() const {
-  return _impl_.number_;
-}
 inline ::int32_t Field::number() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Field.number)
   return _internal_number();
 }
-inline void Field::_internal_set_number(::int32_t value) {
-
-  _impl_.number_ = value;
-}
 inline void Field::set_number(::int32_t value) {
+  ;
   _internal_set_number(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Field.number)
 }
+inline ::int32_t Field::_internal_number() const {
+  return _impl_.number_;
+}
+inline void Field::_internal_set_number(::int32_t value) {
+  ;
+  _impl_.number_ = value;
+}
 
 // string name = 4;
 inline void Field::clear_name() {
@@ -1825,41 +1834,43 @@ inline void Field::set_allocated_type_url(std::string* type_url) {
 inline void Field::clear_oneof_index() {
   _impl_.oneof_index_ = 0;
 }
-inline ::int32_t Field::_internal_oneof_index() const {
-  return _impl_.oneof_index_;
-}
 inline ::int32_t Field::oneof_index() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Field.oneof_index)
   return _internal_oneof_index();
 }
-inline void Field::_internal_set_oneof_index(::int32_t value) {
-
-  _impl_.oneof_index_ = value;
-}
 inline void Field::set_oneof_index(::int32_t value) {
+  ;
   _internal_set_oneof_index(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Field.oneof_index)
 }
+inline ::int32_t Field::_internal_oneof_index() const {
+  return _impl_.oneof_index_;
+}
+inline void Field::_internal_set_oneof_index(::int32_t value) {
+  ;
+  _impl_.oneof_index_ = value;
+}
 
 // bool packed = 8;
 inline void Field::clear_packed() {
   _impl_.packed_ = false;
 }
-inline bool Field::_internal_packed() const {
-  return _impl_.packed_;
-}
 inline bool Field::packed() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Field.packed)
   return _internal_packed();
 }
-inline void Field::_internal_set_packed(bool value) {
-
-  _impl_.packed_ = value;
-}
 inline void Field::set_packed(bool value) {
+  ;
   _internal_set_packed(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Field.packed)
 }
+inline bool Field::_internal_packed() const {
+  return _impl_.packed_;
+}
+inline void Field::_internal_set_packed(bool value) {
+  ;
+  _impl_.packed_ = value;
+}
 
 // repeated .google.protobuf.Option options = 9;
 inline int Field::_internal_options_size() const {
@@ -2273,21 +2284,22 @@ inline void EnumValue::set_allocated_name(std::string* name) {
 inline void EnumValue::clear_number() {
   _impl_.number_ = 0;
 }
-inline ::int32_t EnumValue::_internal_number() const {
-  return _impl_.number_;
-}
 inline ::int32_t EnumValue::number() const {
   // @@protoc_insertion_point(field_get:google.protobuf.EnumValue.number)
   return _internal_number();
 }
-inline void EnumValue::_internal_set_number(::int32_t value) {
-
-  _impl_.number_ = value;
-}
 inline void EnumValue::set_number(::int32_t value) {
+  ;
   _internal_set_number(value);
   // @@protoc_insertion_point(field_set:google.protobuf.EnumValue.number)
 }
+inline ::int32_t EnumValue::_internal_number() const {
+  return _impl_.number_;
+}
+inline void EnumValue::_internal_set_number(::int32_t value) {
+  ;
+  _impl_.number_ = value;
+}
 
 // repeated .google.protobuf.Option options = 3;
 inline int EnumValue::_internal_options_size() const {
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index 8553a1b5c6..9d433ad6c5 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -21,7 +21,8 @@ namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal;
 PROTOBUF_NAMESPACE_OPEN
 PROTOBUF_CONSTEXPR DoubleValue::DoubleValue(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
+    /* ._impl_.value_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct DoubleValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR DoubleValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -35,7 +36,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
 PROTOBUF_CONSTEXPR FloatValue::FloatValue(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
+    /* ._impl_.value_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct FloatValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR FloatValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -49,7 +51,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FloatValueDefaultTypeInternal _FloatValue_default_instance_;
 PROTOBUF_CONSTEXPR Int64Value::Int64Value(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/::int64_t{0}
+    /* ._impl_.value_ = */ ::int64_t{0}
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct Int64ValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR Int64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -63,7 +66,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
 PROTOBUF_CONSTEXPR UInt64Value::UInt64Value(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/::uint64_t{0u}
+    /* ._impl_.value_ = */ ::uint64_t{0u}
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct UInt64ValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR UInt64ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -77,7 +81,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
 PROTOBUF_CONSTEXPR Int32Value::Int32Value(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
+    /* ._impl_.value_ = */ 0
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct Int32ValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR Int32ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -91,7 +96,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int32ValueDefaultTypeInternal _Int32Value_default_instance_;
 PROTOBUF_CONSTEXPR UInt32Value::UInt32Value(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0u
+    /* ._impl_.value_ = */ 0u
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct UInt32ValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR UInt32ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -105,7 +111,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
 PROTOBUF_CONSTEXPR BoolValue::BoolValue(
     ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/false
+    /* ._impl_.value_ = */ false
+
   , /*decltype(_impl_._cached_size_)*/{}} {}
 struct BoolValueDefaultTypeInternal {
   PROTOBUF_CONSTEXPR BoolValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
@@ -332,7 +339,8 @@ DoubleValue::DoubleValue(const DoubleValue& from)
 inline void DoubleValue::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
+      decltype(_impl_.value_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -415,7 +423,8 @@ failure:
   memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
   if (raw_value != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -440,7 +449,7 @@ failure:
   ::uint64_t raw_value;
   memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
   if (raw_value != 0) {
-    total_size += 1 + 8;
+    total_size += 9;
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -485,6 +494,7 @@ bool DoubleValue::IsInitialized() const {
 void DoubleValue::InternalSwap(DoubleValue* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -514,7 +524,8 @@ FloatValue::FloatValue(const FloatValue& from)
 inline void FloatValue::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
+      decltype(_impl_.value_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -597,7 +608,8 @@ failure:
   memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
   if (raw_value != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteFloatToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteFloatToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -622,7 +634,7 @@ failure:
   ::uint32_t raw_value;
   memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
   if (raw_value != 0) {
-    total_size += 1 + 4;
+    total_size += 5;
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -667,6 +679,7 @@ bool FloatValue::IsInitialized() const {
 void FloatValue::InternalSwap(FloatValue* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -696,7 +709,8 @@ Int64Value::Int64Value(const Int64Value& from)
 inline void Int64Value::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){::int64_t{0}}
+      decltype(_impl_.value_) { ::int64_t{0} }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -775,7 +789,8 @@ failure:
   // int64 value = 1;
   if (this->_internal_value() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteInt64ToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -796,7 +811,8 @@ failure:
 
   // int64 value = 1;
   if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_value());
+    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
+        this->_internal_value());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -837,6 +853,7 @@ bool Int64Value::IsInitialized() const {
 void Int64Value::InternalSwap(Int64Value* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -866,7 +883,8 @@ UInt64Value::UInt64Value(const UInt64Value& from)
 inline void UInt64Value::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){::uint64_t{0u}}
+      decltype(_impl_.value_) { ::uint64_t{0u} }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -945,7 +963,8 @@ failure:
   // uint64 value = 1;
   if (this->_internal_value() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -966,7 +985,8 @@ failure:
 
   // uint64 value = 1;
   if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_value());
+    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(
+        this->_internal_value());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1007,6 +1027,7 @@ bool UInt64Value::IsInitialized() const {
 void UInt64Value::InternalSwap(UInt64Value* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -1036,7 +1057,8 @@ Int32Value::Int32Value(const Int32Value& from)
 inline void Int32Value::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
+      decltype(_impl_.value_) { 0 }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -1115,7 +1137,8 @@ failure:
   // int32 value = 1;
   if (this->_internal_value() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteInt32ToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1136,7 +1159,8 @@ failure:
 
   // int32 value = 1;
   if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_value());
+    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
+        this->_internal_value());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1177,6 +1201,7 @@ bool Int32Value::IsInitialized() const {
 void Int32Value::InternalSwap(Int32Value* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -1206,7 +1231,8 @@ UInt32Value::UInt32Value(const UInt32Value& from)
 inline void UInt32Value::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){0u}
+      decltype(_impl_.value_) { 0u }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -1285,7 +1311,8 @@ failure:
   // uint32 value = 1;
   if (this->_internal_value() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1306,7 +1333,8 @@ failure:
 
   // uint32 value = 1;
   if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_value());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_value());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1347,6 +1375,7 @@ bool UInt32Value::IsInitialized() const {
 void UInt32Value::InternalSwap(UInt32Value* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
@@ -1376,7 +1405,8 @@ BoolValue::BoolValue(const BoolValue& from)
 inline void BoolValue::SharedCtor(::_pb::Arena* arena) {
   (void)arena;
   new (&_impl_) Impl_{
-      decltype(_impl_.value_){false}
+      decltype(_impl_.value_) { false }
+
     , /*decltype(_impl_._cached_size_)*/{}
   };
 }
@@ -1455,7 +1485,8 @@ failure:
   // bool value = 1;
   if (this->_internal_value() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_value(), target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        1, this->_internal_value(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1476,7 +1507,7 @@ failure:
 
   // bool value = 1;
   if (this->_internal_value() != 0) {
-    total_size += 1 + 1;
+    total_size += 2;
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -1517,6 +1548,7 @@ bool BoolValue::IsInitialized() const {
 void BoolValue::InternalSwap(BoolValue* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
+
   swap(_impl_.value_, other->_impl_.value_);
 }
 
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index 8ebc7a18a5..843848253e 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -231,9 +231,11 @@ class PROTOBUF_EXPORT DoubleValue final :
   void clear_value() ;
   double value() const;
   void set_value(double value);
+
   private:
   double _internal_value() const;
   void _internal_set_value(double value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.DoubleValue)
  private:
@@ -376,9 +378,11 @@ class PROTOBUF_EXPORT FloatValue final :
   void clear_value() ;
   float value() const;
   void set_value(float value);
+
   private:
   float _internal_value() const;
   void _internal_set_value(float value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.FloatValue)
  private:
@@ -521,9 +525,11 @@ class PROTOBUF_EXPORT Int64Value final :
   void clear_value() ;
   ::int64_t value() const;
   void set_value(::int64_t value);
+
   private:
   ::int64_t _internal_value() const;
   void _internal_set_value(::int64_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.Int64Value)
  private:
@@ -666,9 +672,11 @@ class PROTOBUF_EXPORT UInt64Value final :
   void clear_value() ;
   ::uint64_t value() const;
   void set_value(::uint64_t value);
+
   private:
   ::uint64_t _internal_value() const;
   void _internal_set_value(::uint64_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.UInt64Value)
  private:
@@ -811,9 +819,11 @@ class PROTOBUF_EXPORT Int32Value final :
   void clear_value() ;
   ::int32_t value() const;
   void set_value(::int32_t value);
+
   private:
   ::int32_t _internal_value() const;
   void _internal_set_value(::int32_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.Int32Value)
  private:
@@ -956,9 +966,11 @@ class PROTOBUF_EXPORT UInt32Value final :
   void clear_value() ;
   ::uint32_t value() const;
   void set_value(::uint32_t value);
+
   private:
   ::uint32_t _internal_value() const;
   void _internal_set_value(::uint32_t value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.UInt32Value)
  private:
@@ -1101,9 +1113,11 @@ class PROTOBUF_EXPORT BoolValue final :
   void clear_value() ;
   bool value() const;
   void set_value(bool value);
+
   private:
   bool _internal_value() const;
   void _internal_set_value(bool value);
+
   public:
   // @@protoc_insertion_point(class_scope:google.protobuf.BoolValue)
  private:
@@ -1440,21 +1454,22 @@ class PROTOBUF_EXPORT BytesValue final :
 inline void DoubleValue::clear_value() {
   _impl_.value_ = 0;
 }
-inline double DoubleValue::_internal_value() const {
-  return _impl_.value_;
-}
 inline double DoubleValue::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.DoubleValue.value)
   return _internal_value();
 }
-inline void DoubleValue::_internal_set_value(double value) {
-
-  _impl_.value_ = value;
-}
 inline void DoubleValue::set_value(double value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.DoubleValue.value)
 }
+inline double DoubleValue::_internal_value() const {
+  return _impl_.value_;
+}
+inline void DoubleValue::_internal_set_value(double value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1464,21 +1479,22 @@ inline void DoubleValue::set_value(double value) {
 inline void FloatValue::clear_value() {
   _impl_.value_ = 0;
 }
-inline float FloatValue::_internal_value() const {
-  return _impl_.value_;
-}
 inline float FloatValue::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.FloatValue.value)
   return _internal_value();
 }
-inline void FloatValue::_internal_set_value(float value) {
-
-  _impl_.value_ = value;
-}
 inline void FloatValue::set_value(float value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.FloatValue.value)
 }
+inline float FloatValue::_internal_value() const {
+  return _impl_.value_;
+}
+inline void FloatValue::_internal_set_value(float value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1488,21 +1504,22 @@ inline void FloatValue::set_value(float value) {
 inline void Int64Value::clear_value() {
   _impl_.value_ = ::int64_t{0};
 }
-inline ::int64_t Int64Value::_internal_value() const {
-  return _impl_.value_;
-}
 inline ::int64_t Int64Value::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Int64Value.value)
   return _internal_value();
 }
-inline void Int64Value::_internal_set_value(::int64_t value) {
-
-  _impl_.value_ = value;
-}
 inline void Int64Value::set_value(::int64_t value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Int64Value.value)
 }
+inline ::int64_t Int64Value::_internal_value() const {
+  return _impl_.value_;
+}
+inline void Int64Value::_internal_set_value(::int64_t value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1512,21 +1529,22 @@ inline void Int64Value::set_value(::int64_t value) {
 inline void UInt64Value::clear_value() {
   _impl_.value_ = ::uint64_t{0u};
 }
-inline ::uint64_t UInt64Value::_internal_value() const {
-  return _impl_.value_;
-}
 inline ::uint64_t UInt64Value::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.UInt64Value.value)
   return _internal_value();
 }
-inline void UInt64Value::_internal_set_value(::uint64_t value) {
-
-  _impl_.value_ = value;
-}
 inline void UInt64Value::set_value(::uint64_t value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.UInt64Value.value)
 }
+inline ::uint64_t UInt64Value::_internal_value() const {
+  return _impl_.value_;
+}
+inline void UInt64Value::_internal_set_value(::uint64_t value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1536,21 +1554,22 @@ inline void UInt64Value::set_value(::uint64_t value) {
 inline void Int32Value::clear_value() {
   _impl_.value_ = 0;
 }
-inline ::int32_t Int32Value::_internal_value() const {
-  return _impl_.value_;
-}
 inline ::int32_t Int32Value::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.Int32Value.value)
   return _internal_value();
 }
-inline void Int32Value::_internal_set_value(::int32_t value) {
-
-  _impl_.value_ = value;
-}
 inline void Int32Value::set_value(::int32_t value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.Int32Value.value)
 }
+inline ::int32_t Int32Value::_internal_value() const {
+  return _impl_.value_;
+}
+inline void Int32Value::_internal_set_value(::int32_t value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1560,21 +1579,22 @@ inline void Int32Value::set_value(::int32_t value) {
 inline void UInt32Value::clear_value() {
   _impl_.value_ = 0u;
 }
-inline ::uint32_t UInt32Value::_internal_value() const {
-  return _impl_.value_;
-}
 inline ::uint32_t UInt32Value::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.UInt32Value.value)
   return _internal_value();
 }
-inline void UInt32Value::_internal_set_value(::uint32_t value) {
-
-  _impl_.value_ = value;
-}
 inline void UInt32Value::set_value(::uint32_t value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.UInt32Value.value)
 }
+inline ::uint32_t UInt32Value::_internal_value() const {
+  return _impl_.value_;
+}
+inline void UInt32Value::_internal_set_value(::uint32_t value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------
 
@@ -1584,21 +1604,22 @@ inline void UInt32Value::set_value(::uint32_t value) {
 inline void BoolValue::clear_value() {
   _impl_.value_ = false;
 }
-inline bool BoolValue::_internal_value() const {
-  return _impl_.value_;
-}
 inline bool BoolValue::value() const {
   // @@protoc_insertion_point(field_get:google.protobuf.BoolValue.value)
   return _internal_value();
 }
-inline void BoolValue::_internal_set_value(bool value) {
-
-  _impl_.value_ = value;
-}
 inline void BoolValue::set_value(bool value) {
+  ;
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:google.protobuf.BoolValue.value)
 }
+inline bool BoolValue::_internal_value() const {
+  return _impl_.value_;
+}
+inline void BoolValue::_internal_set_value(bool value) {
+  ;
+  _impl_.value_ = value;
+}
 
 // -------------------------------------------------------------------