Auto-generate files after cl/544381907

src/google/protobuf/api.pb.cc

@@ -623,9 +623,9 @@ void Api::InternalSwap(Api* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_methods()->InternalSwap(other->_internal_mutable_methods());
+  _impl_.methods_.InternalSwap(&other->_impl_.methods_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  _internal_mutable_mixins()->InternalSwap(other->_internal_mutable_mixins());
+  _impl_.mixins_.InternalSwap(&other->_impl_.mixins_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.version_, lhs_arena,
@@ -1008,7 +1008,7 @@ void Method::InternalSwap(Method* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.request_type_url_, lhs_arena,

src/google/protobuf/field_mask.pb.cc

@@ -279,8 +279,7 @@ PROTOBUF_NOINLINE bool FieldMask::IsInitialized() const {
 void FieldMask::InternalSwap(FieldMask* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_paths()->InternalSwap(
+  _impl_.paths_.InternalSwap(&other->_impl_.paths_);
-      other->_internal_mutable_paths());
 }
 
 ::google::protobuf::Metadata FieldMask::GetMetadata() const {

src/google/protobuf/struct.pb.cc

@@ -992,7 +992,7 @@ PROTOBUF_NOINLINE bool ListValue::IsInitialized() const {
 void ListValue::InternalSwap(ListValue* other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_values()->InternalSwap(other->_internal_mutable_values());
+  _impl_.values_.InternalSwap(&other->_impl_.values_);
 }
 
 ::google::protobuf::Metadata ListValue::GetMetadata() const {

src/google/protobuf/type.pb.cc

@@ -835,10 +835,9 @@ void Type::InternalSwap(Type* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_fields()->InternalSwap(other->_internal_mutable_fields());
+  _impl_.fields_.InternalSwap(&other->_impl_.fields_);
-  _internal_mutable_oneofs()->InternalSwap(
+  _impl_.oneofs_.InternalSwap(&other->_impl_.oneofs_);
-      other->_internal_mutable_oneofs());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
@@ -1311,7 +1310,7 @@ void Field::InternalSwap(Field* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_url_, lhs_arena,
@@ -1689,8 +1688,8 @@ void Enum::InternalSwap(Enum* other) {
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _internal_mutable_enumvalue()->InternalSwap(other->_internal_mutable_enumvalue());
+  _impl_.enumvalue_.InternalSwap(&other->_impl_.enumvalue_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena,
@@ -1942,7 +1941,7 @@ void EnumValue::InternalSwap(EnumValue* other) {
   auto* lhs_arena = GetArenaForAllocation();
   auto* rhs_arena = other->GetArenaForAllocation();
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _internal_mutable_options()->InternalSwap(other->_internal_mutable_options());
+  _impl_.options_.InternalSwap(&other->_impl_.options_);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena,
                                        &other->_impl_.name_, rhs_arena);
         swap(_impl_.number_, other->_impl_.number_);