From 0c6aa9557aa569bd4dd3428b198299190971743e Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 21 Mar 2024 20:50:16 +0000 Subject: [PATCH] Auto-generate files after cl/617949317 --- src/google/protobuf/struct.pb.cc | 8 ++++++++ src/google/protobuf/struct.pb.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 2db807d139..fb925fd149 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -571,12 +571,20 @@ void Value::clear_kind() { case kStructValue: { if (GetArena() == nullptr) { delete _impl_.kind_.struct_value_; + } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) { + if (_impl_.kind_.struct_value_ != nullptr) { + _impl_.kind_.struct_value_->Clear(); + } } break; } case kListValue: { if (GetArena() == nullptr) { delete _impl_.kind_.list_value_; + } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) { + if (_impl_.kind_.list_value_ != nullptr) { + _impl_.kind_.list_value_->Clear(); + } } break; } diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 2dfeeca858..ad1b79f8c1 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1019,6 +1019,10 @@ inline void Value::clear_struct_value() { if (kind_case() == kStructValue) { if (GetArena() == nullptr) { delete _impl_.kind_.struct_value_; + } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) { + if (_impl_.kind_.struct_value_ != nullptr) { + _impl_.kind_.struct_value_->Clear(); + } } clear_has_kind(); } @@ -1096,6 +1100,10 @@ inline void Value::clear_list_value() { if (kind_case() == kListValue) { if (GetArena() == nullptr) { delete _impl_.kind_.list_value_; + } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) { + if (_impl_.kind_.list_value_ != nullptr) { + _impl_.kind_.list_value_->Clear(); + } } clear_has_kind(); }