Auto-generate files after cl/621886314

src/google/protobuf/struct.pb.cc

@@ -573,9 +573,7 @@ void Value::clear_kind() {
       if (GetArena() == nullptr) {
         delete _impl_.kind_.struct_value_;
       } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-        if (_impl_.kind_.struct_value_ != nullptr) {
+        ::google::protobuf::internal::MaybePoisonAfterClear(_impl_.kind_.struct_value_);
-          _impl_.kind_.struct_value_->Clear();
-        }
       }
       break;
     }
@@ -583,9 +581,7 @@ void Value::clear_kind() {
       if (GetArena() == nullptr) {
         delete _impl_.kind_.list_value_;
       } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-        if (_impl_.kind_.list_value_ != nullptr) {
+        ::google::protobuf::internal::MaybePoisonAfterClear(_impl_.kind_.list_value_);
-          _impl_.kind_.list_value_->Clear();
-        }
       }
       break;
     }

src/google/protobuf/struct.pb.h

@@ -1020,9 +1020,7 @@ inline void Value::clear_struct_value() {
     if (GetArena() == nullptr) {
       delete _impl_.kind_.struct_value_;
     } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-      if (_impl_.kind_.struct_value_ != nullptr) {
+      ::google::protobuf::internal::MaybePoisonAfterClear(_impl_.kind_.struct_value_);
-        _impl_.kind_.struct_value_->Clear();
-      }
     }
     clear_has_kind();
   }
@@ -1101,9 +1099,7 @@ inline void Value::clear_list_value() {
     if (GetArena() == nullptr) {
       delete _impl_.kind_.list_value_;
     } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-      if (_impl_.kind_.list_value_ != nullptr) {
+      ::google::protobuf::internal::MaybePoisonAfterClear(_impl_.kind_.list_value_);
-        _impl_.kind_.list_value_->Clear();
-      }
     }
     clear_has_kind();
   }