From 27bc619eb6d7e936e800f8e72d90f000300eda29 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Tue, 21 Jan 2025 20:48:37 +0000
Subject: [PATCH] Auto-generate files after cl/718025165

---
 src/google/protobuf/api.pb.h     | 2 +-
 src/google/protobuf/struct.pb.cc | 4 ++--
 src/google/protobuf/struct.pb.h  | 4 ++--
 src/google/protobuf/type.pb.h    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 8e1bf58f5b..1264c55c7e 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1197,7 +1197,7 @@ inline void Api::set_allocated_source_context(::google::protobuf::SourceContext*
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index ddb3b3a755..534f659aa5 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -1038,7 +1038,7 @@ void Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::p
         if (oneof_needs_init) {
           _this->_impl_.kind_.struct_value_ = ::google::protobuf::Message::CopyConstruct(arena, *from._impl_.kind_.struct_value_);
         } else {
-          _this->_impl_.kind_.struct_value_->MergeFrom(from._internal_struct_value());
+          _this->_impl_.kind_.struct_value_->MergeFrom(*from._impl_.kind_.struct_value_);
         }
         break;
       }
@@ -1046,7 +1046,7 @@ void Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::p
         if (oneof_needs_init) {
           _this->_impl_.kind_.list_value_ = ::google::protobuf::Message::CopyConstruct(arena, *from._impl_.kind_.list_value_);
         } else {
-          _this->_impl_.kind_.list_value_->MergeFrom(from._internal_list_value());
+          _this->_impl_.kind_.list_value_->MergeFrom(*from._impl_.kind_.list_value_);
         }
         break;
       }
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 0c1e320981..161bde44d4 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1165,7 +1165,7 @@ inline ::google::protobuf::Struct* PROTOBUF_NONNULL Value::_internal_mutable_str
   if (kind_case() != kStructValue) {
     clear_kind();
     set_has_struct_value();
-    _impl_.kind_.struct_value_ =
+    _impl_.kind_.struct_value_ = 
         ::google::protobuf::Message::DefaultConstruct<::google::protobuf::Struct>(GetArena());
   }
   return _impl_.kind_.struct_value_;
@@ -1246,7 +1246,7 @@ inline ::google::protobuf::ListValue* PROTOBUF_NONNULL Value::_internal_mutable_
   if (kind_case() != kListValue) {
     clear_kind();
     set_has_list_value();
-    _impl_.kind_.list_value_ =
+    _impl_.kind_.list_value_ = 
         ::google::protobuf::Message::DefaultConstruct<::google::protobuf::ListValue>(GetArena());
   }
   return _impl_.kind_.list_value_;
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 6a3d490657..98523624f7 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1964,7 +1964,7 @@ inline void Type::set_allocated_source_context(::google::protobuf::SourceContext
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
@@ -2749,7 +2749,7 @@ inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
@@ -3143,7 +3143,7 @@ inline void Option::set_allocated_value(::google::protobuf::Any* PROTOBUF_NULLAB
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }