Switch from DownCastToGenerated to DownCastMessage

Author: vitalybuka

port/protobuf.h

@@ -27,25 +27,36 @@
 // clang-format off
 #include "google/protobuf/port_def.inc"  // MUST be last header included
 // clang-format on
-#if PROTOBUF_VERSION < 4025000
-
 namespace google {
 namespace protobuf {
+#if PROTOBUF_VERSION < 4025000
 
 template <typename T>
-const T* DownCastToGenerated(const Message* message) {
+const T* DownCastMessage(const Message* message) {
   return static_cast<const T*>(message);
 }
 
 template <typename T>
-T* DownCastToGenerated(Message* message) {
+T* DownCastMessage(Message* message) {
   const Message* message_const = message;
-  return const_cast<T*>(DownCastToGenerated<T>(message_const));
+  return const_cast<T*>(DownCastMessage<T>(message_const));
+}
+
+#elif PROTOBUF_VERSION < 5029000
+
+template <typename T>
+const T* DownCastMessage(const Message* message) {
+  return DownCastToGenerated<T>(message);
+}
+
+template <typename T>
+T* DownCastMessage(Message* message) {
+  return DownCastToGenerated<T>(message);
 }
 
+#endif  // PROTOBUF_VERSION
 }  // namespace protobuf
 }  // namespace google
-#endif  // PROTOBUF_VERSION
 #include "google/protobuf/port_undef.inc"
 
 

src/libfuzzer/libfuzzer_macro.h

@@ -119,7 +119,7 @@ struct PostProcessorRegistration {
     RegisterPostProcessor(
         Proto::descriptor(),
         [callback](protobuf::Message* message, unsigned int seed) {
-          callback(protobuf::DownCastToGenerated<Proto>(message), seed);
+          callback(protobuf::DownCastMessage<Proto>(message), seed);
         });
   }
 };

src/mutator.cc

@@ -381,13 +381,13 @@ std::unique_ptr<Message> UnpackAny(const Any& any) {
 
 const Any* CastToAny(const Message* message) {
   return Any::GetDescriptor() == message->GetDescriptor()
-             ? protobuf::DownCastToGenerated<Any>(message)
+             ? protobuf::DownCastMessage<Any>(message)
              : nullptr;
 }
 
 Any* CastToAny(Message* message) {
   return Any::GetDescriptor() == message->GetDescriptor()
-             ? protobuf::DownCastToGenerated<Any>(message)
+             ? protobuf::DownCastMessage<Any>(message)
              : nullptr;
 }
 

src/mutator_test.cc

@@ -29,7 +29,7 @@
 
 namespace protobuf_mutator {
 
-using protobuf::DownCastToGenerated;
+using protobuf::DownCastMessage;
 using protobuf::util::MessageDifferencer;
 using testing::TestWithParam;
 using testing::ValuesIn;
@@ -623,7 +623,7 @@ TYPED_TEST(MutatorTypedTest, RegisterPostProcessor) {
         TestFixture::Message::descriptor(),
         [=](protobuf::Message* message, unsigned int seed) {
           auto test_message =
-              DownCastToGenerated<typename TestFixture::Message>(message);
+              DownCastMessage<typename TestFixture::Message>(message);
           if (seed % 2) test_message->set_optional_string(v);
         });
   }