Internal changes

mkruskal-google · copybara-github · commit 2dcda5a97d5f · 2025-10-29T12:18:52.000-07:00
PiperOrigin-RevId: 825654714
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
@@ -6588,9 +6588,9 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
     SuggestFieldNumbers(result, proto);
   }
 
-  if (!unknown_option_dependencies.empty() && !options_to_interpret_.empty()) {
-    // If there are unknown option dependencies, we should report an error
-    // if there are any uninterpreted options.
+  if (!options_to_interpret_.empty()) {
+    // If there are options to interpret, report an error on any unknown option
+    // dependencies.
     for (const std::string& name : unknown_option_dependencies) {
       AddImportError(proto, name);
     }

Original file line number	Diff line number	Diff line change
`@@ -6588,9 +6588,9 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(`
`6588`	`6588`	`SuggestFieldNumbers(result, proto);`
`6589`	`6589`	`}`
`6590`	`6590`
`6591`		`- if (!unknown_option_dependencies.empty() && !options_to_interpret_.empty()) {`
`6592`		`- // If there are unknown option dependencies, we should report an error`
`6593`		`- // if there are any uninterpreted options.`
	`6591`	`+ if (!options_to_interpret_.empty()) {`
	`6592`	`+ // If there are options to interpret, report an error on any unknown option`
	`6593`	`+ // dependencies.`
`6594`	`6594`	`for (const std::string& name : unknown_option_dependencies) {`
`6595`	`6595`	`AddImportError(proto, name);`
`6596`	`6596`	`}`