From f06ae6c4fa1c8aca58ff498ef3ab78158d3073a6 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Sat, 16 Mar 2024 21:23:23 +0000 Subject: [PATCH] Auto-generate files after cl/616461373 --- 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 b27f1b570c..c3919c7209 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -570,12 +570,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(); }