Remove CollectExtensions check banning unknown custom options since unknown custom options are now expected when using import option and option_deps which exclude the options from the "builder" pool (aka "import" pool).

zhangskz · zhangskz · commit 694eedd395e2 · 2025-08-14T01:23:11.000Z
Note this check is not actually hit in most cases using `import option` unless there is also a separate dependency on `descriptor.proto`.

PiperOrigin-RevId: 794717886
diff --git a/src/google/protobuf/compiler/java/file.cc b/src/google/protobuf/compiler/java/file.cc
@@ -70,14 +70,11 @@ using FieldDescriptorSet =
 // Recursively searches the given message to collect extensions.
 // Returns true if all the extensions can be recognized. The extensions will be
 // appended in to the extensions parameter.
-// Returns false when there are unknown fields, in which case the data in the
-// extensions output parameter is not reliable and should be discarded.
-bool CollectExtensions(const Message& message, FieldDescriptorSet* extensions) {
+// Unknown extensions may be present in the case of option imports and will be
+// ignored.
+void CollectExtensions(const Message& message, FieldDescriptorSet* extensions) {
   const Reflection* reflection = message.GetReflection();
 
-  // There are unknown fields that could be extensions, thus this call fails.
-  if (reflection->GetUnknownFields(message).field_count() > 0) return false;
-
   std::vector<const FieldDescriptor*> fields;
   reflection->ListFields(message, &fields);
 
@@ -92,16 +89,14 @@ bool CollectExtensions(const Message& message, FieldDescriptorSet* extensions) {
         for (int j = 0; j < size; j++) {
           const Message& sub_message =
               reflection->GetRepeatedMessage(message, fields[i], j);
-          if (!CollectExtensions(sub_message, extensions)) return false;
+          CollectExtensions(sub_message, extensions);
         }
       } else {
         const Message& sub_message = reflection->GetMessage(message, fields[i]);
-        if (!CollectExtensions(sub_message, extensions)) return false;
+        CollectExtensions(sub_message, extensions);
       }
     }
   }
-
-  return true;
 }
 
 // Finds all extensions for custom options in the given file descriptor with the
@@ -115,7 +110,7 @@ void CollectExtensions(const FileDescriptor& file,
       file_proto.GetDescriptor()->full_name());
 
   // descriptor.proto is not found in the builder pool, meaning there are no
-  // custom options.
+  // custom options or they are option imported and not reachable.
   if (file_proto_desc == nullptr) return;
 
   DynamicMessageFactory factory;
@@ -124,14 +119,10 @@ void CollectExtensions(const FileDescriptor& file,
   ABSL_CHECK(dynamic_file_proto.get() != nullptr);
   ABSL_CHECK(dynamic_file_proto->ParseFromString(file_data));
 
-  // Collect the extensions again from the dynamic message.
+  // Collect the extensions from the dynamic message.
   extensions->clear();
-  ABSL_CHECK(CollectExtensions(*dynamic_file_proto, extensions))
-      << "Found unknown fields in FileDescriptorProto when building "
-      << file_proto.name()
-      << ". It's likely that those fields are custom options, however, "
-         "those options cannot be recognized in the builder pool. "
-         "This normally should not happen. Please report a bug.";
+  // Unknown extensions are ok and expected in the case of option imports.
+  CollectExtensions(*dynamic_file_proto, extensions);
 }
 
 // Our static initialization methods can become very, very large.
diff --git a/src/google/protobuf/compiler/java/generator_unittest.cc b/src/google/protobuf/compiler/java/generator_unittest.cc
@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
 
+#include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/descriptor.pb.h"
@@ -19,13 +20,15 @@
 #include "google/protobuf/compiler/java/java_features.pb.h"
 #include "google/protobuf/compiler/command_line_interface_tester.h"
 
+
 namespace google {
 namespace protobuf {
 namespace compiler {
 namespace java {
 namespace {
 
 #define PACKAGE_PREFIX ""
+#define PACKAGE_IMPORT_PREFIX ""
 
 class JavaGeneratorTest : public CommandLineInterfaceTester {
  protected:
@@ -45,6 +48,16 @@ class JavaGeneratorTest : public CommandLineInterfaceTester {
     std::string path = absl::StrCat(temp_directory(), "/", filename);
     return File::Exists(path);
   }
+
+  bool FileContainsSubstring(absl::string_view filename,
+                             absl::string_view substring) {
+    std::string path = absl::StrCat(temp_directory(), "/", filename);
+    std::string contents;
+    if (!File::GetContents(path, &contents, true).ok()) {
+      return false;
+    }
+    return contents.find(substring) != std::string::npos;
+  }
 };
 
 TEST_F(JavaGeneratorTest, Basic) {
@@ -365,6 +378,8 @@ TEST_F(JavaGeneratorTest,
       "class name, \"TestFileNameProto\", matches the name "
       "of one of the types declared inside it");
 }
+
+
 }  // namespace
 }  // namespace java
 }  // namespace compiler
